diff options
| author | monsta <[email protected]> | 2018-05-18 13:55:05 +0300 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-05-21 12:09:37 +0200 |
| commit | d6a79fd134a9bf15654b91657621ea25f4edc1a2 (patch) | |
| tree | 7fe6690e7576bfc8e17d1332a6be293ec44ec86c | |
| parent | 99d6d9c8467c65e4e2fac1c45bf93544bb0b4cf4 (diff) | |
| download | libmatemixer-d6a79fd134a9bf15654b91657621ea25f4edc1a2.tar.bz2 libmatemixer-d6a79fd134a9bf15654b91657621ea25f4edc1a2.tar.xz | |
require PulseAudio 5.0 and drop some old code
| -rw-r--r-- | backends/pulse/pulse-device.c | 11 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/backends/pulse/pulse-device.c b/backends/pulse/pulse-device.c index 9b75ca4..454e80a 100644 --- a/backends/pulse/pulse-device.c +++ b/backends/pulse/pulse-device.c @@ -260,15 +260,9 @@ pulse_device_update (PulseDevice *device, const pa_card_info *info) g_return_if_fail (PULSE_IS_DEVICE (device)); g_return_if_fail (info != NULL); -#if PA_CHECK_VERSION (5, 0, 0) if G_LIKELY (info->active_profile2 != NULL) pulse_device_switch_set_active_profile_by_name (device->priv->pswitch, info->active_profile2->name); -#else - if G_LIKELY (info->active_profile != NULL) - pulse_device_switch_set_active_profile_by_name (device->priv->pswitch, - info->active_profile->name); -#endif } void @@ -404,7 +398,6 @@ pulse_device_load (PulseDevice *device, const pa_card_info *info) for (i = 0; i < info->n_profiles; i++) { PulseDeviceProfile *profile; -#if PA_CHECK_VERSION (5, 0, 0) pa_card_profile_info2 *p_info = info->profiles2[i]; /* PulseAudio 5.0 includes a new pa_card_profile_info2 which only @@ -412,10 +405,6 @@ pulse_device_load (PulseDevice *device, const pa_card_info *info) * which are unavailable */ if (p_info->available == 0) continue; -#else - /* The old profile list is an array of structs, not pointers */ - pa_card_profile_info *p_info = &info->profiles[i]; -#endif profile = pulse_device_profile_new (p_info->name, p_info->description, diff --git a/configure.ac b/configure.ac index ce0ef74..7c22723 100644 --- a/configure.ac +++ b/configure.ac @@ -113,7 +113,7 @@ AC_SUBST(HAVE_NULL) # ----------------------------------------------------------------------- # PulseAudio # ----------------------------------------------------------------------- -PA_REQUIRED_VERSION=2.0.0 +PA_REQUIRED_VERSION=5.0.0 AC_ARG_ENABLE([pulseaudio], AS_HELP_STRING([--enable-pulseaudio], |