diff options
| author | Aleksandar Donchev <aleksander.donchev@partner.bmw.de> | 2013-09-02 11:57:28 +0200 |
|---|---|---|
| committer | Christian Linke <Christian.Linke@bmw.de> | 2013-09-03 17:26:04 +0200 |
| commit | a2edae5cee4254b933f42399edc0e092abd4f5cf (patch) | |
| tree | ead58f525b947deed4b8c76ab9c89c80b5056227 /PluginRoutingInterfaceDbus/include | |
| parent | 7aee1baeea1777318932cc49a8eac18f194233cd (diff) | |
| download | audiomanager-a2edae5cee4254b933f42399edc0e092abd4f5cf.tar.gz | |
*PluginCommandInterfaceCAPI, PluginRoutingInterfaceCAPI, NodeStateCommunicatorCAPI with unit tests first version.
Choosing between DBUS and Common-API via cmake.
CommonAPI - legacy support for DBus properties (Set 1)
Signed-off-by: Christian Linke <christian.linke@bmw.de>
(cherry picked from commit ea96ef59e29466667c90b506426e2a5a9cdb82d2)
Diffstat (limited to 'PluginRoutingInterfaceDbus/include')
3 files changed, 9 insertions, 5 deletions
diff --git a/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h b/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h index 631ebd3..9530174 100644 --- a/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h +++ b/PluginRoutingInterfaceDbus/include/CAmRoutingSenderDbus.h @@ -2,6 +2,7 @@ * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 + * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 * * \copyright * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, @@ -81,6 +82,8 @@ private: typedef std::map<am_connectionID_t,rs_lookupData_s> mapConnections_t; typedef std::map<uint16_t,rs_lookupData_s> mapHandles_t; + template <typename TKey> static void removeEntriesForValue(const rs_lookupData_s & value, std::map<TKey,rs_lookupData_s> & map); + mapDomain_t mMapDomains; mapSinks_t mMapSinks; mapSources_t mMapSources; diff --git a/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml b/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml index 291bdbd..cfdbf7c 100644 --- a/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml +++ b/PluginRoutingInterfaceDbus/include/RoutingReceiver.xml @@ -73,6 +73,7 @@ <arg name="domainid" type="q" direction="out" /> <arg name="error" type="q" direction="out" /> </method> +<!--check the parameters--> <method name="deregisterDomain"> <arg name="handle" type="q" direction="in" /> <arg name="error" type="q" direction="in" /> @@ -144,19 +145,19 @@ </method> <method name="hookSinkAvailablityStatusChange"> <arg name="sinkID" type="q" direction="in" /> - <arg name="availability" type="(nn)" direction="out"/> + <arg name="availability" type="(nn)" direction="in"/> </method> <method name="hookSourceAvailablityStatusChange"> <arg name="sourceID" type="q" direction="in" /> - <arg name="availability" type="(nn)" direction="out"/> + <arg name="availability" type="(nn)" direction="in"/> </method> <method name="hookDomainStateChange"> <arg name="domainID" type="q" direction="in" /> - <arg name="domainState" type="q" direction="out"/> + <arg name="domainState" type="q" direction="in"/> </method> <method name="hookTimingInformationChanged"> <arg name="connectionID" type="q" direction="in" /> - <arg name="delay" type="n" direction="out"/> + <arg name="delay" type="n" direction="in"/> </method> <method name="sendChangedData"> <!--am_EarlyDataType_e type; am_DataType_u sinksource; am_EarlyData_u data; --> <arg name="earlyData_volumes" type="a(qqn)" direction="in" /> <!-- only the volumes as array --> diff --git a/PluginRoutingInterfaceDbus/include/configRoutingDbus.h b/PluginRoutingInterfaceDbus/include/configRoutingDbus.h index aa95328..87ab078 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 "/home/genius/workspace/workspace/AudioManager/bin/RoutingReceiver.xml" +#define ROUTING_DBUS_INTROSPECTION_FILE "/home/genius/workspace/AudioManager2/bin/RoutingReceiver.xml" #endif /* _ROUTINGDBUS_CONFIG_H */ |