summaryrefslogtreecommitdiff
path: root/AudioManagerCore/include
diff options
context:
space:
mode:
authorMartin Koch <mkoch@de.adit-jv.com>2020-01-17 09:07:47 +0100
committerMartin Koch <mkoch@de.adit-jv.com>2020-01-17 09:14:51 +0100
commitc1e284360ec02b06ccb0a97a00fed05ef0bb2c60 (patch)
tree752b600be063bd3938e7e8fc7b304ac46f53ef1d /AudioManagerCore/include
parenta2af83777be4860d554bceaf28c87218729cf309 (diff)
downloadaudiomanager-c1e284360ec02b06ccb0a97a00fed05ef0bb2c60.tar.gz
AM: add plural form of setSystemProperties for global configuration attributes to command and control interface
- implement plural form of requests and acknowledgments in core - provide empty default implementations in interfaces to ensure backward compatibility with older plugins - accommodate extension in module tests Main purpose of this extension is to allow for one-shot (uninterrupted), consistent change of multiple, possibly interrelated configuration attributes. Signed-off-by: Martin Koch <mkoch@de.adit-jv.com>
Diffstat (limited to 'AudioManagerCore/include')
-rw-r--r--AudioManagerCore/include/CAmCommandReceiver.h1
-rw-r--r--AudioManagerCore/include/CAmCommandSender.h1
-rw-r--r--AudioManagerCore/include/CAmControlReceiver.h1
-rw-r--r--AudioManagerCore/include/CAmControlSender.h1
-rw-r--r--AudioManagerCore/include/CAmDatabaseHandlerMap.h2
-rw-r--r--AudioManagerCore/include/IAmDatabaseHandler.h1
6 files changed, 7 insertions, 0 deletions
diff --git a/AudioManagerCore/include/CAmCommandReceiver.h b/AudioManagerCore/include/CAmCommandReceiver.h
index 8c43987..17c3fd4 100644
--- a/AudioManagerCore/include/CAmCommandReceiver.h
+++ b/AudioManagerCore/include/CAmCommandReceiver.h
@@ -53,6 +53,7 @@ public:
am_Error_e setMainSourceSoundProperty(const am_MainSoundProperty_s &soundProperty, const am_sourceID_t sourceID);
am_Error_e setMainSourceSoundProperties(const std::vector<am_MainSoundProperty_s> &listSoundProperties, const am_sourceID_t sourceID);
am_Error_e setSystemProperty(const am_SystemProperty_s &property);
+ am_Error_e setSystemProperties(const std::vector<am_SystemProperty_s> &listSystemProperties);
am_Error_e getVolume(const am_sinkID_t sinkID, am_mainVolume_t &mainVolume) const;
am_Error_e getListMainConnections(std::vector<am_MainConnectionType_s> &listConnections) const;
am_Error_e getListMainSinks(std::vector<am_SinkType_s> &listMainSinks) const;
diff --git a/AudioManagerCore/include/CAmCommandSender.h b/AudioManagerCore/include/CAmCommandSender.h
index c438711..5e47837 100644
--- a/AudioManagerCore/include/CAmCommandSender.h
+++ b/AudioManagerCore/include/CAmCommandSender.h
@@ -68,6 +68,7 @@ public:
void cbVolumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume);
void cbSinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState);
void cbSystemPropertyChanged(const am_SystemProperty_s &systemProperty);
+ void cbSystemPropertiesChanged(const std::vector<am_SystemProperty_s> &listSystemProperties);
void cbTimingInformationChanged(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time);
void getInterfaceVersion(std::string &version) const;
am_Error_e getListPlugins(std::vector<std::string> &interfaces) const;
diff --git a/AudioManagerCore/include/CAmControlReceiver.h b/AudioManagerCore/include/CAmControlReceiver.h
index a710d23..0a0e1f3 100644
--- a/AudioManagerCore/include/CAmControlReceiver.h
+++ b/AudioManagerCore/include/CAmControlReceiver.h
@@ -81,6 +81,7 @@ public:
am_Error_e changeMainSourceSoundPropertiesDB(const std::vector<am_MainSoundProperty_s> &listSoundProperties, const am_sourceID_t sourceID);
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 changeSystemPropertiesDB(const std::vector<am_SystemProperty_s> &listSystemProperties);
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/AudioManagerCore/include/CAmControlSender.h b/AudioManagerCore/include/CAmControlSender.h
index f6c2f0e..77e8e2c 100644
--- a/AudioManagerCore/include/CAmControlSender.h
+++ b/AudioManagerCore/include/CAmControlSender.h
@@ -54,6 +54,7 @@ public:
am_Error_e hookUserSetMainSourceSoundProperty(const am_sourceID_t sourceID, const am_MainSoundProperty_s &soundProperty);
am_Error_e hookUserSetMainSourceSoundProperties(const am_sourceID_t sourceID, const std::vector<am_MainSoundProperty_s > &listSoundProperties);
am_Error_e hookUserSetSystemProperty(const am_SystemProperty_s &property);
+ am_Error_e hookUserSetSystemProperties(const std::vector<am_SystemProperty_s> &listSystemProperties);
am_Error_e hookUserVolumeChange(const am_sinkID_t SinkID, const am_mainVolume_t newVolume);
am_Error_e hookUserVolumeStep(const am_sinkID_t SinkID, const int16_t increment);
am_Error_e hookUserSetSinkMuteState(const am_sinkID_t sinkID, const am_MuteState_e muteState);
diff --git a/AudioManagerCore/include/CAmDatabaseHandlerMap.h b/AudioManagerCore/include/CAmDatabaseHandlerMap.h
index f3c39d8..46da560 100644
--- a/AudioManagerCore/include/CAmDatabaseHandlerMap.h
+++ b/AudioManagerCore/include/CAmDatabaseHandlerMap.h
@@ -105,6 +105,7 @@ public:
std::function<void(const am_sinkID_t, const am_mainVolume_t)> dboVolumeChanged;
std::function<void(const am_sinkID_t, const am_MuteState_e)> dboSinkMuteStateChanged;
std::function<void(const am_SystemProperty_s &)>dboSystemPropertyChanged;
+ std::function<void(const std::vector<am_SystemProperty_s> &)>dboSystemPropertiesChanged;
std::function<void(const am_mainConnectionID_t, const am_timeSync_t)>dboTimingInformationChanged;
std::function<void(const am_sinkID_t, const am_sinkClass_t, const std::vector<am_MainSoundProperty_s> &, const bool)>dboSinkUpdated;
std::function<void(const am_sourceID_t, const am_sourceClass_t, const std::vector<am_MainSoundProperty_s> &, const bool)>dboSourceUpdated;
@@ -146,6 +147,7 @@ public:
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 changeSystemPropertiesDB(const std::vector<am_SystemProperty_s> &listSystemProperties);
am_Error_e changeDelayMainConnection(const am_timeSync_t &delay, const am_mainConnectionID_t &connectionID);
am_Error_e changeSinkClassInfoDB(const am_SinkClass_s &sinkClass);
am_Error_e changeSourceClassInfoDB(const am_SourceClass_s &sourceClass);
diff --git a/AudioManagerCore/include/IAmDatabaseHandler.h b/AudioManagerCore/include/IAmDatabaseHandler.h
index 2185cd4..8e4118e 100644
--- a/AudioManagerCore/include/IAmDatabaseHandler.h
+++ b/AudioManagerCore/include/IAmDatabaseHandler.h
@@ -86,6 +86,7 @@ public:
virtual am_Error_e changeSinkSoundPropertyDB(const am_SoundProperty_s &soundProperty, const am_sinkID_t sinkID) = 0;
virtual am_Error_e changeSourceAvailabilityDB(const am_Availability_s &availability, const am_sourceID_t sourceID) = 0;
virtual am_Error_e changeSystemPropertyDB(const am_SystemProperty_s &property) = 0;
+ virtual am_Error_e changeSystemPropertiesDB(const std::vector<am_SystemProperty_s> &listSystemProperties) = 0;
virtual am_Error_e changeDelayMainConnection(const am_timeSync_t &delay, const am_mainConnectionID_t &connectionID) = 0;
virtual am_Error_e changeSinkClassInfoDB(const am_SinkClass_s &sinkClass) = 0;
virtual am_Error_e changeSourceClassInfoDB(const am_SourceClass_s &sourceClass) = 0;