diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-06 15:57:11 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-06 16:18:36 +0100 |
commit | ba9e8ff6cfc7de6fadce914b356b6e4b398d5ab3 (patch) | |
tree | 9cdf855f63dd103a8ea6811d03251bd07a6a40de /PluginControlInterface | |
parent | 74cf9b985164be8c28a3cd1b11076900792594f8 (diff) | |
download | audiomanager-ba9e8ff6cfc7de6fadce914b356b6e4b398d5ab3.tar.gz |
* worked in feedback from Thomas Goering towards integration testsver-0.0.9
* corrected startup sequence and modified the testplugin so that the startup sequences match
Diffstat (limited to 'PluginControlInterface')
-rw-r--r-- | PluginControlInterface/include/ControlSender.h | 3 | ||||
-rw-r--r-- | PluginControlInterface/src/ControlSender.cpp | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/PluginControlInterface/include/ControlSender.h b/PluginControlInterface/include/ControlSender.h index 40be70f..d4bb7bb 100644 --- a/PluginControlInterface/include/ControlSender.h +++ b/PluginControlInterface/include/ControlSender.h @@ -78,6 +78,9 @@ public: void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error); am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats); uint16_t getInterfaceVersion() const; + +private: + ControlReceiveInterface * mControlReceiveInterface; }; #endif /* CONTROLSENDER_H_ */ diff --git a/PluginControlInterface/src/ControlSender.cpp b/PluginControlInterface/src/ControlSender.cpp index 6f83444..c92a4b6 100644 --- a/PluginControlInterface/src/ControlSender.cpp +++ b/PluginControlInterface/src/ControlSender.cpp @@ -24,6 +24,10 @@ */ #include "ControlSender.h" +#include "control/ControlReceiveInterface.h" +#include <cassert> + +using namespace am; extern "C" ControlSendInterface* PluginControlInterfaceFactory() { @@ -35,7 +39,8 @@ extern "C" void destroyControlPluginInterface(ControlSendInterface* controlSendI delete controlSendInterface; } -ControlSenderPlugin::ControlSenderPlugin() +ControlSenderPlugin::ControlSenderPlugin() : + mControlReceiveInterface(NULL) { } @@ -45,7 +50,9 @@ ControlSenderPlugin::~ControlSenderPlugin() am_Error_e ControlSenderPlugin::startupController(ControlReceiveInterface *controlreceiveinterface) { - (void) controlreceiveinterface; + assert(controlreceiveinterface); + mControlReceiveInterface = controlreceiveinterface; + //here is a good place to insert SystemProperties into the database... return E_NOT_USED; } @@ -56,6 +63,9 @@ am_Error_e ControlSenderPlugin::stopController() void ControlSenderPlugin::hookAllPluginsLoaded() { + //here is a good place to insert Source and SinkClasses into the database... + mControlReceiveInterface->setRoutingReady(); + mControlReceiveInterface->setCommandReady(); } am_Error_e ControlSenderPlugin::hookUserConnectionRequest(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t & mainConnectionID) |