From ba9e8ff6cfc7de6fadce914b356b6e4b398d5ab3 Mon Sep 17 00:00:00 2001 From: christian mueller Date: Mon, 6 Feb 2012 15:57:11 +0100 Subject: * worked in feedback from Thomas Goering towards integration tests * corrected startup sequence and modified the testplugin so that the startup sequences match --- PluginControlInterface/include/ControlSender.h | 3 +++ PluginControlInterface/src/ControlSender.cpp | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'PluginControlInterface') 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 listPossibleConnectionFormats, std::vector& 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 + +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) -- cgit v1.2.1