From ac0c02a857b1f9d7eab3524d4463b3b59f45a44e Mon Sep 17 00:00:00 2001 From: zhanhang Date: Thu, 25 May 2023 19:01:34 +0800 Subject: [PATCH] add isSetDefaultSource_ variable Signed-off-by: zhanhang --- .../audioadapter/include/pulse_audio_service_adapter_impl.h | 1 + .../audioadapter/src/pulse_audio_service_adapter_impl.cpp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h b/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h index 3295b601e9..a5ca533ce9 100644 --- a/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h +++ b/frameworks/native/audioadapter/include/pulse_audio_service_adapter_impl.h @@ -94,6 +94,7 @@ private: static std::unordered_map sourceIndexSessionIDMap; std::mutex mMutex; bool isSetDefaultSink_ = false; + bool isSetDefaultSource_ = false; }; } // namespace AudioStandard } // namespace OHOS diff --git a/frameworks/native/audioadapter/src/pulse_audio_service_adapter_impl.cpp b/frameworks/native/audioadapter/src/pulse_audio_service_adapter_impl.cpp index 1183b242a0..41a66f32df 100644 --- a/frameworks/native/audioadapter/src/pulse_audio_service_adapter_impl.cpp +++ b/frameworks/native/audioadapter/src/pulse_audio_service_adapter_impl.cpp @@ -271,6 +271,7 @@ int32_t PulseAudioServiceAdapterImpl::SetDefaultSource(string name) pa_threaded_mainloop_unlock(mMainLoop); return ERR_OPERATION_FAILED; } + isSetDefaultSource_ = true; pa_operation_unref(operation); pa_threaded_mainloop_unlock(mMainLoop); @@ -672,6 +673,11 @@ vector PulseAudioServiceAdapterImpl::GetAllSourceOutputs() return userData->sourceOutputList; } + if (!isSetDefaultSource_) { + AUDIO_ERR_LOG("[PulseAudioServiceAdapterImpl] default source has not been set."); + return userData->sourceOutputList; + } + pa_threaded_mainloop_lock(mMainLoop); pa_operation *operation = pa_context_get_source_output_info_list(mContext, -- Gitee