RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-14 02:51:26 +00:00
Code Issues Releases Wiki Activity

ao_pipewire: compatibility for libpipewire 0.3.19

Browse Source
This commit is contained in:
Thomas Weißschuh 2022-10-26 15:45:53 +02:00 committed by Jan Ekström
parent 8b81f45e1b
commit c9af75e888
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/out/ao_pipewire.c
View File

@ -42,6 +42,12 @@
#define PW_KEY_NODE_RATE "node.rate" #define PW_KEY_NODE_RATE "node.rate"
#endif #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) #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) { 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); return pw_stream_get_time(stream, time);

2
meson.build
View File

@ -831,7 +831,7 @@ if features['oss-audio']
sources += files('audio/out/ao_oss.c') sources += files('audio/out/ao_oss.c')
endif 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()} features += {'pipewire': pipewire.found()}
if features['pipewire'] if features['pipewire']
dependencies += pipewire dependencies += pipewire

2
wscript
View File

@ -446,7 +446,7 @@ audio_output_features = [
}, { }, {
'name': '--pipewire', 'name': '--pipewire',
'desc': 'PipeWire audio output', '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', 'name': '--sndio',
'desc': 'sndio audio input/output', 'desc': 'sndio audio input/output',