diff options
author | christian linke <christian.linke@bmw.de> | 2012-12-17 16:15:11 +0100 |
---|---|---|
committer | christian linke <christian.linke@bmw.de> | 2012-12-17 16:15:11 +0100 |
commit | 54c5e965fe8f9a53a78834028fd65c792493da2b (patch) | |
tree | 560d7b1209e6a8d4798de9568e4b4a947c2ab42a /PluginRoutingInterfaceDbus | |
parent | 215e8a72dc81e8a86dd5b3a8ca40fd2c7c6a0b9c (diff) | |
download | audiomanager-54c5e965fe8f9a53a78834028fd65c792493da2b.tar.gz |
* added new interfaces & nsm support + nsm tests + fixed some unit tests + fixed rundown
Signed-off-by: christian linke <christian.linke@bmw.de>
Diffstat (limited to 'PluginRoutingInterfaceDbus')
4 files changed, 32 insertions, 3 deletions
diff --git a/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h b/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h index 751f5ae..a7f251b 100644 --- a/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h +++ b/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h @@ -49,6 +49,9 @@ public: am_Error_e setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState); am_Error_e returnBusName(std::string& BusName) const; void getInterfaceVersion(std::string& version) const; + am_Error_e asyncSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes) ; + am_Error_e asyncSetSinkNotificationConfiguration(const am_Handle_s handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) ; + am_Error_e asyncSetSourceNotificationConfiguration(const am_Handle_s handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) ; struct rs_lookupData_s { diff --git a/PluginRoutingInterfaceDbus/include/configRoutingDbus.h b/PluginRoutingInterfaceDbus/include/configRoutingDbus.h index 6ce5638..2420184 100644 --- a/PluginRoutingInterfaceDbus/include/configRoutingDbus.h +++ b/PluginRoutingInterfaceDbus/include/configRoutingDbus.h @@ -1,6 +1,6 @@ #ifndef _ROUTINGDBUS_CONFIG_H #define _ROUTINGDBUS_CONFIG_H -#define ROUTING_DBUS_INTROSPECTION_FILE "/usr/share/audiomanager/RoutingReceiver.xml" +#define ROUTING_DBUS_INTROSPECTION_FILE "/home/christian/workspace/AudioManager/bin/RoutingReceiver.xml" #endif /* _ROUTINGDBUS_CONFIG_H */ diff --git a/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp b/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp index 8784c07..078f47a 100644 --- a/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp +++ b/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp @@ -345,6 +345,32 @@ void CAmRoutingSenderDbus::removeSourceLookup(am_sourceID_t sourceID) mMapHandles.erase(sourceID); } +am_Error_e CAmRoutingSenderDbus::asyncSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes) +{ + (void) handle; + (void) listVolumes; + //todo: implement asyncSetVolumes; + return (E_NOT_USED); +} + +am_Error_e CAmRoutingSenderDbus::asyncSetSinkNotificationConfiguration(const am_Handle_s handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) +{ + (void) handle; + (void) sinkID; + (void) notificationConfiguration; + //todo: implement asyncSetSinkNotificationConfiguration; + return (E_NOT_USED); +} + +am_Error_e CAmRoutingSenderDbus::asyncSetSourceNotificationConfiguration(const am_Handle_s handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) +{ + (void) handle; + (void) sourceID; + (void) notificationConfiguration; + //todo: implement asyncSetSourceNotificationConfiguration; + return (E_NOT_USED); +} + void CAmRoutingSenderDbus::removeSinkLookup(am_sinkID_t sinkID) { mMapHandles.erase(sinkID); diff --git a/PluginRoutingInterfaceDbus/src/IAmRoutingReceiverShadow.cpp b/PluginRoutingInterfaceDbus/src/IAmRoutingReceiverShadow.cpp index 91004c4..4115a21 100644 --- a/PluginRoutingInterfaceDbus/src/IAmRoutingReceiverShadow.cpp +++ b/PluginRoutingInterfaceDbus/src/IAmRoutingReceiverShadow.cpp @@ -669,7 +669,7 @@ void IAmRoutingReceiverShadowDbus::confirmRoutingReady(DBusConnection* conn, DBu mNumberDomains--; if(mNumberDomains==0) - mRoutingReceiveInterface->confirmRoutingRundown(mHandle); + mRoutingReceiveInterface->confirmRoutingRundown(mHandle,E_OK); } void IAmRoutingReceiverShadowDbus::confirmRoutingRundown(DBusConnection* conn, DBusMessage* msg) @@ -682,7 +682,7 @@ void IAmRoutingReceiverShadowDbus::confirmRoutingRundown(DBusConnection* conn, D mNumberDomains--; if(mNumberDomains==0) - mRoutingReceiveInterface->confirmRoutingReady(mHandle); + mRoutingReceiveInterface->confirmRoutingReady(mHandle,E_OK); } void IAmRoutingReceiverShadowDbus::gotReady(int16_t numberDomains, uint16_t handle) |