* fix [GAM-28] problems in routingsender.cpp

* [GAM-27] major refactoring: bringing everything to standardized names
* Enhancement of CAmSerializer.h
* improvement of documentation
* adoption & regeneration of inerfaces

1 files changed, 24 insertions, 24 deletions

diff --git a/PluginRoutingInterfaceDbus/src/RoutingSender.cpp b/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp
index 3606c66..53d4380 100644
--- a/PluginRoutingInterfaceDbus/src/RoutingSender.cpp
+++ b/PluginRoutingInterfaceDbus/src/CAmRoutingSenderDbus.cpp
@@ -3,7 +3,7 @@
  *
  * GeniviAudioMananger DbusPlugin
  *
- * \file RoutingSender.cpp
+ * \file CAmRoutingSender.cpp
  *
  * \date 20-Oct-2011 3:42:04 PM
  * \author Christian Mueller (christian.ei.mueller@bmw.de)
@@ -23,33 +23,33 @@
  * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
  */
 
-#include "RoutingSender.h"
+#include "CAmRoutingSenderDbus.h"
 
-extern "C" RoutingSendInterface* PluginRoutingInterfaceDbusFactory()
+extern "C" IAmRoutingSend* PluginRoutingInterfaceDbusFactory()
 {
-    return (new DbusRoutingSender());
+    return (new CAmRoutingSenderDbus());
 }
 
-extern "C" void destroyRoutingPluginInterfaceDbus(RoutingSendInterface* routingSendInterface)
+extern "C" void destroyRoutingPluginInterfaceDbus(IAmRoutingSend* routingSendInterface)
 {
     delete routingSendInterface;
 }
 
-DbusRoutingSender::DbusRoutingSender()
+CAmRoutingSenderDbus::CAmRoutingSenderDbus()
 {
 }
 
-DbusRoutingSender::~DbusRoutingSender()
+CAmRoutingSenderDbus::~CAmRoutingSenderDbus()
 {
 }
 
-am_Error_e DbusRoutingSender::asyncAbort(const am_Handle_s handle)
+am_Error_e CAmRoutingSenderDbus::asyncAbort(const am_Handle_s handle)
 {
     (void) handle;
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::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)
+am_Error_e CAmRoutingSenderDbus::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)
 {
     (void) handle;
     (void) connectionID;
@@ -59,14 +59,14 @@ am_Error_e DbusRoutingSender::asyncConnect(const am_Handle_s handle, const am_co
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID)
+am_Error_e CAmRoutingSenderDbus::asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID)
 {
     (void) handle;
     (void) connectionID;
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::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)
+am_Error_e CAmRoutingSenderDbus::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)
 {
     (void) handle;
     (void) sinkID;
@@ -76,7 +76,7 @@ am_Error_e DbusRoutingSender::asyncSetSinkVolume(const am_Handle_s handle, const
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::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)
+am_Error_e CAmRoutingSenderDbus::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)
 {
     (void) handle;
     (void) sourceID;
@@ -86,7 +86,7 @@ am_Error_e DbusRoutingSender::asyncSetSourceVolume(const am_Handle_s handle, con
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state)
+am_Error_e CAmRoutingSenderDbus::asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state)
 {
     (void) handle;
     (void) sourceID;
@@ -94,7 +94,7 @@ am_Error_e DbusRoutingSender::asyncSetSourceState(const am_Handle_s handle, cons
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time)
+am_Error_e CAmRoutingSenderDbus::asyncCrossFade(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time)
 {
     (void) handle;
     (void) crossfaderID;
@@ -104,36 +104,36 @@ am_Error_e DbusRoutingSender::asyncCrossFade(const am_Handle_s handle, const am_
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState)
+am_Error_e CAmRoutingSenderDbus::setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState)
 {
     (void) domainID;
     (void) domainState;
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::startupInterface(RoutingReceiveInterface *routingreceiveinterface)
+am_Error_e CAmRoutingSenderDbus::startupInterface(IAmRoutingReceive *routingreceiveinterface)
 {
     (void)routingreceiveinterface;
     return (E_NOT_USED);
 }
 
-void DbusRoutingSender::setRoutingReady(const uint16_t handle)
+void CAmRoutingSenderDbus::setRoutingReady(const uint16_t handle)
 {
     (void) handle;
 }
 
-void DbusRoutingSender::setRoutingRundown(const uint16_t handle)
+void CAmRoutingSenderDbus::setRoutingRundown(const uint16_t handle)
 {
     (void) handle;
 }
 
-am_Error_e DbusRoutingSender::returnBusName(std::string & BusName) const
+am_Error_e CAmRoutingSenderDbus::returnBusName(std::string & BusName) const
 {
     BusName = "DbusPlugin";
     return (E_OK);
 }
 
-am_Error_e DbusRoutingSender::asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s & soundProperty)
+am_Error_e CAmRoutingSenderDbus::asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s & soundProperty)
 {
     (void) handle;
     (void) sinkID;
@@ -141,7 +141,7 @@ am_Error_e DbusRoutingSender::asyncSetSinkSoundProperty(const am_Handle_s handle
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s> & listSoundProperties)
+am_Error_e CAmRoutingSenderDbus::asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s> & listSoundProperties)
 {
     (void) handle;
     (void) sinkID;
@@ -149,7 +149,7 @@ am_Error_e DbusRoutingSender::asyncSetSinkSoundProperties(const am_Handle_s hand
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s & soundProperty)
+am_Error_e CAmRoutingSenderDbus::asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s & soundProperty)
 {
     (void) handle;
     (void) sourceID;
@@ -157,7 +157,7 @@ am_Error_e DbusRoutingSender::asyncSetSourceSoundProperty(const am_Handle_s hand
     return (E_NOT_USED);
 }
 
-am_Error_e DbusRoutingSender::asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s> & listSoundProperties)
+am_Error_e CAmRoutingSenderDbus::asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s> & listSoundProperties)
 {
     (void) handle;
     (void) sourceID;
@@ -165,7 +165,7 @@ am_Error_e DbusRoutingSender::asyncSetSourceSoundProperties(const am_Handle_s ha
     return (E_NOT_USED);
 }
 
-void DbusRoutingSender::getInterfaceVersion(std::string & version) const
+void CAmRoutingSenderDbus::getInterfaceVersion(std::string & version) const
 {
     version=RoutingSendVersion;
 }