Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 23:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] audio/pw: drop redundant flushing state

Browse Source 
We do not stop the audio device until after the internal buffer has already
been flushed, so this state does nothing useful.
This commit is contained in:
Chris Spencer 2022-01-24 20:52:27 +00:00 committed by Geoffrey McRae
parent d93510e9f2
commit 8580978321
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/audiodevs/PipeWire/pipewire.c
View File

@ -33,7 +33,6 @@ typedef enum
{ {
STREAM_STATE_INACTIVE, STREAM_STATE_INACTIVE,
STREAM_STATE_ACTIVE, STREAM_STATE_ACTIVE,
STREAM_STATE_FLUSHING,
STREAM_STATE_DRAINING, STREAM_STATE_DRAINING,
STREAM_STATE_RESTARTING STREAM_STATE_RESTARTING
} }
@ -109,14 +108,6 @@ static void pipewire_onPlaybackProcess(void * userdata)
frames = pw.playback.pullFn(dst, frames); frames = pw.playback.pullFn(dst, frames);
if (!frames) if (!frames)
{ {
if (pw.playback.state == STREAM_STATE_FLUSHING)
{
pw_thread_loop_lock(pw.thread);
pw_stream_flush(pw.playback.stream, true);
pw.playback.state = STREAM_STATE_DRAINING;
pw_thread_loop_unlock(pw.thread);
}
sbuf->datas[0].chunk->size = 0; sbuf->datas[0].chunk->size = 0;
pw_stream_queue_buffer(pw.playback.stream, pbuf); pw_stream_queue_buffer(pw.playback.stream, pbuf);
return; return;
@ -299,12 +290,6 @@ static bool pipewire_playbackStart(int framesBuffered)
} }
break; break;
case STREAM_STATE_FLUSHING:
// We were preparing to stop; just carry on as if nothing happened
pw.playback.state = STREAM_STATE_ACTIVE;
start = true;
break;
case STREAM_STATE_DRAINING: case STREAM_STATE_DRAINING:
// We are in the middle of draining the PipeWire buffers; we will need // We are in the middle of draining the PipeWire buffers; we will need
// to reactivate the stream once this has completed // to reactivate the stream once this has completed
@ -332,7 +317,8 @@ static void pipewire_playbackStop(void)
switch (pw.playback.state) switch (pw.playback.state)
{ {
case STREAM_STATE_ACTIVE: case STREAM_STATE_ACTIVE:
pw.playback.state = STREAM_STATE_FLUSHING; pw_stream_flush(pw.playback.stream, true);
pw.playback.state = STREAM_STATE_DRAINING;
break; break;
case STREAM_STATE_RESTARTING: case STREAM_STATE_RESTARTING: