[gnome-settings-daemon] media-keys: Require PulseAudio and libcanberra

[Bastien Nocera <hadess src gnome org>]

commit dfd036267d6552603204676bee8794773782ad13
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Sep 19 14:00:07 2011 +0100

    media-keys: Require PulseAudio and libcanberra
    
    https://bugzilla.gnome.org/show_bug.cgi?id=659338

 configure.ac                                |    2 +-
 plugins/media-keys/Makefile.am              |   18 +++---------------
 plugins/media-keys/cut-n-paste/Makefile.am  |    4 ++--
 plugins/media-keys/gsd-media-keys-manager.c |   21 ++-------------------
 4 files changed, 8 insertions(+), 37 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aff0f8f..7b8f4ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,7 +202,7 @@ dnl ---------------------------------------------------------------------------
 dnl - media-keys plugin stuff
 dnl ---------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 upower-glib >= $UPOWER_GLIB_REQUIRED_VERSION])
+PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 upower-glib >= $UPOWER_GLIB_REQUIRED_VERSION libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra-gtk3])
 
 dnl ---------------------------------------------------------------------------
 dnl - GConf<->GSettings bridge
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 456e8f6..b5d2dfc 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -5,13 +5,8 @@ plugin_name = media-keys
 
 NULL =
 
-SUBDIRS =
-plugin_LTLIBRARIES =
-
-if HAVE_PULSE
-SUBDIRS += cut-n-paste
-plugin_LTLIBRARIES += libmedia-keys.la
-endif
+SUBDIRS = cut-n-paste
+plugin_LTLIBRARIES = libmedia-keys.la
 
 BUILT_SOURCES = 			\
 	gsd-marshal.h			\
@@ -67,9 +62,7 @@ libmedia_keys_la_LIBADD  = 		\
 plugin_in_files = 		\
 	media-keys.gnome-settings-plugin.in
 
-if HAVE_PULSE
 plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-endif
 
 noinst_PROGRAMS =				\
 	test-media-keys				\
@@ -135,17 +128,12 @@ test_media_keys_CFLAGS = \
 test_media_keys_LDADD = \
 	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la		\
 	$(top_builddir)/plugins/common/libcommon.la			\
+	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\
 	$(MEDIA_KEYS_LIBS)			\
 	-lm
 
-if HAVE_PULSE
-test_media_keys_LDADD += $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la
-endif
-
-DIST_SUBDIRS = cut-n-paste
-
 EXTRA_DIST = 				\
 	gsd-marshal.list		\
 	$(plugin_in_files)
diff --git a/plugins/media-keys/cut-n-paste/Makefile.am b/plugins/media-keys/cut-n-paste/Makefile.am
index b966017..45a3c99 100644
--- a/plugins/media-keys/cut-n-paste/Makefile.am
+++ b/plugins/media-keys/cut-n-paste/Makefile.am
@@ -4,11 +4,11 @@ noinst_LTLIBRARIES = libgvc.la
 
 INCLUDES =					\
 	$(WARN_CFLAGS)				\
-	$(PULSE_CFLAGS)				\
+	$(MEDIA_KEYS_CFLAGS)			\
 	$(NULL)
 
 libgvc_la_LIBADD =		\
-	$(PULSE_LIBS)		\
+	$(MEDIA_KEYS_LIBS)	\
 	$(NULL)
 
 libgvc_la_SOURCES =			\
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index c2ddf96..ecbb592 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -50,11 +50,9 @@
 #include "gsd-input-helper.h"
 #include "gsd-enums.h"
 
-#ifdef HAVE_PULSE
 #include <canberra-gtk.h>
 #include <pulse/pulseaudio.h>
 #include "gvc-mixer-control.h"
-#endif /* HAVE_PULSE */
 
 #include <libupower-glib/upower.h>
 
@@ -103,11 +101,10 @@ typedef struct {
 
 struct GsdMediaKeysManagerPrivate
 {
-#ifdef HAVE_PULSE
         /* Volume bits */
         GvcMixerControl *volume;
         GvcMixerStream  *stream;
-#endif /* HAVE_PULSE */
+
         GtkWidget       *dialog;
         GSettings       *settings;
 
@@ -663,7 +660,6 @@ do_touchpad_action (GsdMediaKeysManager *manager)
         g_object_unref (settings);
 }
 
-#ifdef HAVE_PULSE
 static void
 update_dialog (GsdMediaKeysManager *manager,
                guint vol,
@@ -797,8 +793,6 @@ on_control_stream_removed (GvcMixerControl     *control,
         }
 }
 
-#endif /* HAVE_PULSE */
-
 static void
 free_media_player (MediaPlayer *player)
 {
@@ -1429,24 +1423,16 @@ do_action (GsdMediaKeysManager *manager,
         case MUTE_KEY:
         case VOLUME_DOWN_KEY:
         case VOLUME_UP_KEY:
-#ifdef HAVE_PULSE
                 do_sound_action (manager, type, FALSE);
-#endif /* HAVE_PULSE */
                 break;
         case MUTE_QUIET_KEY:
-#ifdef HAVE_PULSE
                 do_sound_action (manager, MUTE_KEY, TRUE);
-#endif /* HAVE_PULSE */
                 break;
         case VOLUME_DOWN_QUIET_KEY:
-#ifdef HAVE_PULSE
                 do_sound_action (manager, VOLUME_DOWN_KEY, TRUE);
-#endif /* HAVE_PULSE */
                 break;
         case VOLUME_UP_QUIET_KEY:
-#ifdef HAVE_PULSE
                 do_sound_action (manager, VOLUME_UP_KEY, TRUE);
-#endif /* HAVE_PULSE */
                 break;
         case LOGOUT_KEY:
                 do_logout_action (manager);
@@ -1705,7 +1691,6 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager,
 {
         gnome_settings_profile_start (NULL);
 
-#ifdef HAVE_PULSE
         /* initialise Volume handler
          *
          * We do this one here to force checking gstreamer cache, etc.
@@ -1732,7 +1717,7 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager,
         gvc_mixer_control_open (manager->priv->volume);
 
         gnome_settings_profile_end ("gvc_mixer_control_new");
-#endif /* HAVE_PULSE */
+
         manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager);
 
         register_manager (manager_object);
@@ -1823,7 +1808,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
                 priv->screens = NULL;
         }
 
-#ifdef HAVE_PULSE
         if (priv->stream) {
                 g_object_unref (priv->stream);
                 priv->stream = NULL;
@@ -1833,7 +1817,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
                 g_object_unref (priv->volume);
                 priv->volume = NULL;
         }
-#endif /* HAVE_PULSE */
 
         if (priv->dialog != NULL) {
                 gtk_widget_destroy (priv->dialog);