summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon/src
diff options
context:
space:
mode:
authorChristian Mueller <christian@lmuc329619u.(none)>2011-12-16 12:29:27 +0100
committerChristian Mueller <christian@lmuc329619u.(none)>2011-12-16 12:29:27 +0100
commit392d090c63dcb03df8a044abbc6cc84807e341e5 (patch)
tree10ea0610a5a6d0e8c9ebbe01b6433fcd1c754ebf /AudioManagerDaemon/src
parent281cb0d875832bb56c82bad3516fc4021f8be4b0 (diff)
downloadaudiomanager-392d090c63dcb03df8a044abbc6cc84807e341e5.tar.gz
changes to make controlSender compile & loadable
Diffstat (limited to 'AudioManagerDaemon/src')
-rw-r--r--AudioManagerDaemon/src/DBusWrapper.cpp2
-rw-r--r--AudioManagerDaemon/src/RoutingSender.cpp1
-rw-r--r--AudioManagerDaemon/src/main.cpp3
3 files changed, 5 insertions, 1 deletions
diff --git a/AudioManagerDaemon/src/DBusWrapper.cpp b/AudioManagerDaemon/src/DBusWrapper.cpp
index b15374d..8876855 100644
--- a/AudioManagerDaemon/src/DBusWrapper.cpp
+++ b/AudioManagerDaemon/src/DBusWrapper.cpp
@@ -81,7 +81,7 @@ DBusWrapper::~DBusWrapper()
{
//close the connection again
DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("DBusWrapper::~DBusWrapper Closing DBus connection"));
- dbus_connection_close(mDbusConnection);
+ dbus_connection_unref(mDbusConnection);
}
void DBusWrapper::registerCallback(const DBusObjectPathVTable* vtable, const std::string& path, void* userdata)
diff --git a/AudioManagerDaemon/src/RoutingSender.cpp b/AudioManagerDaemon/src/RoutingSender.cpp
index cdef1ad..246920f 100644
--- a/AudioManagerDaemon/src/RoutingSender.cpp
+++ b/AudioManagerDaemon/src/RoutingSender.cpp
@@ -26,6 +26,7 @@
#include "PluginTemplate.h"
#include <utility>
#include <dirent.h>
+#include <dlfcn.h>
using namespace am;
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp
index 2e79696..dfb06ba 100644
--- a/AudioManagerDaemon/src/main.cpp
+++ b/AudioManagerDaemon/src/main.cpp
@@ -33,6 +33,7 @@
//todo: seperate documentation of test from normal project
//todo: check the startup sequence. Dbus shall be activated last...
//todo: there is a bug in the visible flags of sinks and sources. fix it.
+//todo: check namespace handling. no use.. in headers
#include <dbus/dbus.h>
#include <dlt/dlt.h>
@@ -80,6 +81,8 @@ int main(int argc, char *argv[])
//since the plugins have been loaded by the *Senders before, we can tell the Controller this:
iControlSender.hookAllPluginsLoaded();
+ iCommandSender.startupInterface(&iCommandReceiver);
+ iRoutingSender.startupRoutingInterface(&iRoutingReceiver);
iDBusWrapper.dbusMainLoop();