listInterrruptedSources -> listInterruptedSources

diff --git a/AudioManagerDeamon/DataBaseHandler.cpp b/AudioManagerDeamon/DataBaseHandler.cpp
index d9997df..788e835 100644 (file)
--- a/AudioManagerDeamon/DataBaseHandler.cpp
+++ b/AudioManagerDeamon/DataBaseHandler.cpp
@@ -138,7 +138,7 @@ bool DataBaseHandler::create_tables() {
 
        command
                        = "CREATE TABLE " + QString(INTERRUPT_TABLE)
-                                       + " (ID INTEGER NOT NULL, Source_ID INTEGER, Sink_ID INTEGER, Connection_ID INTEGER, mixed BOOL, listInterrruptedSources INTEGER, PRIMARY KEY(ID));";
+                                       + " (ID INTEGER NOT NULL, Source_ID INTEGER, Sink_ID INTEGER, Connection_ID INTEGER, mixed BOOL, listInterruptedSources INTEGER, PRIMARY KEY(ID));";
        if (query.exec(command) != true) {
                DLT_LOG(AudioManager,DLT_LOG_ERROR, DLT_STRING("Databasehandler: Could not create table"), DLT_STRING(INTERRUPT_TABLE));
                return false;
@@ -352,7 +352,7 @@ genInt_t DataBaseHandler::reserveInterrupt(sink_t Sink_ID, source_t Source_ID) {
 
 genError_t DataBaseHandler::updateInterrupt(const genInt_t intID,
                connection_t connID, bool mixed,
-               QList<source_t> listInterrruptedSources) {
+               QList<source_t> listInterruptedSources) {
        QSqlQuery query;
        QString _mixed = "false";
 
@@ -361,14 +361,14 @@ genError_t DataBaseHandler::updateInterrupt(const genInt_t intID,
        }
 
        //This information is not handy to be stored directly in the database. So we put it on the heap and store the pointer to it.
-       QList<source_t>* pointer = new QList<source_t> (listInterrruptedSources);
+       QList<source_t>* pointer = new QList<source_t> (listInterruptedSources);
 
        query.prepare(
                        "UPDATE " + QString(INTERRUPT_TABLE)
-                                       + " SET Connection_ID=:Connection_ID, mixed=:mixed ,listInterrruptedSources=:listInterrruptedSources WHERE ID=:id");
+                                       + " SET Connection_ID=:Connection_ID, mixed=:mixed ,listInterruptedSources=:listInterruptedSources WHERE ID=:id");
        query.bindValue(":Connection_ID", connID);
        query.bindValue(":mixed", _mixed);
-       query.bindValue(":listInterrruptedSources", int(pointer));
+       query.bindValue(":listInterruptedSources", int(pointer));
        query.bindValue(":id", intID);
        if (query.exec() != true) {
                return GEN_DATABASE_ERROR;
@@ -380,11 +380,11 @@ genError_t DataBaseHandler::updateInterrupt(const genInt_t intID,
 genError_t DataBaseHandler::getInterruptDatafromID(const genInt_t intID,
                connection_t* return_connID, sink_t* return_Sink_ID,
                source_t* return_Source_ID, bool* return_mixed,
-               QList<source_t>** return_listInterrruptedSources) {
+               QList<source_t>** return_listInterruptedSources) {
        QSqlQuery query;
        QString
                        command =
-                                       "SELECT Connection_ID, Sink_ID, Source_ID, mixed, listInterrruptedSources FROM "
+                                       "SELECT Connection_ID, Sink_ID, Source_ID, mixed, listInterruptedSources FROM "
                                                        + QString(INTERRUPT_TABLE) + " WHERE ID="
                                                        + QString::number(intID) + ";";
 
@@ -396,7 +396,7 @@ genError_t DataBaseHandler::getInterruptDatafromID(const genInt_t intID,
                        *return_Sink_ID = query.value(1).toInt();
                        *return_Source_ID = query.value(2).toInt();
                        *return_mixed = query.value(3).toBool();
-                       *return_listInterrruptedSources
+                       *return_listInterruptedSources
                                        = reinterpret_cast<QList<source_t>*> (query.value(4).toInt());
                        return GEN_OK;
                } else {
@@ -407,7 +407,7 @@ genError_t DataBaseHandler::getInterruptDatafromID(const genInt_t intID,
 
 genError_t DataBaseHandler::removeInterrupt(const genInt_t intID) {
        QSqlQuery query;
-       QString command = "SELECT listInterrruptedSources FROM " + QString(
+       QString command = "SELECT listInterruptedSources FROM " + QString(
                        INTERRUPT_TABLE) + " WHERE ID=" + QString::number(intID) + ";";
        if (query.exec(command) != true) {
                return GEN_DATABASE_ERROR;

diff --git a/AudioManagerDeamon/dataTypes.h b/AudioManagerDeamon/dataTypes.h
index 0b7b697..604e7aa 100644 (file)
--- a/AudioManagerDeamon/dataTypes.h
+++ b/AudioManagerDeamon/dataTypes.h
@@ -85,7 +85,7 @@ public:
        source_t sourceID;
        sink_t SinkID;
        bool mixed;
-       QList<source_t> listInterrruptedSources;
+       QList<source_t> listInterruptedSources;
 };
 
 #endif /* DATATYPES_H_ */

diff --git a/PluginStructuralTest/Test.cpp b/PluginStructuralTest/Test.cpp
index 4dbf5bc..d276119 100644 (file)
--- a/PluginStructuralTest/Test.cpp
+++ b/PluginStructuralTest/Test.cpp
@@ -149,20 +149,20 @@ genHookResult_t TestPlugin::hookInterruptRequest (Queue* queue, source_t interru
        interrupt.SinkID=sink;
        interrupt.ID=m_core->returnDatabaseHandler()->reserveInterrupt(sink,interruptSource);
        *interruptID=interrupt.ID;
-       interrupt.listInterrruptedSources=m_core->returnDatabaseHandler()->getSourceIDsForSinkID(sink);
+       interrupt.listInterruptedSources=m_core->returnDatabaseHandler()->getSourceIDsForSinkID(sink);
        interrupt.connID=m_core->returnDatabaseHandler()->reserveMainConnection(interruptSource,sink);
        interrupt.mixed=m_core->returnDatabaseHandler()->is_source_Mixed(interruptSource);
 
        if (interrupt.mixed) {
                DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("Add task to change the volume on interrupt"));
-               foreach(source_t sourceL,interrupt.listInterrruptedSources) {
+               foreach(source_t sourceL,interrupt.listInterruptedSources) {
                        DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("Set volume change for source"),DLT_INT(sourceL));
                        TaskSetSourceVolume* volumetask=new TaskSetSourceVolume(m_core,INTERRUPT_VOLUME_LEVEL,sourceL);
                        queue->addTask(volumetask);
                }
        } else {
                DLT_LOG(AudioManager,DLT_LOG_ERROR, DLT_STRING("Add task to switch off sources on interrupt"));
-               foreach(source_t sourceL,interrupt.listInterrruptedSources) {
+               foreach(source_t sourceL,interrupt.listInterruptedSources) {
                        TaskSetSourceMute* mutetask=new TaskSetSourceMute(m_core,sourceL);
                        queue->addTask(mutetask);
                }
@@ -202,7 +202,7 @@ genHookResult_t TestPlugin::hookInterruptRequest (Queue* queue, source_t interru
        TaskEnterUserConnect* enterConnect=new TaskEnterUserConnect(m_core,route,interrupt.connID);
        queue->addTask(enterConnect);
 
-       TaskEnterInterrupt* enterInteruppt=new TaskEnterInterrupt(m_core,interrupt.ID,m_core->returnDatabaseHandler()->is_source_Mixed(interruptSource),interrupt.connID,interrupt.listInterrruptedSources);
+       TaskEnterInterrupt* enterInteruppt=new TaskEnterInterrupt(m_core,interrupt.ID,m_core->returnDatabaseHandler()->is_source_Mixed(interruptSource),interrupt.connID,interrupt.listInterruptedSources);
        queue->addTask(enterInteruppt);
 
        TaskInterruptWait* interruptWait=new TaskInterruptWait(m_core,interrupt.ID);
@@ -216,12 +216,12 @@ genHookResult_t TestPlugin::hookInterruptRequest (Queue* queue, source_t interru
                        queue->addTask(disconnect);
        }
        if (interrupt.mixed) {
-               foreach(source_t sourceL,interrupt.listInterrruptedSources) {
+               foreach(source_t sourceL,interrupt.listInterruptedSources) {
                        TaskSetSourceVolume* volumetask=new TaskSetSourceVolume(m_core,NORMAL_VOLUME_LEVEL,sourceL);
                        queue->addTask(volumetask);
                }
        } else {
-               foreach(source_t sourceL,interrupt.listInterrruptedSources) {
+               foreach(source_t sourceL,interrupt.listInterruptedSources) {
                        TaskSetSourceUnmute* unmutetask=new TaskSetSourceUnmute(m_core,sourceL);
                        queue->addTask(unmutetask);
                }