summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorThomas Weißschuh <thomas@t-8ch.de>2022-10-02 19:53:54 +0200
committerPhilip Langdale <github.philipl@overt.org>2022-10-06 13:16:35 -0700
commita1e29f15552cf50de8f35fb6f7216fa7d36a2607 (patch)
treebbabdffe49760d583ebf49c0037bf40eb6e83752 /audio
parentcc65b3892d89ae35d31067fba285ab20716a1aee (diff)
downloadmpv-a1e29f15552cf50de8f35fb6f7216fa7d36a2607.tar.bz2
mpv-a1e29f15552cf50de8f35fb6f7216fa7d36a2607.tar.xz
ao_pipewire: small cleanups and restructring
* Remove unneeded braces. * Don't use non-standard %m in printf. * Organize struct priv a bit.
Diffstat (limited to 'audio')
-rw-r--r--audio/out/ao_pipewire.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/audio/out/ao_pipewire.c b/audio/out/ao_pipewire.c
index f755c7bf4d..b9144f9921 100644
--- a/audio/out/ao_pipewire.c
+++ b/audio/out/ao_pipewire.c
@@ -54,11 +54,14 @@ struct priv {
struct pw_core *core;
struct spa_hook stream_listener;
- int buffer_msec;
bool muted;
float volume[2];
struct {
+ int buffer_msec;
+ } options;
+
+ struct {
struct pw_registry *registry;
struct spa_hook registry_listener;
struct spa_list sinks;
@@ -134,7 +137,7 @@ static void on_process(void *userdata)
void *data[MP_NUM_CHANNELS];
if ((b = pw_stream_dequeue_buffer(p->stream)) == NULL) {
- MP_WARN(ao, "out of buffers: %m\n");
+ MP_WARN(ao, "out of buffers: %s\n", strerror(errno));
return;
}
@@ -440,7 +443,7 @@ static int init(struct ao *ao)
if (pipewire_init_boilerplate(ao) < 0)
goto error;
- ao->device_buffer = p->buffer_msec * ao->samplerate / 1000;
+ ao->device_buffer = p->options.buffer_msec * ao->samplerate / 1000;
pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%d/%d", ao->device_buffer, ao->samplerate);
pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%d", ao->samplerate);
@@ -661,9 +664,8 @@ static void hotplug_registry_global_remove_cb(void *data, uint32_t id)
done:
pw_thread_loop_unlock(priv->loop);
- if (removed_sink) {
+ if (removed_sink)
ao_hotplug_event(ao);
- }
}
static const struct pw_registry_events hotplug_registry_events = {
@@ -749,11 +751,11 @@ const struct ao_driver audio_out_pipewire = {
{
.loop = NULL,
.stream = NULL,
- .buffer_msec = 20,
+ .options.buffer_msec = 20,
},
.options_prefix = "pipewire",
.options = (const struct m_option[]) {
- {"buffer", OPT_INT(buffer_msec), M_RANGE(1, 2000)},
+ {"buffer", OPT_INT(options.buffer_msec), M_RANGE(1, 2000)},
{0}
},
};