openharmony/multimedia_audio_standard
1
0
Fork 0
mirror of https://gitee.com/openharmony/multimedia_audio_standard synced 2024-12-11 14:46:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add audio stream used for onlyone volume bar of a device

Browse Source 
Signed-off-by: zhujie <zhujie81@huawei.com>
This commit is contained in:
zhujie 2022-04-25 23:11:23 +08:00
parent d436874478
commit 61b42f20b2
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
interfaces/inner_api/native/audiomanager/include/audio_system_manager.h
View File

@ -175,9 +175,13 @@ public:
/**
* Indicates audio streams used for only one volume bar of a device.
*/
STREAM_ALL = 100,
STREAM_ALL = 100
};
static AudioVolumeType GetStreamAllVolumeTypes[] = { STREAM_MUSIC,
STREAM_RING,
STREAM_NOTIFICATION,
STREAM_VOICE_CALL,
STREAM_VOICE_ASSISTANT};
static AudioSystemManager *GetInstance();
static float MapVolumeToHDI(int32_t volume);
static int32_t MapVolumeFromHDI(float volume);

38
services/src/audio_service/client/audio_system_manager.cpp
View File

@ -252,13 +252,16 @@ int32_t AudioSystemManager::SetVolume(AudioSystemManager::AudioVolumeType volume
}
if (volumeType == STREAM_ALL) {
AudioVolumeType audioVolumeTypes[] = { STREAM_MUSIC, STREAM_RING, STREAM_NOTIFICATION, STREAM_VOICE_CALL, STREAM_VOICE_ASSISTANT};
for (auto &&audioVolumeType : AudioVolumeTypes) {
int32_t flag = AUDIO_CLIENT_SUCCESS;
for (auto &&audioVolumeType : GetAllVolumeTypes) {
AudioStreamType StreamVolType = (AudioStreamType)audioVolumeType;
float volumeToHdi = MapVolumeToHDI(volume);
AudioPolicyManager::GetInstance().SetStreamVolume(StreamVolType, volumeToHdi);
int32_t setResult = AudioPolicyManager::GetInstance().SetStreamVolume(StreamVolType, volumeToHdi);
if (setResult != flat) {
flag = setResult;
}
}
return 0;
return flag;
}
/* Call Audio Policy SetStreamVolume */
@ -310,12 +313,20 @@ int32_t AudioSystemManager::MapVolumeFromHDI(float volume)
int32_t AudioSystemManager::GetMaxVolume(AudioSystemManager::AudioVolumeType volumeType) const
{
CHECK_AND_RETURN_RET_LOG(g_sProxy != nullptr, ERR_OPERATION_FAILED, "GetMaxVolume::Audio service unavailable");
if (volumeType == STREAM_ALL) {
volumeType = STREAM_MUSIC;
}
return g_sProxy->GetMaxVolume(volumeType);
}
int32_t AudioSystemManager::GetMinVolume(AudioSystemManager::AudioVolumeType volumeType) const
{
CHECK_AND_RETURN_RET_LOG(g_sProxy != nullptr, ERR_OPERATION_FAILED, "GetMinVolume::Audio service unavailable");
if (volumeType == STREAM_ALL) {
volumeType = STREAM_MUSIC;
}
return g_sProxy->GetMinVolume(volumeType);
}
@ -327,12 +338,26 @@ int32_t AudioSystemManager::SetMute(AudioSystemManager::AudioVolumeType volumeTy
case STREAM_NOTIFICATION:
case STREAM_VOICE_CALL:
case STREAM_VOICE_ASSISTANT:
case STREAM_ALL:
break;
default:
AUDIO_ERR_LOG("SetMute volumeType=%{public}d not supported", volumeType);
return ERR_NOT_SUPPORTED;
}
if (volumeType == STREAM_ALL) {
int32_t flag = AUDIO_CLIENT_SUCCESS;
for (auto &&audioVolumeType : GetAllVolumeTypes) {
AudioStreamType StreamVolType = (AudioStreamType)audioVolumeType;
float volumeToHdi = MapVolumeToHDI(volume);
int32_t setResult = AudioPolicyManager::GetInstance().SetStreamVolume(StreamVolType, volumeToHdi);
if (setResult != flat) {
flag = setResult;
}
}
return flag;
}
/* Call Audio Policy SetStreamMute */
AudioStreamType StreamVolType = (AudioStreamType)volumeType;
return AudioPolicyManager::GetInstance().SetStreamMute(StreamVolType, mute);
@ -348,12 +373,17 @@ bool AudioSystemManager::IsStreamMute(AudioSystemManager::AudioVolumeType volume
case STREAM_NOTIFICATION:
case STREAM_VOICE_CALL:
case STREAM_VOICE_ASSISTANT:
case STREAM_ALL:
break;
default:
AUDIO_ERR_LOG("IsStreamMute volumeType=%{public}d not supported", volumeType);
return false;
}
if (volumeType == STREAM_ALL) {
volumeType = STREAM_MUSIC;
}
/* Call Audio Policy SetStreamVolume */
AudioStreamType StreamVolType = (AudioStreamType)volumeType;
return AudioPolicyManager::GetInstance().GetStreamMute(StreamVolType);