- just typos in AudioManagerCore

- fixed a bug only updating and showing the first connection
- change in gitignore

diff --git a/.gitignore b/.gitignore
index 942f89a..2b2d5db 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ dbusInterfaces/tcpMessages.h
 *.cproject
 *.project
 .metadata/
+/music/navi.mp3

diff --git a/AudioManagerDaemon/AudioManagerCore.h b/AudioManagerDaemon/AudioManagerCore.h
index 36d86b5..1f9be8d 100644 (file)
--- a/AudioManagerDaemon/AudioManagerCore.h
+++ b/AudioManagerDaemon/AudioManagerCore.h
@@ -176,7 +176,7 @@ private:
  *
  * \fn void TaskInterruptWait::slot_interrupt_ready(genInt_t ID)
  * \brief slot that is called when the interrupt resumes
- * \param the interrupt ID of the interrupt that resumed
+ * \param ID the interrupt ID of the interrupt that resumed
  */
 class TaskInterruptWait: public Task {
 Q_OBJECT
@@ -206,7 +206,7 @@ private:
  * \fn void TaskSetVolume::setSink(sink_t sink)
  * \brief sets the sink
  *
- * \fn void TaskSetVolume::volume_t getVolume()
+ * \fn volume_t  TaskSetVolume::getVolume()
  * \brief returns the volume
  *
  * \fn sink_t TaskSetVolume::getSink()
@@ -243,15 +243,11 @@ private:
  *  * \fn void TaskSetSourceVolume::setVolume(volume_t newVolume)
  * \brief sets the volume
  *
- * \fn void TaskSetSourceVolume::setSink(sink_t sink)
+ * \fn void TaskSetSourceVolume::setSource (source_t source)
  * \brief sets the sink
  *
- * \fn void TaskSetSourceVolume::volume_t getVolume()
+ * \fn volume_t TaskSetSourceVolume::getVolume()
  * \brief returns the volume
- *
- * \fn sink_t TaskSetSourceVolume::getSink()
- * \brief returns the volume
- *
  */
 class TaskSetSourceVolume: public Task {
 Q_OBJECT
@@ -278,7 +274,7 @@ private:
  * \fn TaskWait::TaskWait(AudioManagerCore* core, int mseconds)
  * \brief constructor
  * \param core the pointer to the AudioManagerCore
- * \param newmseconds delay in milliseconds
+ * \param mseconds delay in milliseconds
  *
  * \fn void TaskWait::setTime(int mseconds)
  * \brief sets the time

diff --git a/AudioManagerDaemon/DataBaseHandler.cpp b/AudioManagerDaemon/DataBaseHandler.cpp
index 788e835..e16b1c5 100644 (file)
--- a/AudioManagerDaemon/DataBaseHandler.cpp
+++ b/AudioManagerDaemon/DataBaseHandler.cpp
@@ -847,17 +847,18 @@ QList<source_t> DataBaseHandler::getSourceIDsForSinkID(sink_t sink) {
 QList<ConnectionType> DataBaseHandler::getListAllMainConnections() {
        QList<ConnectionType> connectionList;
        QSqlQuery query;
-       QString command = "SELECT Sink_ID, Source_ID, route FROM " + QString(
+       QString command = "SELECT Sink_ID, Source_ID FROM " + QString(
                        MAIN_TABLE) + ";";
 
        if (query.exec(command) != true) {
 
        } else {
-               if (query.next()) {
+               while (query.next()) {
                        ConnectionType temp;
                        temp.Sink_ID = query.value(0).toInt();
                        temp.Source_ID = query.value(1).toInt();
                        connectionList.append(temp);
+                       DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("Added Connection"), DLT_INT(temp.Sink_ID),DLT_INT(temp.Source_ID));
                }
        }
        return connectionList;

diff --git a/AudioManagerDaemon/main.cpp b/AudioManagerDaemon/main.cpp
index a31c2db..703c434 100644 (file)
--- a/AudioManagerDaemon/main.cpp
+++ b/AudioManagerDaemon/main.cpp
@@ -22,11 +22,8 @@
  *
  *
  */
-/**
- * \file The main file of the AudioManager
- */
-#include <QtCore>
-#include <QCoreApplication>
+
+#include <QtCore/qcoreapplication.h>
 #include "audioManagerIncludes.h"
 /**
  * \todo: write some documentation about Plugin mechanism
@@ -37,8 +34,7 @@ Q_IMPORT_PLUGIN(RoutingPlugin)
 Q_IMPORT_PLUGIN(RoutingJackPlugin)
 //put here all plugins that you want to use with the hooks. No more modification needed (besides adoption of the CMakeList) !
 Q_IMPORT_PLUGIN(TestPlugin)
-DLT_DECLARE_CONTEXT(AudioManager)
-;
+DLT_DECLARE_CONTEXT(AudioManager);
 
 int main(int argc, char *argv[]) {
        QCoreApplication a(argc, argv);