[gnome-media/gstreamer-1.0: 2/8] remove gst-mixer

[Oleksij Rempel <orempel src gnome org>]

commit fb26464ca79c91e244ee2fa7b6ef464c7f024b9c
Author: Oleksij Rempel <bug-track fisher-privat net>
Date:   Wed Jul 4 11:44:35 2012 +0200

    remove gst-mixer
    
    Signed-off-by: Oleksij Rempel <bug-track fisher-privat net>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=679381

 Makefile.am                                  |    6 -
 configure.ac                                 |   91 +----
 gst-mixer/Makefile.am                        |   28 --
 gst-mixer/doc/C/Makefile.am                  |    9 -
 gst-mixer/doc/C/gnome-volume-control.xml     |  434 -----------------
 gst-mixer/doc/C/l10n.txt                     |   22 -
 gst-mixer/doc/C/legal.xml                    |   76 ---
 gst-mixer/doc/C/topic.dat                    |    1 -
 gst-mixer/doc/ChangeLog                      |   71 ---
 gst-mixer/doc/Makefile.am                    |    9 -
 gst-mixer/doc/ca/ca.po                       |  674 -------------------------
 gst-mixer/doc/cs/cs.po                       |  662 -------------------------
 gst-mixer/doc/da/da.po                       |  672 -------------------------
 gst-mixer/doc/de/de.po                       |  673 -------------------------
 gst-mixer/doc/el/el.po                       |  669 -------------------------
 gst-mixer/doc/en_GB/en_GB.po                 |  655 -------------------------
 gst-mixer/doc/es/es.po                       |  675 --------------------------
 gst-mixer/doc/fr/fr.po                       |  606 -----------------------
 gst-mixer/doc/gnome-volume-control.omf.in    |   30 --
 gst-mixer/doc/it/it.po                       |  595 -----------------------
 gst-mixer/doc/oc/oc.po                       |  565 ---------------------
 gst-mixer/doc/ru/ru.po                       |  650 -------------------------
 gst-mixer/doc/sl/sl.po                       |  563 ---------------------
 gst-mixer/doc/sv/sv.po                       |  447 -----------------
 gst-mixer/doc/uk/gnome-volume-control-uk.omf |   30 --
 gst-mixer/doc/uk/gnome-volume-control.xml    |  358 --------------
 gst-mixer/doc/uk/legal.xml                   |   76 ---
 gst-mixer/doc/zh_CN/zh_CN.po                 |  612 -----------------------
 gst-mixer/gnome-volume-control.desktop.in.in |   15 -
 gst-mixer/gnome-volume-control.schemas.in    |   29 --
 gst-mixer/icons/16x16/Makefile.am            |    4 -
 gst-mixer/icons/16x16/devices/Makefile.am    |   19 -
 gst-mixer/icons/16x16/status/Makefile.am     |   16 -
 gst-mixer/icons/Makefile.am                  |   15 -
 gst-mixer/pixmaps/Makefile.am                |    9 -
 gst-mixer/src/Makefile.am                    |   42 --
 gst-mixer/src/button.c                       |  133 -----
 gst-mixer/src/button.h                       |   71 ---
 gst-mixer/src/element.c                      |  595 -----------------------
 gst-mixer/src/element.h                      |   68 ---
 gst-mixer/src/keys.h                         |   39 --
 gst-mixer/src/main.c                         |  177 -------
 gst-mixer/src/misc.c                         |   72 ---
 gst-mixer/src/misc.h                         |   32 --
 gst-mixer/src/preferences.c                  |  441 -----------------
 gst-mixer/src/preferences.h                  |   77 ---
 gst-mixer/src/track.c                        |  647 ------------------------
 gst-mixer/src/track.h                        |  113 -----
 gst-mixer/src/volume.c                       |  552 ---------------------
 gst-mixer/src/volume.h                       |   82 ----
 gst-mixer/src/window.c                       |  435 -----------------
 gst-mixer/src/window.h                       |   75 ---
 52 files changed, 1 insertions(+), 13716 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 088058f..b4c5cf7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,10 +10,6 @@ if HAVE_SOUND_THEME
 SUBDIRS += sound-theme
 endif
 
-if HAVE_GSTMIXER
-SUBDIRS += gst-mixer
-endif
-
 if HAVE_GSTPROPS
 SUBDIRS += gstreamer-properties
 endif
@@ -26,7 +22,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 DIST_SUBDIRS = \
 	po 			\
 	grecord			\
-	gst-mixer		\
 	gstreamer-properties	\
 	sound-theme		\
 	$(NULL)
@@ -38,7 +33,6 @@ EXTRA_DIST = \
 	COPYING			\
 	COPYING-DOCS		\
 	COPYING.grecord		\
-	COPYING.gst-mixer	\
 	MAINTAINERS		\
         build-aux/git-version-gen \
 	build-aux/gnome-doc-utils.make	\
