[gnome-control-center] Use libgnome-volume-control from a submodule

[Bastien Nocera <hadess src gnome org>]

commit f1812b27074719c714be6b14043a539f96c2cc19
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Fri Oct 19 20:25:44 2012 +0200

    Use libgnome-volume-control from a submodule
    
    To be shared with gnome-settings-daemon and gnome-shell
    
    https://bugzilla.gnome.org/show_bug.cgi?id=686488

 .gitmodules                            |    4 +
 configure.ac                           |    4 +
 panels/sound/Makefile.am               |   38 +-
 panels/sound/gvc                       |    1 +
 panels/sound/gvc-channel-map-private.h |   39 -
 panels/sound/gvc-channel-map.c         |  254 ---
 panels/sound/gvc-channel-map.h         |   73 -
 panels/sound/gvc-mixer-card-private.h  |   35 -
 panels/sound/gvc-mixer-card.c          |  570 ------
 panels/sound/gvc-mixer-card.h          |  101 -
 panels/sound/gvc-mixer-control.c       | 3358 --------------------------------
 panels/sound/gvc-mixer-control.h       |  136 --
 panels/sound/gvc-mixer-event-role.c    |  235 ---
 panels/sound/gvc-mixer-event-role.h    |   57 -
 panels/sound/gvc-mixer-sink-input.c    |  166 --
 panels/sound/gvc-mixer-sink-input.h    |   57 -
 panels/sound/gvc-mixer-sink.c          |  196 --
 panels/sound/gvc-mixer-sink.h          |   57 -
 panels/sound/gvc-mixer-source-output.c |  121 --
 panels/sound/gvc-mixer-source-output.h |   57 -
 panels/sound/gvc-mixer-source.c        |  196 --
 panels/sound/gvc-mixer-source.h        |   57 -
 panels/sound/gvc-mixer-stream.c        | 1006 ----------
 panels/sound/gvc-mixer-stream.h        |  131 --
 panels/sound/gvc-mixer-ui-device.c     |  656 -------
 panels/sound/gvc-mixer-ui-device.h     |   82 -
 panels/sound/gvc-pulseaudio-fake.h     |   34 -
 27 files changed, 18 insertions(+), 7703 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 992c00b..a9208a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "egg-list-box"]
 	path = egg-list-box
 	url = git://git.gnome.org/egg-list-box
+
+[submodule "panels/sound/gvc"]
+	path = panels/sound/gvc
+	url = git://git.gnome.org/libgnome-volume-control
diff --git a/configure.ac b/configure.ac
index 954e73f..5416331 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,9 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
                   pwquality
                   libsystemd-login)
 
+PKG_CHECK_MODULES(GVC, gobject-2.0 libpulse libpulse-mainloop-glib)
+AM_CONDITIONAL(HAVE_INTROSPECTION, false)
+
 GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
 AC_SUBST(GDESKTOP_PREFIX)
 
@@ -426,6 +429,7 @@ panels/online-accounts/icons/32x32/Makefile
 panels/online-accounts/icons/48x48/Makefile
 panels/online-accounts/icons/256x256/Makefile
 panels/sound/Makefile
+panels/sound/gvc/Makefile
 panels/sound/data/Makefile
 panels/sound/data/gnome-sound-panel.desktop.in
 panels/sound/data/symbolic-icons/Makefile
diff --git a/panels/sound/Makefile.am b/panels/sound/Makefile.am
index ed758a1..e440dba 100644
--- a/panels/sound/Makefile.am
+++ b/panels/sound/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data
+SUBDIRS = data gvc
 
 # This is used in PANEL_CFLAGS
 cappletname = sound
@@ -8,6 +8,7 @@ ccpanelsdir = $(PANELS_DIR)
 ccpanels_LTLIBRARIES = libsound.la
 
 AM_CPPFLAGS =					\
+	-I$(srcdir)/gvc/			\
 	$(PANEL_CFLAGS) 			\
 	$(SOUND_PANEL_CFLAGS)			\
 	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
@@ -18,40 +19,19 @@ AM_CPPFLAGS =					\
 	-DICON_DATA_DIR="\"$(pkgdatadir)/icons\"" \
 	$(NULL)
 
-noinst_LTLIBRARIES = libgnomevolumecontrol.la
-libgnomevolumecontrol_la_SOURCES =		\
-	gvc-mixer-card.h			\
-	gvc-mixer-card.c			\
-	gvc-mixer-card-private.h		\
-	gvc-mixer-stream.h			\
-	gvc-mixer-stream.c			\
-	gvc-mixer-stream-private.h		\
-	gvc-channel-map.h			\
-	gvc-channel-map.c			\
-	gvc-channel-map-private.h		\
-	gvc-mixer-ui-device.h			\
-	gvc-mixer-ui-device.c			\
-	gvc-mixer-sink.h			\
-	gvc-mixer-sink.c			\
-	gvc-mixer-source.h			\
-	gvc-mixer-source.c			\
-	gvc-mixer-sink-input.h			\
-	gvc-mixer-sink-input.c			\
-	gvc-mixer-source-output.h		\
-	gvc-mixer-source-output.c		\
-	gvc-mixer-event-role.h			\
-	gvc-mixer-event-role.c			\
-	gvc-mixer-control.h			\
-	gvc-mixer-control.c			\
-	gvc-mixer-control-private.h		\
+# Needed because Automake complains if
+# the same source file is used in a library
+# and in an executable
+noinst_LTLIBRARIES = libgvcgtk.la
+libgvcgtk_la_SOURCES = 				\
 	gvc-channel-bar.h			\
 	gvc-channel-bar.c			\
-	gvc-pulseaudio-fake.h			\
 	$(NULL)
 
 libsound_la_LIBADD =				\
 	-lm					\
-	libgnomevolumecontrol.la		\
+	gvc/libgvc.la				\
+	libgvcgtk.la				\
 	$(PANEL_LIBS)				\
 	$(SOUND_PANEL_LIBS)			\
 	$(NULL)
diff --git a/panels/sound/gvc b/panels/sound/gvc
new file mode 160000
index 0000000..f3df56c
--- /dev/null
+++ b/panels/sound/gvc
@@ -0,0 +1 @@
+Subproject commit f3df56c399279f52b141b4a2fa3df0b08bdcec55