From 974d1b9e6d174f1680604b2872911110f6a0e41c Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 13 Jan 2023 01:25:20 -0800 Subject: Avoid unnecessary uses of make_optional --- alc/backends/pulseaudio.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'alc/backends/pulseaudio.cpp') diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp index 5eef8f87..f79e49b0 100644 --- a/alc/backends/pulseaudio.cpp +++ b/alc/backends/pulseaudio.cpp @@ -836,7 +836,8 @@ void PulsePlayback::open(const char *name) pa_stream_set_moved_callback(mStream, &PulsePlayback::streamMovedCallbackC, this); mFrameSize = static_cast(pa_frame_size(pa_stream_get_sample_spec(mStream))); - mDeviceName = pulse_name ? al::make_optional(pulse_name) : al::nullopt; + if(pulse_name) mDeviceName.emplace(pulse_name); + else mDeviceName.reset(); if(!dev_name) { pa_operation *op{pa_context_get_sink_info_by_name(mContext, @@ -1251,7 +1252,8 @@ void PulseCapture::open(const char *name) pa_stream_set_moved_callback(mStream, &PulseCapture::streamMovedCallbackC, this); pa_stream_set_state_callback(mStream, &PulseCapture::streamStateCallbackC, this); - mDeviceName = pulse_name ? al::make_optional(pulse_name) : al::nullopt; + if(pulse_name) mDeviceName.emplace(pulse_name); + else mDeviceName.reset(); if(mDevice->DeviceName.empty()) { pa_operation *op{pa_context_get_source_info_by_name(mContext, -- cgit v1.2.3