From 9f4c15a8e89d798077ca3edf7f786dbc740aa176 Mon Sep 17 00:00:00 2001 From: christian mueller Date: Wed, 1 Feb 2012 10:50:15 +0100 Subject: * implemented peeksinkclassIDs and peeksourceclassIDs * changed interface of both from const to non-const * corrected include headers to c++ style, eg. * corrected sendChangedData return type to void * implemented tests for sinkclass and sourceclass peeking * fixed bug in sockethandler (FD could not be removed) thanks to Frank --- AudioManagerDaemon/include/DatabaseHandler.h | 3 ++- AudioManagerDaemon/include/RoutingReceiver.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'AudioManagerDaemon/include') diff --git a/AudioManagerDaemon/include/DatabaseHandler.h b/AudioManagerDaemon/include/DatabaseHandler.h index 96065bd..b182195 100644 --- a/AudioManagerDaemon/include/DatabaseHandler.h +++ b/AudioManagerDaemon/include/DatabaseHandler.h @@ -38,7 +38,6 @@ class RoutingTree; class RoutingTreeItem; #define DYNAMIC_ID_BOUNDARY 100 //!< the value below is reserved for staticIDs, the value above will be assigned to dynamically registered items -//todo: we do not have to create MainSoundProperty tables if visible = false. //todo: check the enum values before entering & changing in the database. //todo: change asserts for dynamic boundary checks into failure answers.# //todo: check autoincrement boundary and set to 16bit limits @@ -135,6 +134,8 @@ public: am_Error_e peekDomain(const std::string& name, am_domainID_t& domainID); am_Error_e peekSink(const std::string& name, am_sinkID_t& sinkID); am_Error_e peekSource(const std::string& name, am_sourceID_t& sourceID); + am_Error_e peekSinkClassID(const std::string& name, am_sinkClass_t& sinkClassID); + am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID); /** * checks for a certain mainConnection * @param mainConnectionID to be checked for diff --git a/AudioManagerDaemon/include/RoutingReceiver.h b/AudioManagerDaemon/include/RoutingReceiver.h index 90885ca..d3675a8 100644 --- a/AudioManagerDaemon/include/RoutingReceiver.h +++ b/AudioManagerDaemon/include/RoutingReceiver.h @@ -72,15 +72,15 @@ public: am_Error_e deregisterSource(const am_sourceID_t sourceID); am_Error_e registerCrossfader(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID); am_Error_e deregisterCrossfader(const am_crossfaderID_t crossfaderID); - am_Error_e peekSinkClassID(const std::string& name, const am_sinkClass_t& sinkClassID); - am_Error_e peekSourceClassID(const std::string& name, const am_sourceClass_t& sourceClassID); + am_Error_e peekSinkClassID(const std::string& name, am_sinkClass_t& sinkClassID); + am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID); void hookInterruptStatusChange(const am_sourceID_t sourceID, const am_InterruptState_e interruptState); void hookDomainRegistrationComplete(const am_domainID_t domainID); void hookSinkAvailablityStatusChange(const am_sinkID_t sinkID, const am_Availability_s& availability); void hookSourceAvailablityStatusChange(const am_sourceID_t sourceID, const am_Availability_s& availability); void hookDomainStateChange(const am_domainID_t domainID, const am_DomainState_e domainState); void hookTimingInformationChanged(const am_connectionID_t connectionID, const am_timeSync_t delay); - am_Error_e sendChangedData(const std::vector& earlyData); + void sendChangedData(const std::vector& earlyData); am_Error_e getDBusConnectionWrapper(DBusWrapper*& dbusConnectionWrapper) const; am_Error_e getSocketHandler(SocketHandler*& socketHandler) const; uint16_t getInterfaceVersion() const; -- cgit v1.2.1