From aa93713377d28a8ce7821466ef828f79a18e982d Mon Sep 17 00:00:00 2001 From: christian mueller Date: Mon, 27 Feb 2012 10:11:08 +0100 Subject: * [GAM-4] updated interfaces * shifted mainpage doxygen from EA generated to mainpage.h * added logo to doxygen documentation * fixed compile bug in cmakelists when no plugins are build * [ GAM-23 ]fixed plugin version recognition in cmake * first working CAmSerializer with DatabaseObserver --- PluginRoutingInterfaceDbus/include/RoutingSender.h | 34 ++++++++++----------- PluginRoutingInterfaceDbus/src/RoutingSender.cpp | 35 ++++++++++++---------- 2 files changed, 37 insertions(+), 32 deletions(-) (limited to 'PluginRoutingInterfaceDbus') diff --git a/PluginRoutingInterfaceDbus/include/RoutingSender.h b/PluginRoutingInterfaceDbus/include/RoutingSender.h index 700a1f5..276bd1e 100644 --- a/PluginRoutingInterfaceDbus/include/RoutingSender.h +++ b/PluginRoutingInterfaceDbus/include/RoutingSender.h @@ -35,23 +35,23 @@ class DbusRoutingSender: public RoutingSendInterface public: DbusRoutingSender(); virtual ~DbusRoutingSender(); - void startupRoutingInterface(RoutingReceiveInterface* routingreceiveinterface); - void routingInterfacesReady(); - void routingInterfacesRundown(); - am_Error_e asyncAbort(const am_Handle_s handle); - am_Error_e 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 asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID); - am_Error_e 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 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 asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state); - am_Error_e asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty); - am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector& listSoundProperties); - am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty); - am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector& listSoundProperties); - am_Error_e 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 setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState); - am_Error_e returnBusName(std::string& BusName) const; - uint16_t getInterfaceVersion() const; + am_Error_e startupInterface(RoutingReceiveInterface* routingreceiveinterface) ; + void setRoutingReady(const uint16_t handle) ; + void setRoutingRundown(const uint16_t handle) ; + am_Error_e asyncAbort(const am_Handle_s handle) ; + am_Error_e 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 asyncDisconnect(const am_Handle_s handle, const am_connectionID_t connectionID) ; + am_Error_e 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 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 asyncSetSourceState(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state) ; + am_Error_e asyncSetSinkSoundProperties(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector& listSoundProperties) ; + am_Error_e asyncSetSinkSoundProperty(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty) ; + am_Error_e asyncSetSourceSoundProperties(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector& listSoundProperties) ; + am_Error_e asyncSetSourceSoundProperty(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty) ; + am_Error_e 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 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 ; }; #endif /* ROUTINGSENDER_H_ */ diff --git a/PluginRoutingInterfaceDbus/src/RoutingSender.cpp b/PluginRoutingInterfaceDbus/src/RoutingSender.cpp index 0feb441..3606c66 100644 --- a/PluginRoutingInterfaceDbus/src/RoutingSender.cpp +++ b/PluginRoutingInterfaceDbus/src/RoutingSender.cpp @@ -43,19 +43,6 @@ DbusRoutingSender::~DbusRoutingSender() { } -void DbusRoutingSender::startupRoutingInterface(RoutingReceiveInterface *routingreceiveinterface) -{ - (void)routingreceiveinterface; -} - -void DbusRoutingSender::routingInterfacesReady() -{ -} - -void DbusRoutingSender::routingInterfacesRundown() -{ -} - am_Error_e DbusRoutingSender::asyncAbort(const am_Handle_s handle) { (void) handle; @@ -124,6 +111,22 @@ am_Error_e DbusRoutingSender::setDomainState(const am_domainID_t domainID, const return (E_NOT_USED); } +am_Error_e DbusRoutingSender::startupInterface(RoutingReceiveInterface *routingreceiveinterface) +{ + (void)routingreceiveinterface; + return (E_NOT_USED); +} + +void DbusRoutingSender::setRoutingReady(const uint16_t handle) +{ + (void) handle; +} + +void DbusRoutingSender::setRoutingRundown(const uint16_t handle) +{ + (void) handle; +} + am_Error_e DbusRoutingSender::returnBusName(std::string & BusName) const { BusName = "DbusPlugin"; @@ -162,8 +165,10 @@ am_Error_e DbusRoutingSender::asyncSetSourceSoundProperties(const am_Handle_s ha return (E_NOT_USED); } -uint16_t DbusRoutingSender::getInterfaceVersion() const +void DbusRoutingSender::getInterfaceVersion(std::string & version) const { - return (RoutingSendVersion); + version=RoutingSendVersion; } + + -- cgit v1.2.1