From ed67f8e3a1cb0421126d51ce52134c9fb01a0fc6 Mon Sep 17 00:00:00 2001 From: Aleksandar Donchev Date: Thu, 10 Oct 2013 15:22:57 +0200 Subject: * Typo: Dbus address fixed. --- .../fidls/NodeStateManager_dbus.conf | 2 +- .../src/CAmNodeStateCommunicatorCAPI.cpp | 4 +-- .../fidl/PluginCommandInterfaceCAPI_dbus.conf | 2 +- .../src/CAmCommandSenderCAPI.cpp | 2 +- .../fidl/PluginRoutingInterfaceCAPI_dbus.conf | 2 +- PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp | 7 +++-- .../src/CAmRoutingSenderCAPI.cpp | 33 ++++++++++++---------- .../test/CAmRoutingInterfaceCAPITests.cpp | 6 ++-- .../test/CAmRoutingSenderService.h | 10 +++---- PluginRoutingInterfaceCAPI/test/CMakeLists.txt | 10 +++---- .../test/RoutingSender_dbus.conf | 6 ++-- 11 files changed, 44 insertions(+), 40 deletions(-) diff --git a/AudioManagerDaemon/fidls/NodeStateManager_dbus.conf b/AudioManagerDaemon/fidls/NodeStateManager_dbus.conf index 3f0b04e..0a4a5a8 100755 --- a/AudioManagerDaemon/fidls/NodeStateManager_dbus.conf +++ b/AudioManagerDaemon/fidls/NodeStateManager_dbus.conf @@ -26,7 +26,7 @@ dbus_connection=org.genivi.NodeStateManager dbus_object=/org/genivi/NodeStateManager dbus_interface=org.genivi.NodeStateManager.Consumer dbus_predefined=true -[local:org.genivi.NodeStateManager.LifeCycleConsumer:org.genivi.audiomanger] +[local:org.genivi.NodeStateManager.LifeCycleConsumer:org.genivi.audiomanager] dbus_connection=org.genivi.audiomanager dbus_object=/org/genivi/audiomanager/LifeCycleConsumer dbus_interface=org.genivi.NodeStateManager.LifeCycleConsumer diff --git a/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp b/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp index 6ac8f53..d772837 100644 --- a/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp +++ b/AudioManagerDaemon/src/CAmNodeStateCommunicatorCAPI.cpp @@ -35,13 +35,11 @@ #include - - namespace am { const char * CAmNodeStateCommunicatorCAPI::CLIENT_STRING = "local:org.genivi.NodeStateManager.Consumer:org.genivi.NodeStateManager"; -const char * CAmNodeStateCommunicatorCAPI::SERVER_STRING = "local:org.genivi.NodeStateManager.LifeCycleConsumer:org.genivi.audiomanger"; +const char * CAmNodeStateCommunicatorCAPI::SERVER_STRING = "local:org.genivi.NodeStateManager.LifeCycleConsumer:org.genivi.audiomanager"; const char * CAmNodeStateCommunicatorCAPI::OBJECT_NAME = "/org/genivi/audiomanager/LifeCycleConsumer"; const char * CAmNodeStateCommunicatorCAPI::BUS_NAME = "org.genivi.audiomanager"; diff --git a/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf b/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf index 35c5558..00885f4 100644 --- a/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf +++ b/PluginCommandInterfaceCAPI/fidl/PluginCommandInterfaceCAPI_dbus.conf @@ -2,7 +2,7 @@ # PluginCommandInterfaceCAPI_dbus.conf # # If you change something make sure you re-configure with 'ccmake..' which generates the *_dbus.conf file again. # ################################################################################################################## -[local:org.genivi.audiomanger.commandinterface:org.genivi.audiomanger] +[local:org.genivi.audiomanager.commandinterface:org.genivi.audiomanager] dbus_connection=org.genivi.audiomanager dbus_object=/org/genivi/audiomanager/CommandControl dbus_interface=org.genivi.audiomanager.CommandControl \ No newline at end of file diff --git a/PluginCommandInterfaceCAPI/src/CAmCommandSenderCAPI.cpp b/PluginCommandInterfaceCAPI/src/CAmCommandSenderCAPI.cpp index e37f583..772b1bd 100644 --- a/PluginCommandInterfaceCAPI/src/CAmCommandSenderCAPI.cpp +++ b/PluginCommandInterfaceCAPI/src/CAmCommandSenderCAPI.cpp @@ -45,7 +45,7 @@ extern "C" void destroyPluginCommandInterfaceCAPIFactory(IAmCommandSend* command } -const char * CAmCommandSenderCAPI::COMMAND_SENDER_SERVICE = "local:org.genivi.audiomanger.commandinterface:org.genivi.audiomanger"; +const char * CAmCommandSenderCAPI::COMMAND_SENDER_SERVICE = "local:org.genivi.audiomanager.commandinterface:org.genivi.audiomanager"; #define RETURN_IF_NOT_READY() if(!mReady) return; diff --git a/PluginRoutingInterfaceCAPI/fidl/PluginRoutingInterfaceCAPI_dbus.conf b/PluginRoutingInterfaceCAPI/fidl/PluginRoutingInterfaceCAPI_dbus.conf index 85e6284..835d40c 100755 --- a/PluginRoutingInterfaceCAPI/fidl/PluginRoutingInterfaceCAPI_dbus.conf +++ b/PluginRoutingInterfaceCAPI/fidl/PluginRoutingInterfaceCAPI_dbus.conf @@ -2,7 +2,7 @@ # PluginRoutingInterfaceCAPI_dbus.conf # # If you change something make sure you re-configure with 'ccmake..' which generates the *_dbus.conf file again. # ################################################################################################################## -[local:org.genivi.audiomanger.routinginterface:org.genivi.audiomanger] +[local:org.genivi.audiomanager.routinginterface:org.genivi.audiomanager] dbus_connection=org.genivi.audiomanager dbus_object=/org/genivi/audiomanager/RoutingControlObserver dbus_interface=org.genivi.audiomanager.RoutingControlObserver \ No newline at end of file diff --git a/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp b/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp index 1b99177..94b68a1 100644 --- a/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp +++ b/PluginRoutingInterfaceCAPI/src/CAmLookupData.cpp @@ -32,6 +32,7 @@ const char * CAmLookupData::BUS_NAME = "CAPIRoutingPlugin"; rs_lookupData_s::rs_lookupData_s(const std::shared_ptr > & aProxy):mSenderProxy(aProxy) { logInfo(__PRETTY_FUNCTION__); + mIsConnected = mSenderProxy->isAvailable(); mSubscription = mSenderProxy->getProxyStatusEvent().subscribe(std::bind(&rs_lookupData_s::onServiceStatusEvent,this,std::placeholders::_1)); } @@ -353,8 +354,7 @@ am_Error_e rs_lookupData_s::asyncSetSourceNotificationConfiguration(const am_Han void rs_lookupData_s::onServiceStatusEvent(const CommonAPI::AvailabilityStatus& serviceStatus) { - std::string serviceID; - logInfo(__PRETTY_FUNCTION__, serviceID, " status : ", (int)serviceStatus ); + logInfo(__PRETTY_FUNCTION__, " status : ", (int)serviceStatus ); mIsConnected = (serviceStatus==CommonAPI::AvailabilityStatus::AVAILABLE); } @@ -494,8 +494,11 @@ am_Error_e CAmLookupData::asyncConnect(const am_Handle_s handle, org::genivi::am::RoutingControlProxyBase::AsyncConnectAsyncCallback callback) { RSLookupDataPtr result = CAmLookupData::getValueForKey(sourceID, mMapSources); + logInfo(__PRETTY_FUNCTION__, " [sourceID:", sourceID, "]", "[sinkID:", sinkID, "]"); if(result) { + logInfo(" [isConnected:", result->isConnected(), "]", "[address:", result->getProxy()->getAddress(), "]"); + mMapConnections.insert(std::make_pair(connectionID, result)); mMapHandles.insert(std::make_pair(+handle.handle, result)); return result->asyncConnect(handle, connectionID, sourceID, sinkID, connectionFormat, callback); diff --git a/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp b/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp index 0f1ce01..1528a96 100644 --- a/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp +++ b/PluginRoutingInterfaceCAPI/src/CAmRoutingSenderCAPI.cpp @@ -26,10 +26,13 @@ #include "CAmRoutingSenderCommon.h" + + namespace am { DLT_DECLARE_CONTEXT(ctxCommandCAPI) + extern "C" IAmRoutingSend* PluginRoutingInterfaceCAPIFactory() { CAmDltWrapper::instance()->registerContext(ctxCommandCAPI, "DRS", "Common-API Plugin"); @@ -41,7 +44,7 @@ extern "C" void destroyPluginRoutingInterfaceCAPI(IAmRoutingSend* routingSendInt delete routingSendInterface; } -const char * CAmRoutingSenderCAPI::ROUTING_INTERFACE_SERVICE = "local:org.genivi.audiomanger.routinginterface:org.genivi.audiomanger"; +const char * CAmRoutingSenderCAPI::ROUTING_INTERFACE_SERVICE = "local:org.genivi.audiomanager.routinginterface:org.genivi.audiomanager"; CAmRoutingSenderCAPI::CAmRoutingSenderCAPI() : mIsServiceStarted(false), @@ -135,7 +138,7 @@ void CAmRoutingSenderCAPI::setRoutingRundown(const uint16_t handle) am_Error_e CAmRoutingSenderCAPI::asyncAbort(const am_Handle_s handle) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncAbort called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncAbort called"); return mLookupData.asyncAbort(handle,[](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); }); @@ -143,7 +146,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncAbort(const am_Handle_s handle) am_Error_e CAmRoutingSenderCAPI::asyncConnect(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncConnect called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncConnect called"); return mLookupData.asyncConnect(handle,connectionID, sourceID, sinkID, connectionFormat, [&mService,handle,connectionID](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -157,7 +160,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncConnect(const am_Handle_s handle, const am am_Error_e CAmRoutingSenderCAPI::asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncDisconnect called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncDisconnect called"); return mLookupData.asyncDisconnect(handle,connectionID, [&mService, handle, connectionID](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -171,7 +174,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncDisconnect(const am_Handle_s handle, const am_Error_e CAmRoutingSenderCAPI::asyncSetSinkVolume(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncSetSinkVolume called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSinkVolume called"); return mLookupData.asyncSetSinkVolume(handle,sinkID, volume, ramp, time, [&mService, handle, volume](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -185,7 +188,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSinkVolume(const am_Handle_s handle, co am_Error_e CAmRoutingSenderCAPI::asyncSetSourceVolume(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncSetSourceVolume called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSourceVolume called"); return mLookupData.asyncSetSourceVolume(handle,sourceID, volume, ramp, time, [&mService, handle, volume](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -199,7 +202,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSourceVolume(const am_Handle_s handle, am_Error_e CAmRoutingSenderCAPI::asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncSetSourceState called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSourceState called"); return mLookupData.asyncSetSourceState(handle,sourceID, state,[&mService, handle](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -213,7 +216,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSourceState(const am_Handle_s handle, c am_Error_e CAmRoutingSenderCAPI::asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector& listSoundProperties) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncSetSinkSoundProperties called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSinkSoundProperties called"); return mLookupData.asyncSetSinkSoundProperties(handle,sinkID, listSoundProperties, [&mService, handle](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -227,7 +230,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSinkSoundProperties(const am_Handle_s h am_Error_e CAmRoutingSenderCAPI::asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncSetSinkSoundProperty called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSinkSoundProperty called"); return mLookupData.asyncSetSinkSoundProperty(handle, sinkID, soundProperty, [&mService, handle](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -241,7 +244,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSinkSoundProperty(const am_Handle_s han am_Error_e CAmRoutingSenderCAPI::asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector& listSoundProperties) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncSetSourceSoundProperties called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSourceSoundProperties called"); return mLookupData.asyncSetSourceSoundProperties(handle, sourceID, listSoundProperties, [&mService, handle](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -255,7 +258,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSourceSoundProperties(const am_Handle_s am_Error_e CAmRoutingSenderCAPI::asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncSetSourceSoundProperty called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSourceSoundProperty called"); return mLookupData.asyncSetSourceSoundProperty(handle, sourceID, soundProperty, [&mService, handle](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -282,7 +285,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncCrossFade(const am_Handle_s handle, const am_Error_e CAmRoutingSenderCAPI::setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::setDomainState called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::setDomainState called"); return mLookupData.setDomainState(domainID, domainState, [](const CommonAPI::CallStatus& callStatus, org::genivi::am::am_Error_e error){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus),"Error",static_cast(error)); }); @@ -296,7 +299,7 @@ am_Error_e CAmRoutingSenderCAPI::returnBusName(std::string& BusName) const am_Error_e CAmRoutingSenderCAPI::asyncSetVolumes(const am_Handle_s handle, const std::vector& volumes) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncSetVolumes called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetVolumes called"); return mLookupData.asyncSetVolumes(handle, volumes, [&mService, handle, volumes](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -312,7 +315,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetVolumes(const am_Handle_s handle, const am_Error_e CAmRoutingSenderCAPI::asyncSetSinkNotificationConfiguration(const am_Handle_s handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s& nc) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncSetSinkNotificationConfiguration called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSinkNotificationConfiguration called"); return mLookupData.asyncSetSinkNotificationConfiguration(handle, sinkID, nc, [&mService, handle](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) @@ -326,7 +329,7 @@ am_Error_e CAmRoutingSenderCAPI::asyncSetSinkNotificationConfiguration(const am_ am_Error_e CAmRoutingSenderCAPI::asyncSetSourceNotificationConfiguration(const am_Handle_s handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& nc) { - log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderDbus::asyncSetSourceNotificationConfiguration called"); + log(&ctxCommandCAPI, DLT_LOG_INFO, "CAmRoutingSenderCAPI::asyncSetSourceNotificationConfiguration called"); return mLookupData.asyncSetSourceNotificationConfiguration(handle, sourceID, nc, [&mService, handle](const CommonAPI::CallStatus& callStatus){ log(&ctxCommandCAPI, DLT_LOG_INFO, __PRETTY_FUNCTION__, "Response with call status:", static_cast(callStatus)); if (callStatus != CommonAPI::CallStatus::SUCCESS) diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp index 22c7705..3bf118d 100644 --- a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp +++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp @@ -619,10 +619,10 @@ TEST_F(CAmRoutingInterfaceCAPITests, registerDomain) ON_CALL(*env->mpRoutingReceive, registerDomain(_, _)).WillByDefault(Return(E_ABORTED)); EXPECT_CALL(*env->mpRoutingReceive, registerDomain(IsDomainDataEqualTo(amDomainData), _)).WillOnce(DoAll(actionRegister(), Return(E_ABORTED))); -//example: [local:org.genivi.audiomanger.testdomaininterface:org.genivi.audiomanger] +//example: [local:org.genivi.audiomanager.testdomaininterface:org.genivi.audiomanager] env->mProxy->registerDomain(domainData, - "org.genivi.audiomanger", //(last part) - "org.genivi.audiomanger.testdomaininterface", //(middle part) + "org.genivi.audiomanager", //(last part) + "org.genivi.audiomanager.testdomaininterface", //(middle part) callStatus, domainID, error); diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.h b/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.h index 8e858b4..0ddcb14 100644 --- a/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.h +++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.h @@ -35,13 +35,13 @@ class CAmCommonAPIWrapper; /** * THE FOLLOWING DEFINES ARE POPULATED FROM THE CMAKELISTS.TXT . */ -#define CAPI_SENDER_INTERFACE "org.genivi.audiomanger.routingsender" +#define CAPI_SENDER_INTERFACE "org.genivi.audiomanager.routingsender" #define CAPI_SENDER_INSTANCE "org.genivi.routingsender" -#define CAPI_SENDER_PATH "/org/genivi/audiomanger/routingsender" +#define CAPI_SENDER_PATH "/org/genivi/audiomanager/routingsender" -#define CAPI_ROUTING_INTERFACE "org.genivi.audiomanger.routinginterface" -#define CAPI_ROUTING_INSTANCE "org.genivi.audiomanger" -#define CAPI_ROUTING_PATH "/org/genivi/audiomanger/routinginterface" +#define CAPI_ROUTING_INTERFACE "org.genivi.audiomanager.routinginterface" +#define CAPI_ROUTING_INSTANCE "org.genivi.audiomanager" +#define CAPI_ROUTING_PATH "/org/genivi/audiomanager/routinginterface" /** Test class implementing the routing sender service. diff --git a/PluginRoutingInterfaceCAPI/test/CMakeLists.txt b/PluginRoutingInterfaceCAPI/test/CMakeLists.txt index 26cdecf..86bbde6 100644 --- a/PluginRoutingInterfaceCAPI/test/CMakeLists.txt +++ b/PluginRoutingInterfaceCAPI/test/CMakeLists.txt @@ -76,17 +76,17 @@ file(GLOB_RECURSE CAPI_PLUGIN_INTERFACE_GEN_SRCS_CXX "../src-gen/*.cpp" ) -set (CAPI_SENDER_INTERFACE "org.genivi.audiomanger.routingsender") +set (CAPI_SENDER_INTERFACE "org.genivi.audiomanager.routingsender") set (CAPI_SENDER_INSTANCE "org.genivi.routingsender") -set (CAPI_SENDER_PATH "/org/genivi/audiomanger/routingsender") +set (CAPI_SENDER_PATH "/org/genivi/audiomanager/routingsender") set (CAPI_SENDER_INTERFACE_H "\"${CAPI_SENDER_INTERFACE}\"") set (CAPI_SENDER_INSTANCE_H "\"${CAPI_SENDER_INSTANCE}\"") set (CAPI_SENDER_PATH_H "\"${CAPI_SENDER_PATH}\"") -set (CAPI_ROUTING_INTERFACE "org.genivi.audiomanger.routinginterface") -set (CAPI_ROUTING_INSTANCE "org.genivi.audiomanger") -set (CAPI_ROUTING_PATH "/org/genivi/audiomanger/routinginterface") +set (CAPI_ROUTING_INTERFACE "org.genivi.audiomanager.routinginterface") +set (CAPI_ROUTING_INSTANCE "org.genivi.audiomanager") +set (CAPI_ROUTING_PATH "/org/genivi/audiomanager/routinginterface") set (CAPI_ROUTING_INTERFACE_H "\"${CAPI_ROUTING_INTERFACE}\"") set (CAPI_ROUTING_INSTANCE_H "\"${CAPI_ROUTING_INSTANCE}\"") diff --git a/PluginRoutingInterfaceCAPI/test/RoutingSender_dbus.conf b/PluginRoutingInterfaceCAPI/test/RoutingSender_dbus.conf index f54fdd7..30424b9 100755 --- a/PluginRoutingInterfaceCAPI/test/RoutingSender_dbus.conf +++ b/PluginRoutingInterfaceCAPI/test/RoutingSender_dbus.conf @@ -2,7 +2,7 @@ # RoutingSender_dbus.conf # # If you change something make sure you re-configure with 'ccmake..' which generates the *_dbus.conf file again. # ################################################################################################################## -[local:org.genivi.audiomanger.routingsender:org.genivi.routingsender] +[local:org.genivi.audiomanager.routingsender:org.genivi.routingsender] dbus_connection=org.genivi.routingsender -dbus_object=/org/genivi/audiomanger/routingsender -dbus_interface=org.genivi.audiomanger.routingsender +dbus_object=/org/genivi/audiomanager/routingsender +dbus_interface=org.genivi.audiomanager.routingsender -- cgit v1.2.1