diff options
| author | Thomas Weißschuh <thomas@t-8ch.de> | 2022-10-26 15:45:53 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2022-10-26 21:56:33 +0300 |
| commit | c9af75e888c8ad7b534a03631bc4a76a2f59603c (patch) | |
| tree | dbc184f8d2eabad930fe98cdb5aa86c76ae7df10 | |
| parent | 8b81f45e1ba98ed8f1fd85b80c3cca06523f2b4d (diff) | |
| download | mpv-c9af75e888c8ad7b534a03631bc4a76a2f59603c.tar.bz2 mpv-c9af75e888c8ad7b534a03631bc4a76a2f59603c.tar.xz | |
ao_pipewire: compatibility for libpipewire 0.3.19
| -rw-r--r-- | audio/out/ao_pipewire.c | 6 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | wscript | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/audio/out/ao_pipewire.c b/audio/out/ao_pipewire.c index 6628cd4b48..8197858d51 100644 --- a/audio/out/ao_pipewire.c +++ b/audio/out/ao_pipewire.c @@ -42,6 +42,12 @@ #define PW_KEY_NODE_RATE "node.rate" #endif +// Added in Pipewire 0.3.44 +// remove the fallback when we require a newer version +#ifndef PW_KEY_TARGET_OBJECT +#define PW_KEY_TARGET_OBJECT "target.object" +#endif + #if !PW_CHECK_VERSION(0, 3, 50) static inline int pw_stream_get_time_n(struct pw_stream *stream, struct pw_time *time, size_t size) { return pw_stream_get_time(stream, time); diff --git a/meson.build b/meson.build index 629e374a66..6d85b4e3cb 100644 --- a/meson.build +++ b/meson.build @@ -831,7 +831,7 @@ if features['oss-audio'] sources += files('audio/out/ao_oss.c') endif -pipewire = dependency('libpipewire-0.3', version: '>= 0.3', required: get_option('pipewire')) +pipewire = dependency('libpipewire-0.3', version: '>= 0.3.19', required: get_option('pipewire')) features += {'pipewire': pipewire.found()} if features['pipewire'] dependencies += pipewire @@ -446,7 +446,7 @@ audio_output_features = [ }, { 'name': '--pipewire', 'desc': 'PipeWire audio output', - 'func': check_pkg_config('libpipewire-0.3', '>= 0.3.0') + 'func': check_pkg_config('libpipewire-0.3', '>= 0.3.19') }, { 'name': '--sndio', 'desc': 'sndio audio input/output', |