openharmony/multimedia_audio_standard
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_audio_standard.git synced 2026-07-01 22:14:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

!606 [Change]GetVolume to return 0 when mute is true

Browse Source 
Merge pull request !606 from AshishSawakar/getvolume_change
This commit is contained in:
openharmony_ci
2022-07-18 07:01:19 +00:00
committed by Gitee
parent 65880a8cc6 348ed7082d
commit b36223b90e
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/src/audio_policy/server/audio_policy_server.cpp
+15 -1
View File
@@ -234,6 +234,9 @@ int32_t AudioPolicyServer::SetStreamVolume(AudioStreamType streamType, float vol
float AudioPolicyServer::GetStreamVolume(AudioStreamType streamType)
{
if (GetStreamMute(streamType)) {
return MIN_VOLUME_LEVEL;
}
return mPolicyService.GetStreamVolume(streamType);
}
@@ -246,7 +249,18 @@ int32_t AudioPolicyServer::SetStreamMute(AudioStreamType streamType, bool mute)
}
}
return mPolicyService.SetStreamMute(streamType, mute);
int result = mPolicyService.SetStreamMute(streamType, mute);
for (auto it = volumeChangeCbsMap_.begin(); it != volumeChangeCbsMap_.end(); ++it) {
std::shared_ptr<VolumeKeyEventCallback> volumeChangeCb = it->second;
if (volumeChangeCb == nullptr) {
AUDIO_ERR_LOG("volumeChangeCb: nullptr for client : %{public}d", it->first);
continue;
}
AUDIO_DEBUG_LOG("AudioPolicyServer::SetStreamMute trigger volumeChangeCb clientPid : %{public}d", it->first);
volumeChangeCb->OnVolumeKeyEvent(streamType, ConvertVolumeToInt(GetStreamVolume(streamType)), false);
}
return result;
}
int32_t AudioPolicyServer::SetStreamVolume(AudioStreamType streamType, float volume, bool isUpdateUi)