Skip to content

Commit f28a49f

Browse files
committed
Merge remote-tracking branch 'origin/pr/197'
* origin/pr/197: Use the drained callback on the playback stream
2 parents a7a6bff + fc04d11 commit f28a49f

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

pipewire/qubes-pw-module.c

+8-1
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,8 @@ static void stream_state_changed(void *data, enum pw_stream_state old,
11741174
return;
11751175
case PW_STREAM_STATE_PAUSED:
11761176
pw_log_debug("%s paused", name);
1177-
set_stream_state(stream, false);
1177+
if (!qubes_stream_is_playback(stream))
1178+
set_stream_state(stream, false);
11781179
break;
11791180
case PW_STREAM_STATE_STREAMING:
11801181
pw_log_debug("%s streaming", name);
@@ -1426,6 +1427,11 @@ static void stream_param_changed(void *data, uint32_t id, const struct spa_pod *
14261427
}
14271428
}
14281429

1430+
static void playback_stream_drained(void *data)
1431+
{
1432+
set_stream_state(data, false);
1433+
}
1434+
14291435
static const struct pw_stream_events capture_stream_events = {
14301436
.version = PW_VERSION_STREAM_EVENTS,
14311437
.destroy = stream_destroy,
@@ -1448,6 +1454,7 @@ static const struct pw_stream_events playback_stream_events = {
14481454
.add_buffer = NULL,
14491455
.remove_buffer = NULL,
14501456
.process = playback_stream_process,
1457+
.drained = playback_stream_drained,
14511458
};
14521459

14531460
static void core_error(void *data, uint32_t id, int seq, int res, const char *message)

0 commit comments

Comments
 (0)