summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Koch <51775589+mkoch-aditg@users.noreply.github.com>2020-05-14 08:20:33 +0200
committerGitHub <noreply@github.com>2020-05-14 08:20:33 +0200
commit3ab71503c97a3be5d88431b947a43b07ed945a13 (patch)
tree044002b6fcb1b760bbf3c293697a55a5f8e22ab1
parentf78c59a0aab913506258dfd363de501aee1aaba8 (diff)
parent8b4a12285068747c63868dff64e6da3e8d5f0118 (diff)
downloadaudiomanager-3ab71503c97a3be5d88431b947a43b07ed945a13.tar.gz
Merge pull request #52 from daduki/master
IAmControl: typo correction for changDomainStateDB to changeDomainStateDB
-rw-r--r--AudioManagerCore/include/CAmControlReceiver.h7
-rw-r--r--AudioManagerCore/src/CAmControlReceiver.cpp2
-rw-r--r--AudioManagerCore/src/CAmDatabaseHandlerMap.cpp2
-rw-r--r--include/IAmControl.h7
4 files changed, 14 insertions, 4 deletions
diff --git a/AudioManagerCore/include/CAmControlReceiver.h b/AudioManagerCore/include/CAmControlReceiver.h
index 0a0e1f3..bd897de 100644
--- a/AudioManagerCore/include/CAmControlReceiver.h
+++ b/AudioManagerCore/include/CAmControlReceiver.h
@@ -73,7 +73,12 @@ public:
am_Error_e changeMainConnectionStateDB(const am_mainConnectionID_t mainconnectionID, const am_ConnectionState_e connectionState);
am_Error_e changeSinkMainVolumeDB(const am_mainVolume_t mainVolume, const am_sinkID_t sinkID);
am_Error_e changeSinkAvailabilityDB(const am_Availability_s &availability, const am_sinkID_t sinkID);
- am_Error_e changDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID);
+ am_Error_e changeDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID);
+ inline am_Error_e changDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID)
+ {
+ // legacy redirection due to former typo in function name
+ return changeDomainStateDB(domainState, domainID);
+ }
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 changeMainSinkSoundPropertiesDB(const std::vector<am_MainSoundProperty_s> &listSoundProperties, const am_sinkID_t sinkID);
diff --git a/AudioManagerCore/src/CAmControlReceiver.cpp b/AudioManagerCore/src/CAmControlReceiver.cpp
index c88f413..7a6072c 100644
--- a/AudioManagerCore/src/CAmControlReceiver.cpp
+++ b/AudioManagerCore/src/CAmControlReceiver.cpp
@@ -191,7 +191,7 @@ am_Error_e CAmControlReceiver::changeSinkAvailabilityDB(const am_Availability_s
return (mDatabaseHandler->changeSinkAvailabilityDB(availability, sinkID));
}
-am_Error_e CAmControlReceiver::changDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID)
+am_Error_e CAmControlReceiver::changeDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID)
{
return (mDatabaseHandler->changeDomainStateDB(domainState, domainID));
}
diff --git a/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp b/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp
index 55e92de..6e6e3f9 100644
--- a/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp
+++ b/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp
@@ -1457,7 +1457,7 @@ am_Error_e CAmDatabaseHandlerMap::changeDomainStateDB(const am_DomainState_e dom
DB_COND_UPDATE_RIE(mMappedData.mDomainMap[domainID].state, domainState);
- logVerbose("DatabaseHandler::changDomainStateDB changed domainState of domain:", domainID, "to:", domainState);
+ logVerbose("DatabaseHandler::changeDomainStateDB changed domainState of domain:", domainID, "to:", domainState);
return (E_OK);
}
diff --git a/include/IAmControl.h b/include/IAmControl.h
index 2f2f083..82dad97 100644
--- a/include/IAmControl.h
+++ b/include/IAmControl.h
@@ -288,7 +288,12 @@ public:
* @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if domain
* was not found
*/
- virtual am_Error_e changDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID) =0;
+ virtual am_Error_e changeDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID) =0;
+ inline am_Error_e changDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID)
+ {
+ // legacy redirection due to former typo in function name
+ return changeDomainStateDB(domainState, domainID);
+ }
/**
* changes the mute state of a sink
* @return E_OK on success, E_DATABASE_ERROR on error, E_NON_EXISTENT if sink was