[gnome-media] Bug 583483 - Raise PulseAudio dependency to 0.9.15

[Marc-Andre Lureau <malureau src gnome org>]

commit e7c371abb4bd9956562c9c6b17a42bd011c65628
Author: Marc-André Lureau <marcandre lureau gmail com>
Date:   Sun Jun 14 22:38:30 2009 +0300

    Bug 583483 - Raise PulseAudio dependency to 0.9.15
    
    A mail has been sent to desktop-devel-list. Fixing build on 0.9.14 is
    not worth, imho, because you would not benefit most of the new
    features. And also because 0.9.15 is way better version.

 configure.ac                               |   14 +-------------
 gnome-volume-control/src/gvc-channel-map.c |    6 ------
 2 files changed, 1 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e54e4ad..3dfd739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,7 @@ GLIB_REQUIRED_VERSION=2.18.2
 GTK_REQUIRED_VERSION=2.14.0
 LIBGLADE_REQUIRED_VERSION=1.99.2
 GCONF_REQUIRED_VERSION=2.6.1
-PA_REQUIRED_VERSION=0.9.12 # FIXME remove extra checks below when we have PA 0.9.15
+PA_REQUIRED_VERSION=0.9.15
 CANBERRA_REQUIRED_VERSION=0.4
 
 PKG_CHECK_MODULES(MEDIA, [
@@ -151,18 +151,6 @@ AC_SUBST(HAVE_PULSEAUDIO)
 AC_SUBST(PULSEAUDIO_CFLAGS)
 AC_SUBST(PULSEAUDIO_LIBS)
 
-dnl FIXME remove when we have PA 0.9.15 hard-deps
-if test "x$have_pulseaudio" = "xyes" ; then
-  PKG_CHECK_MODULES(NEW_PA,
-                    libpulse >= 0.9.15,
-                    have_new_pulseaudio=yes,
-                    have_new_pulseaudio=no)
-  if test "x$have_new_pulseaudio" = "xyes" ; then
-    AC_DEFINE(HAVE_NEW_PULSE, 1, [Define if we have PulseAudio 0.9.15])
-  fi
-fi
-
-
 
 dnl=======================================================================
 dnl Check for the CDDBSlave2 modules
diff --git a/gnome-volume-control/src/gvc-channel-map.c b/gnome-volume-control/src/gvc-channel-map.c
index 0025bdb..32750ef 100644
--- a/gnome-volume-control/src/gvc-channel-map.c
+++ b/gnome-volume-control/src/gvc-channel-map.c
@@ -265,15 +265,9 @@ set_from_pa_map (GvcChannelMap        *map,
 {
         g_assert (pa_channel_map_valid(pa_map));
 
-#ifdef HAVE_NEW_PULSE
         map->priv->can_balance = pa_channel_map_can_balance (pa_map);
         map->priv->can_fade = pa_channel_map_can_fade (pa_map);
         map->priv->has_lfe = gvc_pa_channel_map_has_position (pa_map, PA_CHANNEL_POSITION_LFE);
-#else
-        map->priv->can_balance = TRUE;
-        map->priv->can_fade = FALSE;
-        map->priv->has_lfe = FALSE;
-#endif
 
         map->priv->pa_map = *pa_map;
         pa_cvolume_set(&map->priv->pa_volume, pa_map->channels, PA_VOLUME_NORM);