@samitouri / QOSamiQemu / commits / 2168afd96c

audio: require pulse >= 0.9.13

pulseaudio 0.9.13 was released on 2009-09-10. All our supported distros have it. PA_*_IS_GOOD are from 0.9.11. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Link: https://lore.kernel.org/r/20260211-cleanups-v1-4-e63c96572389@redhat.com Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Marc-André Lureau committed Feb 11, 2026 at 14:01 UTC 2168afd96c10c57def638d99074c87f901ff893b
2 files changed +3 -27
audio/paaudio.c
+2 -26
@@ -62,26 +62,6 @@ static void G_GNUC_PRINTF(2, 3) qpa_logerr(int err, const char *fmt, ...)
62 error_printf(" Reason: %s\n", pa_strerror(err));
63 }
64
65 -#ifndef PA_CONTEXT_IS_GOOD
66 -static inline int PA_CONTEXT_IS_GOOD(pa_context_state_t x)
67 -{
68 - return
69 - x == PA_CONTEXT_CONNECTING ||
70 - x == PA_CONTEXT_AUTHORIZING ||
71 - x == PA_CONTEXT_SETTING_NAME ||
72 - x == PA_CONTEXT_READY;
73 -}
74 -#endif
75 -
76 -#ifndef PA_STREAM_IS_GOOD
77 -static inline int PA_STREAM_IS_GOOD(pa_stream_state_t x)
78 -{
79 - return
80 - x == PA_STREAM_CREATING ||
81 - x == PA_STREAM_READY;
82 -}
83 -#endif
84 -
65 #define CHECK_SUCCESS_GOTO(c, expression, label, msg) \
66 do { \
67 if (!(expression)) { \
@@ -682,9 +662,7 @@ static void qpa_volume_out(HWVoiceOut *hw, Volume *vol)
662 PAConnection *c = pa->g->conn;
663 int i;
664
685 -#ifdef PA_CHECK_VERSION /* macro is present in 0.9.16+ */
686 - pa_cvolume_init (&v); /* function is present in 0.9.13+ */
687 -#endif
665 + pa_cvolume_init(&v);
666
667 v.channels = vol->channels;
668 for (i = 0; i < vol->channels; ++i) {
@@ -724,9 +702,7 @@ static void qpa_volume_in(HWVoiceIn *hw, Volume *vol)
702 PAConnection *c = pa->g->conn;
703 int i;
704
727 -#ifdef PA_CHECK_VERSION
728 - pa_cvolume_init (&v);
729 -#endif
705 + pa_cvolume_init(&v);
706
707 v.channels = vol->channels;
708 for (i = 0; i < vol->channels; ++i) {
meson.build
+1 -1
@@ -1298,7 +1298,7 @@ endif
1298
1299 pulse = not_found
1300 if not get_option('pa').auto() or (host_os == 'linux' and have_system)
1301 - pulse = dependency('libpulse', required: get_option('pa'),
1301 + pulse = dependency('libpulse', version: '>=0.9.13', required: get_option('pa'),
1302 method: 'pkg-config')
1303 endif
1304 alsa = not_found