From 54c5e965fe8f9a53a78834028fd65c792493da2b Mon Sep 17 00:00:00 2001 From: christian linke Date: Mon, 17 Dec 2012 16:15:11 +0100 Subject: * added new interfaces & nsm support + nsm tests + fixed some unit tests + fixed rundown Signed-off-by: christian linke --- .../include/CAmControlSenderBase.h | 25 +++++++++++++++++----- .../include/IAmControlReceiverShadow.h | 4 ++-- 2 files changed, 22 insertions(+), 7 deletions(-) (limited to 'PluginControlInterface/include') diff --git a/PluginControlInterface/include/CAmControlSenderBase.h b/PluginControlInterface/include/CAmControlSenderBase.h index 893cbaa..55758f0 100644 --- a/PluginControlInterface/include/CAmControlSenderBase.h +++ b/PluginControlInterface/include/CAmControlSenderBase.h @@ -30,7 +30,7 @@ public: virtual ~CAmControlSenderBase(); am_Error_e startupController(IAmControlReceive* controlreceiveinterface); void setControllerReady(); - void setControllerRundown(); + void setControllerRundown(const int16_t signal); 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); @@ -71,10 +71,25 @@ public: 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); void getInterfaceVersion(std::string& version) const; - void confirmCommandReady(); - void confirmRoutingReady(); - void confirmCommandRundown(); - void confirmRoutingRundown(); + void confirmCommandReady(const am_Error_e error) ; + void confirmRoutingReady(const am_Error_e error) ; + void confirmCommandRundown(const am_Error_e error) ; + void confirmRoutingRundown(const am_Error_e error) ; + am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) ; + am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) ; + am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix) ; + void cbAckSetVolume(const am_Handle_s handle, const std::vector listVolumes, const am_Error_e error) ; + void cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ; + void cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ; + void hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s payload) ; + void hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s payload) ; + am_Error_e hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration) ; + am_Error_e hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s notificationConfiguration) ; + void hookSystemNodeStateChanged(const NsmNodeState_e NodeStateId) ; + void hookSystemNodeApplicationModeChanged(const NsmApplicationMode_e ApplicationModeId) ; + void hookSystemSessionStateChanged(const std::string sessionName, const int32_t seatID, const NsmSessionState_e sessionStateID) ; + NsmErrorStatus_e hookSystemLifecycleRequest(const uint32_t Request, const uint32_t RequestId) ; + private: IAmControlReceive * mControlReceiveInterface; diff --git a/PluginControlInterface/include/IAmControlReceiverShadow.h b/PluginControlInterface/include/IAmControlReceiverShadow.h index 830fc33..ed8c774 100644 --- a/PluginControlInterface/include/IAmControlReceiverShadow.h +++ b/PluginControlInterface/include/IAmControlReceiverShadow.h @@ -102,8 +102,8 @@ public: void setCommandRundown(); void setRoutingReady(); void setRoutingRundown(); - void confirmControllerReady(); - void confirmControllerRundown(); + void confirmControllerReady(am_Error_e error); + void confirmControllerRundown(am_Error_e error); am_Error_e getSocketHandler(CAmSocketHandler*& socketHandler); private: IAmControlReceive *mpIAmControlReceiver; -- cgit v1.2.1