diff --git a/configure.ac b/configure.ac
index 717e5ad..b4d9c55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,7 @@ if test "x$have_gst" = "xyes" && test "x$enable_grecord" = "xyes"; then
   have_grecord=yes
 else
   if test "x$have_gst" = "xno"; then
-    AC_MSG_WARN([You need GStreamer installed for the mixer and recorder to work])
+    AC_MSG_WARN([You need GStreamer installed for the recorder to work])
     sleep 5 2>/dev/null
   fi
 fi
@@ -158,81 +158,6 @@ GNOME_DOC_INIT
 AM_PROG_LIBTOOL
 AM_PROG_CC_C_O
 
-dnl=======================================================================
-dnl gstreamer-properties
-dnl=======================================================================
-
-have_gstprops=no
-
-AC_ARG_ENABLE([gstprops],
-  AS_HELP_STRING([--enable-gstprops], [enable gstreamer properties]),
-  ,enable_gstprops=yes)
-
-if test "x$have_gst" = "xyes" && test "x$enable_gstprops" = "xyes";
-then
-  PKG_CHECK_MODULES(GSTPROPS, [
-    glib-2.0
-    gtk+-3.0 >= $GTK_REQUIRED_VERSION
-    gconf-2.0
-    gstreamer-$GST_MAJORMINOR
-    gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ
-    libxml-2.0],
-    have_gstprops=yes)
-
-  GSTPROPS_LIBS="$GSTPROPS_LIBS -lgstinterfaces-$GST_MAJORMINOR"
-
-  GNOMECC_DESKTOP_DIR=${datadir}/control-center-2.0/capplets
-  AS_AC_EXPAND(GNOMECC_DESKTOP_DIR, $GNOMECC_DESKTOP_DIR)
-  AC_DEFINE_UNQUOTED(GNOMECC_DESKTOP_DIR, "$GNOMECC_DESKTOP_DIR",
-                     [Install path for Gnome control-center integration])
-  AC_SUBST(GNOMECC_DESKTOP_DIR)
-  AC_SUBST(PROGRAMS_GSTPROPS)
-fi
-
-AC_SUBST(GSTPROPS_CFLAGS)
-AC_SUBST(GSTPROPS_LIBS)
-AM_CONDITIONAL(HAVE_GSTPROPS, [test x$have_gstprops = xyes])
-
-dnl=======================================================================
-dnl gst-mixer
-dnl=======================================================================
-
-have_gstmixer=no
-
-AC_ARG_ENABLE([gstmix],
-  AS_HELP_STRING([--enable-gstmix], [enable gstreamer mixer]),
-  ,enable_gstmix=auto)
-
-if test "x$enable_gstmix" = "xauto" && test "x$have_pulseaudio" = "xno"; then
-  enable_gstmix=yes
-fi
-
-if test "x$have_gst" = "xyes" && test "x$enable_gstmix" = "xyes";
-then
-  PKG_CHECK_MODULES(GSTMIXER, [
-    gtk+-3.0 >= $GTK_REQUIRED_VERSION
-    gconf-2.0
-    gstreamer-$GST_MAJORMINOR
-    gstreamer-plugins-base-$GST_MAJORMINOR
-  ],
-  [
-    OLD_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $GSTMIXER_CFLAGS"
-
-    AC_CHECK_HEADER(gst/audio/mixerutils.h,
-      [AC_CHECK_HEADER(gst/interfaces/mixer.h,
-        [AC_CHECK_HEADER(gst/interfaces/propertyprobe.h, have_gstmixer=yes)])])
-
-    CPPFLAGS=$OLD_CPPFLAGS
-    GSTMIXER_LIBS="$GSTMIXER_LIBS -lgstinterfaces-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR"
-  ])
-fi
-
-AC_SUBST(GSTMIXER_CFLAGS)
-AC_SUBST(GSTMIXER_LIBS)
-AM_CONDITIONAL(HAVE_GSTMIXER, [test x$have_gstmixer = xyes])
-
-
 dnl ---------------------------------------------------------------------------
 dnl - Finish
 dnl ---------------------------------------------------------------------------
@@ -307,16 +232,7 @@ grecord/icons/48x48/Makefile
 grecord/icons/scalable/Makefile
 gstreamer-properties/Makefile
 gstreamer-properties/help/Makefile
-gst-mixer/Makefile
-gst-mixer/icons/Makefile
-gst-mixer/icons/16x16/Makefile
-gst-mixer/icons/16x16/devices/Makefile
-gst-mixer/icons/16x16/status/Makefile
-gst-mixer/src/Makefile
-gst-mixer/pixmaps/Makefile
-gst-mixer/doc/Makefile
 grecord/gnome-sound-recorder.desktop.in
-gst-mixer/gnome-volume-control.desktop.in
 gstreamer-properties/gstreamer-properties.desktop.in
 ])
 
@@ -335,10 +251,5 @@ echo "
 
         GStreamer properties:   $have_gstprops
         Sound recorder:         $have_grecord$grecord_reason
-
-  *Deprecated*:
-
-        GStreamer mixer:        $have_gstmixer
-
 "