diff options
author | Christian Mueller <christian@lmuc329619u.(none)> | 2011-12-18 16:33:52 +0100 |
---|---|---|
committer | Christian Mueller <christian@lmuc329619u.(none)> | 2011-12-18 16:33:52 +0100 |
commit | 18b59afe6cda90607ad0b193088000d4f9749a97 (patch) | |
tree | cd25bd8fd2b3b9d1e71e1e7df7059f9c0afc2df0 /AudioManagerDaemon/src/main.cpp | |
parent | 392d090c63dcb03df8a044abbc6cc84807e341e5 (diff) | |
download | audiomanager-18b59afe6cda90607ad0b193088000d4f9749a97.tar.gz |
- added comments in XML description
- fixed bug in Dbus signal sending
- corrected namespace usage
Diffstat (limited to 'AudioManagerDaemon/src/main.cpp')
-rw-r--r-- | AudioManagerDaemon/src/main.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index dfb06ba..34a0fc1 100644 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -35,8 +35,6 @@ //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> #include "DatabaseHandler.h" #include "DatabaseObserver.h" #include "RoutingReceiver.h" @@ -47,7 +45,10 @@ #include "RoutingSender.h" #include "DBusWrapper.h" -DLT_DECLARE_CONTEXT(AudioManager) +#include <dbus/dbus.h> +#include <dlt/dlt.h> + +DLT_DECLARE_CONTEXT(DLT_CONTEXT) using namespace am; @@ -58,8 +59,8 @@ using namespace am; int main(int argc, char *argv[]) { DLT_REGISTER_APP("AudioManagerDeamon","AudioManagerDeamon"); - DLT_REGISTER_CONTEXT(AudioManager,"Main","Main Context"); - DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("The AudioManager is started ")); + DLT_REGISTER_CONTEXT(DLT_CONTEXT,"Main","Main Context"); + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("The AudioManager is started ")); std::vector<std::string> listCommandPluginDirs; listCommandPluginDirs.push_back(std::string(DEFAULT_PLUGIN_COMMAND_DIR)); //change this to be modified by the commandline! @@ -81,6 +82,7 @@ int main(int argc, char *argv[]) //since the plugins have been loaded by the *Senders before, we can tell the Controller this: iControlSender.hookAllPluginsLoaded(); + //the controller should startup the interfaces - this is just for testing iCommandSender.startupInterface(&iCommandReceiver); iRoutingSender.startupRoutingInterface(&iRoutingReceiver); |