Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-07-28 10:52:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[client] pipewire: make it possible to stop from the process callback

Browse Source
This commit is contained in:
Geoffrey McRae
2026-07-28 13:32:41 +10:00
parent a421be5e54
commit 532305d263
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,10 +134,8 @@ static void pipewire_onPlaybackProcess(void * userdata)
static void pipewire_onPlaybackDrained(void * userdata) static void pipewire_onPlaybackDrained(void * userdata)
{ {
pw_thread_loop_lock(pw.thread);
pw_stream_set_active(pw.playback.stream, false); pw_stream_set_active(pw.playback.stream, false);
pw.playback.state = STREAM_STATE_INACTIVE; pw.playback.state = STREAM_STATE_INACTIVE;
pw_thread_loop_unlock(pw.thread);
} }
static struct Option pipewire_options[] = static struct Option pipewire_options[] =
@@ -361,10 +359,9 @@ static void pipewire_playbackStart(void)
if (!pw.playback.stream) if (!pw.playback.stream)
return; return;
pw_thread_loop_lock(pw.thread);
if (pw.playback.state != STREAM_STATE_ACTIVE) if (pw.playback.state != STREAM_STATE_ACTIVE)
{ {
pw_thread_loop_lock(pw.thread);
switch (pw.playback.state) switch (pw.playback.state)
{ {
case STREAM_STATE_INACTIVE: case STREAM_STATE_INACTIVE:
@@ -380,20 +377,33 @@ static void pipewire_playbackStart(void)
default: default:
DEBUG_UNREACHABLE(); DEBUG_UNREACHABLE();
} }
pw_thread_loop_unlock(pw.thread);
} }
pw_thread_loop_unlock(pw.thread);
} }
static void pipewire_playbackStop(void) static void pipewire_playbackStop(void)
{ {
if (pw.playback.state != STREAM_STATE_ACTIVE) const bool inThread = pw_thread_loop_in_thread(pw.thread);
return; if (!inThread)
pw_thread_loop_lock(pw.thread);
pw_thread_loop_lock(pw.thread); if (pw.playback.state != STREAM_STATE_ACTIVE)
pw_stream_flush(pw.playback.stream, true); goto done;
pw.playback.state = STREAM_STATE_DRAINING;
pw_thread_loop_unlock(pw.thread); if (inThread)
{
pw_stream_set_active(pw.playback.stream, false);
pw.playback.state = STREAM_STATE_INACTIVE;
}
else
{
pw_stream_flush(pw.playback.stream, true);
pw.playback.state = STREAM_STATE_DRAINING;
}
done:
if (!inThread)
pw_thread_loop_unlock(pw.thread);
} }
static void pipewire_playbackVolume(int channels, const uint16_t volume[]) static void pipewire_playbackVolume(int channels, const uint16_t volume[])