diff options
author | Christian Mueller <christian@lmuc329619u.(none)> | 2011-08-05 10:51:38 +0200 |
---|---|---|
committer | Christian Mueller <christian@lmuc329619u.(none)> | 2011-08-05 10:51:38 +0200 |
commit | 9826492b0066d47cfa9ba68d6efe737cc3c317a3 (patch) | |
tree | 7cedfad495aeddb24a9a363ee1692c4bf4c186fb /AudioManagerDaemon | |
parent | 2d849dd0b5b1558e92cd0f2cd6dbc556950d631d (diff) | |
download | audiomanager-9826492b0066d47cfa9ba68d6efe737cc3c317a3.tar.gz |
update on dbus
Diffstat (limited to 'AudioManagerDaemon')
-rw-r--r-- | AudioManagerDaemon/CommandHandler.cpp | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/commandInterface.h | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/main.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/AudioManagerDaemon/CommandHandler.cpp b/AudioManagerDaemon/CommandHandler.cpp index 96cf8ed..7a7719f 100644 --- a/AudioManagerDaemon/CommandHandler.cpp +++ b/AudioManagerDaemon/CommandHandler.cpp @@ -60,7 +60,7 @@ void CommandHandler::loadPlugins(){ } - CommandPlugin->startupInterface(m_receiver); + CommandPlugin->startupInterface(m_receiver,m_core->returnDbusHandler()); DLT_LOG( AudioManager, DLT_LOG_INFO, DLT_STRING("Registered Routing Plugin")); m_interfaceList.push_back(CommandPlugin); } diff --git a/AudioManagerDaemon/commandInterface.h b/AudioManagerDaemon/commandInterface.h index daef4ca..f95d207 100644 --- a/AudioManagerDaemon/commandInterface.h +++ b/AudioManagerDaemon/commandInterface.h @@ -55,7 +55,7 @@ public: class CommandSendInterface {
public:
- virtual void startupInterface(CommandReceiveInterface * action)=0;
+ virtual void startupInterface(CommandReceiveInterface * action, dbusRoothandler* dbushandler)=0;
virtual void stop()=0;
/**
* Callback that is called when the number of connections change
diff --git a/AudioManagerDaemon/main.cpp b/AudioManagerDaemon/main.cpp index ea6d5f5..2531e15 100644 --- a/AudioManagerDaemon/main.cpp +++ b/AudioManagerDaemon/main.cpp @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) { core.registerHookEngine(&hookhandler); core.registerReceiver(&breceiver); core.registerDbusRootHandler(&dbushandler); - //core.registerCommandInterfa email whenever you are availce(&commandIface); +// core.registerCommandInterface(&commandIface); router.registerDatabasehandler(&dhandler); //commandIface.registerDatabasehandler(&dhandler); @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) { DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("load bus plugins")); bushandler.load_Bus_plugins(); bushandler.StartupInterfaces(); -// chandler.loadPlugins(); + chandler.loadPlugins(); DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("Init phase is over, everything up and running")); DBusConnection* con=dbushandler.returnConnection(); |