diff options
Diffstat (limited to 'AudioManagerDaemon/include')
-rw-r--r-- | AudioManagerDaemon/include/ControlSender.h | 2 | ||||
-rw-r--r-- | AudioManagerDaemon/include/DatabaseHandler.h | 5 | ||||
-rw-r--r-- | AudioManagerDaemon/include/RoutingSender.h | 37 |
3 files changed, 37 insertions, 7 deletions
diff --git a/AudioManagerDaemon/include/ControlSender.h b/AudioManagerDaemon/include/ControlSender.h index 0a490d4..ac917be 100644 --- a/AudioManagerDaemon/include/ControlSender.h +++ b/AudioManagerDaemon/include/ControlSender.h @@ -55,7 +55,7 @@ public: void cbAckDisconnect(const am_Handle_s handle, const am_Error_e errorID) ; void cbAckCrossFade(const am_Handle_s handle, const am_HotSink_e hostsink, const am_Error_e error) ; void cbAckSetSinkVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error) ; - void cbAckSetSourceVolumeChange(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error) ; + void cbAckSetSourceVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error) ; void cbAckSetSourceState(const am_Handle_s handle, const am_Error_e error) ; void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error) ; void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error) ; diff --git a/AudioManagerDaemon/include/DatabaseHandler.h b/AudioManagerDaemon/include/DatabaseHandler.h index 38c20dd..057b7a8 100644 --- a/AudioManagerDaemon/include/DatabaseHandler.h +++ b/AudioManagerDaemon/include/DatabaseHandler.h @@ -53,6 +53,8 @@ public: am_Error_e changeSinkMuteStateDB(const am_MuteState_e muteState, const am_sinkID_t sinkID) ; am_Error_e changeMainSinkSoundPropertyDB(const am_MainSoundProperty_s& soundProperty, const am_sinkID_t sinkID) ; am_Error_e changeMainSourceSoundPropertyDB(const am_MainSoundProperty_s& soundProperty, const am_sourceID_t sourceID) ; + am_Error_e changeSourceSoundPropertyDB(const am_SoundProperty_s& soundProperty, const am_sourceID_t sourceID) ; + am_Error_e changeSinkSoundPropertyDB(const am_SoundProperty_s& soundProperty, const am_sinkID_t sinkID) ; am_Error_e changeSourceAvailabilityDB(const am_Availability_s& availability, const am_sourceID_t sourceID) ; am_Error_e changeSystemPropertyDB(const am_SystemProperty_s& property) ; am_Error_e changeDelayMainConnection(const am_timeSync_t & delay, const am_mainConnectionID_t & connectionID) ; @@ -61,6 +63,9 @@ public: am_Error_e changeConnectionTimingInformation(const am_connectionID_t connectionID, const am_timeSync_t delay) ; am_Error_e changeConnectionFinal(const am_connectionID_t connectionID) ; am_Error_e changeSourceState(const am_sourceID_t sourceID, const am_SourceState_e sourceState); + am_Error_e changeSinkVolume(const am_sinkID_t sinkID, const am_volume_t volume); + am_Error_e changeSourceVolume(const am_sourceID_t sourceID, const am_volume_t volume); + am_Error_e changeCrossFaderHotSink(const am_crossfaderID_t crossfaderID,const am_HotSink_e hotsink); am_Error_e removeMainConnectionDB(const am_mainConnectionID_t mainConnectionID) ; am_Error_e removeSinkDB(const am_sinkID_t sinkID) ; am_Error_e removeSourceDB(const am_sourceID_t sourceID) ; diff --git a/AudioManagerDaemon/include/RoutingSender.h b/AudioManagerDaemon/include/RoutingSender.h index bb3cc53..a931940 100644 --- a/AudioManagerDaemon/include/RoutingSender.h +++ b/AudioManagerDaemon/include/RoutingSender.h @@ -96,21 +96,45 @@ public: std::string busName; }; + //todo: maybe this would be valuable information for the controller... + class am_handleData_c + { + public: + union + { + am_sinkID_t sinkID; + am_sourceID_t sourceID; + am_crossfaderID_t crossfaderID; + am_connectionID_t connectionID; + }; + union + { + am_SoundProperty_s soundPropery; + am_SourceState_e sourceState; + am_volume_t volume; + am_HotSink_e hotSink; + }; + + }; + + #ifdef UNIT_TEST //this is needed to test RoutingSender friend class RoutingInterfaceBackdoor; #endif + +am_handleData_c returnHandleData(am_Handle_s handle); + private: - struct compareHandles + + struct comparator { bool operator()(const am_Handle_s& a, const am_Handle_s& b) const { - { - return (a.handle < b.handle); - } + return (a.handle < b.handle); } }; - am_Handle_s createHandle(const am_Handle_e handle); + am_Handle_s createHandle(const am_handleData_c& handleData, const am_Handle_e type); void unloadLibraries(void); typedef std::map<am_domainID_t, RoutingSendInterface*> DomainInterfaceMap; @@ -119,9 +143,9 @@ private: typedef std::map<am_crossfaderID_t, RoutingSendInterface*> CrossfaderInterfaceMap; typedef std::map<am_connectionID_t, RoutingSendInterface*> ConnectionInterfaceMap; typedef std::map<uint16_t, RoutingSendInterface*> HandleInterfaceMap; + typedef std::map<am_Handle_s,am_handleData_c,comparator> HandlesMap; int16_t mHandleCount; - std::set<am_Handle_s,compareHandles> mlistActiveHandles; std::vector<InterfaceNamePairs> mListInterfaces; std::vector<void*> mListLibraryHandles; ConnectionInterfaceMap mMapConnectionInterface; @@ -130,6 +154,7 @@ private: SinkInterfaceMap mMapSinkInterface; SourceInterfaceMap mMapSourceInterface; HandleInterfaceMap mMapHandleInterface; + HandlesMap mlistActiveHandles; }; #endif /* ROUTINGSENDER_H_ */ |