From aa93713377d28a8ce7821466ef828f79a18e982d Mon Sep 17 00:00:00 2001 From: christian mueller Date: Mon, 27 Feb 2012 10:11:08 +0100 Subject: * [GAM-4] updated interfaces * shifted mainpage doxygen from EA generated to mainpage.h * added logo to doxygen documentation * fixed compile bug in cmakelists when no plugins are build * [ GAM-23 ]fixed plugin version recognition in cmake * first working CAmSerializer with DatabaseObserver --- PluginControlInterface/include/ControlSender.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'PluginControlInterface/include') diff --git a/PluginControlInterface/include/ControlSender.h b/PluginControlInterface/include/ControlSender.h index 0e98768..e96f445 100644 --- a/PluginControlInterface/include/ControlSender.h +++ b/PluginControlInterface/include/ControlSender.h @@ -37,8 +37,8 @@ public: ControlSenderPlugin(); virtual ~ControlSenderPlugin(); am_Error_e startupController(ControlReceiveInterface* controlreceiveinterface); - am_Error_e stopController(); - void hookAllPluginsLoaded(); + void setControllerReady(); + void setControllerRundown(); am_Error_e hookUserConnectionRequest(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID); am_Error_e hookUserDisconnectionRequest(const am_mainConnectionID_t connectionID); am_Error_e hookUserSetMainSinkSoundProperty(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty); @@ -73,12 +73,16 @@ public: void cbAckSetSinkVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error); void cbAckSetSourceVolumeChange(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error); void cbAckSetSourceState(const am_Handle_s handle, const am_Error_e error); - void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error); void cbAckSetSourceSoundProperties(const am_Handle_s handle, const am_Error_e error); - void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error); + void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error); void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error); + void cbAckSetSinkSoundProperty(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 am_Route_s listRoute, const std::vector listPossibleConnectionFormats, std::vector& listPrioConnectionFormats); - uint16_t getInterfaceVersion() const; + void getInterfaceVersion(std::string& version) const; + void confirmCommandReady(); + void confirmRoutingReady(); + void confirmCommandRundown(); + void confirmRoutingRundown(); private: ControlReceiveInterface * mControlReceiveInterface; -- cgit v1.2.1