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

Keep some variables local to where they're needed

Browse Source
This commit is contained in:
Chris Robinson 2022-05-12 22:37:21 -07:00
parent dbf5306828
commit 82c8e87ec7
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
alc/backends/pipewire.cpp
View File

@ -1533,11 +1533,10 @@ bool PipeWirePlayback::reset()
"Error connecting PipeWire stream (res: %d)", res}; "Error connecting PipeWire stream (res: %d)", res};
/* Wait for the stream to become paused (ready to start streaming). */ /* Wait for the stream to become paused (ready to start streaming). */
pw_stream_state state{}; plock.wait([stream=mStream.get()]()
const char *error{};
plock.wait([stream=mStream.get(),&state,&error]()
{ {
state = pw_stream_get_state(stream, &error); const char *error{};
pw_stream_state state{pw_stream_get_state(stream, &error)};
if(state == PW_STREAM_STATE_ERROR) if(state == PW_STREAM_STATE_ERROR)
throw al::backend_exception{al::backend_error::DeviceError, throw al::backend_exception{al::backend_error::DeviceError,
"Error connecting PipeWire stream: \"%s\"", error}; "Error connecting PipeWire stream: \"%s\"", error};
@ -1568,18 +1567,17 @@ void PipeWirePlayback::start()
/* Wait for the stream to start playing (would be nice to not, but we need /* Wait for the stream to start playing (would be nice to not, but we need
* the actual update size which is only available after starting). * the actual update size which is only available after starting).
*/ */
pw_stream_state state{}; plock.wait([stream=mStream.get()]()
const char *error{};
plock.wait([stream=mStream.get(),&state,&error]()
{ {
state = pw_stream_get_state(stream, &error); const char *error{};
return state != PW_STREAM_STATE_PAUSED; pw_stream_state state{pw_stream_get_state(stream, &error)};
});
if(state == PW_STREAM_STATE_ERROR) if(state == PW_STREAM_STATE_ERROR)
throw al::backend_exception{al::backend_error::DeviceError, throw al::backend_exception{al::backend_error::DeviceError,
"PipeWire stream error: %s", error ? error : "(unknown)"}; "PipeWire stream error: %s", error ? error : "(unknown)"};
if(state == PW_STREAM_STATE_STREAMING && mRateMatch && mRateMatch->size) return state == PW_STREAM_STATE_STREAMING;
});
if(mRateMatch && mRateMatch->size)
{ {
mDevice->UpdateSize = mRateMatch->size; mDevice->UpdateSize = mRateMatch->size;
mDevice->BufferSize = mDevice->UpdateSize * 2; mDevice->BufferSize = mDevice->UpdateSize * 2;
@ -1902,11 +1900,10 @@ void PipeWireCapture::open(const char *name)
"Error connecting PipeWire stream (res: %d)", res}; "Error connecting PipeWire stream (res: %d)", res};
/* Wait for the stream to become paused (ready to start streaming). */ /* Wait for the stream to become paused (ready to start streaming). */
pw_stream_state state{}; plock.wait([stream=mStream.get()]()
const char *error{};
plock.wait([stream=mStream.get(),&state,&error]()
{ {
state = pw_stream_get_state(stream, &error); const char *error{};
pw_stream_state state{pw_stream_get_state(stream, &error)};
if(state == PW_STREAM_STATE_ERROR) if(state == PW_STREAM_STATE_ERROR)
throw al::backend_exception{al::backend_error::DeviceError, throw al::backend_exception{al::backend_error::DeviceError,
"Error connecting PipeWire stream: \"%s\"", error}; "Error connecting PipeWire stream: \"%s\"", error};
@ -1929,17 +1926,15 @@ void PipeWireCapture::start()
throw al::backend_exception{al::backend_error::DeviceError, throw al::backend_exception{al::backend_error::DeviceError,
"Failed to start PipeWire stream (res: %d)", res}; "Failed to start PipeWire stream (res: %d)", res};
pw_stream_state state{}; plock.wait([stream=mStream.get()]()
const char *error{};
plock.wait([stream=mStream.get(),&state,&error]()
{ {
state = pw_stream_get_state(stream, &error); const char *error{};
return state != PW_STREAM_STATE_PAUSED; pw_stream_state state{pw_stream_get_state(stream, &error)};
});
if(state == PW_STREAM_STATE_ERROR) if(state == PW_STREAM_STATE_ERROR)
throw al::backend_exception{al::backend_error::DeviceError, throw al::backend_exception{al::backend_error::DeviceError,
"PipeWire stream error: %s", error ? error : "(unknown)"}; "PipeWire stream error: %s", error ? error : "(unknown)"};
return state == PW_STREAM_STATE_STREAMING;
});
} }
void PipeWireCapture::stop() void PipeWireCapture::stop()