Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure proper names are used for querying PulseAudio info

Browse Source
This commit is contained in:
Chris Robinson
2021-01-10 13:34:05 -08:00
parent 3348d3ce15
commit 1f01311ee3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
alc/backends/pulseaudio.cpp
+5 -5
View File
@@ -873,8 +873,8 @@ void PulsePlayback::open(const char *name)
mDeviceName = pulse_name ? al::make_optional<std::string>(pulse_name) : al::nullopt; mDeviceName = pulse_name ? al::make_optional<std::string>(pulse_name) : al::nullopt;
if(!dev_name) if(!dev_name)
{ {
pa_operation *op{pa_context_get_sink_info_by_name(mContext, pulse_name, pa_operation *op{pa_context_get_sink_info_by_name(mContext,
&PulsePlayback::sinkNameCallbackC, this)}; pa_stream_get_device_name(mStream), &PulsePlayback::sinkNameCallbackC, this)};
mMainloop.waitForOperation(op, plock); mMainloop.waitForOperation(op, plock);
} }
else else
@@ -883,8 +883,8 @@ void PulsePlayback::open(const char *name)
bool PulsePlayback::reset() bool PulsePlayback::reset()
{ {
const auto deviceName = mDeviceName ? mDeviceName->c_str() : nullptr;
auto plock = mMainloop.getUniqueLock(); auto plock = mMainloop.getUniqueLock();
const auto deviceName = mDeviceName ? mDeviceName->c_str() : nullptr;
if(mStream) if(mStream)
{ {
@@ -1280,8 +1280,8 @@ void PulseCapture::open(const char *name)
mDeviceName = pulse_name ? al::make_optional<std::string>(pulse_name) : al::nullopt; mDeviceName = pulse_name ? al::make_optional<std::string>(pulse_name) : al::nullopt;
if(mDevice->DeviceName.empty()) if(mDevice->DeviceName.empty())
{ {
pa_operation *op{pa_context_get_source_info_by_name(mContext, pulse_name, pa_operation *op{pa_context_get_source_info_by_name(mContext,
&PulseCapture::sourceNameCallbackC, this)}; pa_stream_get_device_name(mStream), &PulseCapture::sourceNameCallbackC, this)};
mMainloop.waitForOperation(op, plock); mMainloop.waitForOperation(op, plock);
} }
} }