GNOME.org
 

[gnome-media] volume-control: Move into gnome-control-center

commit 569dc4f89870903bdd2d8c0a7a1be2f9bb440de2
Author: Bastien Nocera <hadess hadess net>
Date:   Sun Oct 31 01:23:03 2010 +0100

    volume-control: Move into gnome-control-center
    
    The volume control panel (and the applet that uses the same code) has
    been moved into gnome-control-center.

 Makefile.am                                        |    5 -
 configure.ac                                       |   85 -
 gnome-volume-control/AUTHORS                       |    2 -
 gnome-volume-control/ChangeLog.pre-2-26            | 1245 ---
 gnome-volume-control/Makefile.am                   |   16 -
 gnome-volume-control/data/Makefile.am              |   43 -
 .../data/gnome-volume-control-applet.desktop.in    |   16 -
 .../data/gnome-volume-control.desktop.in.in        |   16 -
 gnome-volume-control/data/icons/16x16/Makefile.am  |    4 -
 .../data/icons/16x16/apps/Makefile.am              |   19 -
 .../icons/16x16/apps/multimedia-volume-control.png |  Bin 917 -> 0 bytes
 .../icons/16x16/apps/multimedia-volume-control.svg |  585 -
 .../data/icons/16x16/status/Makefile.am            |   21 -
 .../16x16/status/audio-input-microphone-high.png   |  Bin 1015 -> 0 bytes
 .../16x16/status/audio-input-microphone-low.png    |  Bin 1031 -> 0 bytes
 .../16x16/status/audio-input-microphone-medium.png |  Bin 1040 -> 0 bytes
 .../16x16/status/audio-input-microphone-muted.png  |  Bin 855 -> 0 bytes
 gnome-volume-control/data/icons/22x22/Makefile.am  |    4 -
 .../data/icons/22x22/apps/Makefile.am              |   19 -
 .../icons/22x22/apps/multimedia-volume-control.png |  Bin 1424 -> 0 bytes
 .../icons/22x22/apps/multimedia-volume-control.svg |  595 -
 .../data/icons/22x22/status/Makefile.am            |   21 -
 .../22x22/status/audio-input-microphone-high.png   |  Bin 1411 -> 0 bytes
 .../22x22/status/audio-input-microphone-low.png    |  Bin 1336 -> 0 bytes
 .../22x22/status/audio-input-microphone-medium.png |  Bin 1342 -> 0 bytes
 .../22x22/status/audio-input-microphone-muted.png  |  Bin 1284 -> 0 bytes
 gnome-volume-control/data/icons/24x24/Makefile.am  |    4 -
 .../data/icons/24x24/apps/Makefile.am              |   18 -
 .../icons/24x24/apps/multimedia-volume-control.png |  Bin 1431 -> 0 bytes
 .../data/icons/24x24/status/Makefile.am            |   21 -
 .../24x24/status/audio-input-microphone-high.png   |  Bin 1441 -> 0 bytes
 .../24x24/status/audio-input-microphone-low.png    |  Bin 1365 -> 0 bytes
 .../24x24/status/audio-input-microphone-medium.png |  Bin 1369 -> 0 bytes
 .../24x24/status/audio-input-microphone-muted.png  |  Bin 1349 -> 0 bytes
 gnome-volume-control/data/icons/32x32/Makefile.am  |    4 -
 .../data/icons/32x32/apps/Makefile.am              |   19 -
 .../icons/32x32/apps/multimedia-volume-control.png |  Bin 2308 -> 0 bytes
 .../icons/32x32/apps/multimedia-volume-control.svg |  633 --
 .../data/icons/32x32/status/Makefile.am            |   21 -
 .../32x32/status/audio-input-microphone-high.png   |  Bin 1906 -> 0 bytes
 .../32x32/status/audio-input-microphone-low.png    |  Bin 2002 -> 0 bytes
 .../32x32/status/audio-input-microphone-medium.png |  Bin 2011 -> 0 bytes
 .../32x32/status/audio-input-microphone-muted.png  |  Bin 1998 -> 0 bytes
 gnome-volume-control/data/icons/48x48/Makefile.am  |    4 -
 .../data/icons/48x48/apps/Makefile.am              |   18 -
 .../icons/48x48/apps/multimedia-volume-control.png |  Bin 3755 -> 0 bytes
 .../48x48/status/audio-input-microphone-high.png   |  Bin 3261 -> 0 bytes
 .../48x48/status/audio-input-microphone-low.png    |  Bin 3388 -> 0 bytes
 .../48x48/status/audio-input-microphone-medium.png |  Bin 3406 -> 0 bytes
 .../48x48/status/audio-input-microphone-muted.png  |  Bin 3135 -> 0 bytes
 gnome-volume-control/data/icons/Makefile.am        |   12 -
 .../data/icons/render-icon-theme.py                |  169 -
 .../data/icons/scalable/Makefile.am                |    4 -
 .../data/icons/scalable/apps/Makefile.am           |   18 -
 .../scalable/apps/multimedia-volume-control.svg    |  554 -
 .../data/icons/scalable/devices/Makefile.am        |   35 -
 .../devices/audio-speaker-center-back-testing.svg  |  539 -
 .../scalable/devices/audio-speaker-center-back.svg |  506 -
 .../devices/audio-speaker-center-testing.svg       |  537 -
 .../scalable/devices/audio-speaker-center.svg      |  504 -
 .../devices/audio-speaker-left-back-testing.svg    |  537 -
 .../scalable/devices/audio-speaker-left-back.svg   |  504 -
 .../devices/audio-speaker-left-side-testing.svg    |  537 -
 .../scalable/devices/audio-speaker-left-side.svg   |  504 -
 .../devices/audio-speaker-left-testing.svg         |  537 -
 .../icons/scalable/devices/audio-speaker-left.svg  |  504 -
 .../devices/audio-speaker-right-back-testing.svg   |  537 -
 .../scalable/devices/audio-speaker-right-back.svg  |  504 -
 .../devices/audio-speaker-right-side-testing.svg   |  537 -
 .../scalable/devices/audio-speaker-right-side.svg  |  504 -
 .../devices/audio-speaker-right-testing.svg        |  913 --
 .../icons/scalable/devices/audio-speaker-right.svg |  504 -
 .../scalable/devices/audio-speaker-testing.svg     |  913 --
 .../scalable/devices/audio-subwoofer-testing.svg   |  240 -
 .../icons/scalable/devices/audio-subwoofer.svg     |  325 -
 .../data/icons/src/microphone-levels.svg           |11448 --------------------
 .../data/symbolic-icons/Makefile.am                |   10 -
 gnome-volume-control/data/symbolic-icons/r.rb      |   73 -
 .../data/symbolic-icons/scalable/Makefile.am       |    3 -
 .../symbolic-icons/scalable/status/Makefile.am     |   14 -
 .../audio-input-microphone-high-symbolic.svg       |   37 -
 .../status/audio-input-microphone-low-symbolic.svg |   37 -
 .../audio-input-microphone-medium-symbolic.svg     |   37 -
 .../audio-input-microphone-muted-symbolic.svg      |   37 -
 .../data/symbolic-icons/src/gnome-media.svg        |  990 --
 gnome-volume-control/src/Makefile.am               |  105 -
 gnome-volume-control/src/applet-main.c             |  110 -
 gnome-volume-control/src/cc-sound-panel.c          |  136 -
 gnome-volume-control/src/cc-sound-panel.h          |   60 -
 gnome-volume-control/src/gvc-applet.c              |  311 -
 gnome-volume-control/src/gvc-applet.h              |   55 -
 gnome-volume-control/src/gvc-balance-bar.c         |  550 -
 gnome-volume-control/src/gvc-balance-bar.h         |   69 -
 gnome-volume-control/src/gvc-channel-bar.c         |  963 --
 gnome-volume-control/src/gvc-channel-bar.h         |   89 -
 gnome-volume-control/src/gvc-channel-map-private.h |   39 -
 gnome-volume-control/src/gvc-channel-map.c         |  254 -
 gnome-volume-control/src/gvc-channel-map.h         |   73 -
 gnome-volume-control/src/gvc-combo-box.c           |  395 -
 gnome-volume-control/src/gvc-combo-box.h           |   67 -
 gnome-volume-control/src/gvc-level-bar.c           |  747 --
 gnome-volume-control/src/gvc-level-bar.h           |   75 -
 gnome-volume-control/src/gvc-log.c                 |   62 -
 gnome-volume-control/src/gvc-log.h                 |   35 -
 gnome-volume-control/src/gvc-mixer-card-private.h  |   35 -
 gnome-volume-control/src/gvc-mixer-card.c          |  506 -
 gnome-volume-control/src/gvc-mixer-card.h          |   83 -
 .../src/gvc-mixer-control-private.h                |   35 -
 gnome-volume-control/src/gvc-mixer-control.c       | 2232 ----
 gnome-volume-control/src/gvc-mixer-control.h       |   96 -
 gnome-volume-control/src/gvc-mixer-dialog.c        | 2091 ----
 gnome-volume-control/src/gvc-mixer-dialog.h        |   56 -
 gnome-volume-control/src/gvc-mixer-event-role.c    |  250 -
 gnome-volume-control/src/gvc-mixer-event-role.h    |   57 -
 gnome-volume-control/src/gvc-mixer-sink-input.c    |  199 -
 gnome-volume-control/src/gvc-mixer-sink-input.h    |   57 -
 gnome-volume-control/src/gvc-mixer-sink.c          |  231 -
 gnome-volume-control/src/gvc-mixer-sink.h          |   57 -
 gnome-volume-control/src/gvc-mixer-source-output.c |  137 -
 gnome-volume-control/src/gvc-mixer-source-output.h |   57 -
 gnome-volume-control/src/gvc-mixer-source.c        |  231 -
 gnome-volume-control/src/gvc-mixer-source.h        |   57 -
 .../src/gvc-mixer-stream-private.h                 |   34 -
 gnome-volume-control/src/gvc-mixer-stream.c        |  944 --
 gnome-volume-control/src/gvc-mixer-stream.h        |  125 -
 gnome-volume-control/src/gvc-pulseaudio-fake.h     |   34 -
 gnome-volume-control/src/gvc-speaker-test.c        |  500 -
 gnome-volume-control/src/gvc-speaker-test.h        |   57 -
 gnome-volume-control/src/gvc-stream-status-icon.c  |  822 --
 gnome-volume-control/src/gvc-stream-status-icon.h  |   63 -
 130 files changed, 0 insertions(+), 40343 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 88854ee..088058f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,10 +10,6 @@ if HAVE_SOUND_THEME
 SUBDIRS += sound-theme
 endif
 
-if HAVE_PULSEAUDIO
-SUBDIRS += gnome-volume-control
-endif
-
 if HAVE_GSTMIXER
 SUBDIRS += gst-mixer
 endif
@@ -29,7 +25,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 DIST_SUBDIRS = \
 	po 			\
-	gnome-volume-control	\
 	grecord			\
 	gst-mixer		\
 	gstreamer-properties	\
diff --git a/configure.ac b/configure.ac
index 20081ee..8ed7d23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,65 +86,6 @@ AC_SUBST(SOUNDTHEME_CFLAGS)
 AC_SUBST(SOUNDTHEME_LIBS)
 
 dnl=======================================================================
-dnl Check for the new volume control modules
-dnl=======================================================================
-
-dnl The new gnome-volume-control needs a newer GTK+
-GTK_REQUIRED_VERSION=2.90.7
-
-AC_ARG_ENABLE([pulseaudio],
-              AS_HELP_STRING([--enable-pulseaudio],
-                             [Enable PulseAudio support @<:@default=auto@:>@]),
-              enable_pulseaudio=$enableval, enable_pulseaudio=auto)
-
-if test "x$enable_pulseaudio" != "xno"; then
-
-  PKG_CHECK_MODULES(PULSEAUDIO,
-          libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION,
-          have_pulseaudio=yes,
-          have_pulseaudio=no)
-
-  if test "x$enable_pulseaudio" = "xyes" -a "x$have_pulseaudio" = "xno"; then
-    AC_MSG_ERROR([PulseAudio support explicitly requested but dependencies not found])
-  fi
-
-  if test "x$have_pulseaudio" = "xyes" ; then
-    PKG_CHECK_MODULES(VOLUME_CONTROL,
-            gobject-2.0 >= $GLIB_REQUIRED_VERSION
-            gtk+-3.0 >= $GTK_REQUIRED_VERSION
-            gio-2.0
-            gconf-2.0 >= $GCONF_REQUIRED_VERSION
-            libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
-            libxml-2.0
-    )
-    AC_SUBST(VOLUME_CONTROL_CFLAGS)
-    AC_SUBST(VOLUME_CONTROL_LIBS)
-    PKG_CHECK_MODULES(VOLUME_PANEL,
-            gobject-2.0 >= $GLIB_REQUIRED_VERSION
-            gtk+-3.0 >= $GTK_REQUIRED_VERSION
-            gio-2.0
-            gconf-2.0 >= $GCONF_REQUIRED_VERSION
-            libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
-            libgnome-control-center
-            libxml-2.0
-    )
-    AC_SUBST(VOLUME_PANEL_CFLAGS)
-    AC_SUBST(VOLUME_PANEL_LIBS)
-    AC_DEFINE(HAVE_PULSEAUDIO, [], [Define if we have pulseaudio])
-  fi
-else
-  have_pulseaudio=no
-fi
-AM_CONDITIONAL(HAVE_PULSEAUDIO, test x$have_pulseaudio = xyes)
-AC_SUBST(HAVE_PULSEAUDIO)
-AC_SUBST(PULSEAUDIO_CFLAGS)
-AC_SUBST(PULSEAUDIO_LIBS)
-
-dnl Requires for the gnome-volume-control panel
-PANELS_DIR="${libdir}/control-center-1/panels"
-AC_SUBST(PANELS_DIR)
-
-dnl=======================================================================
 dnl Check for GStreamer and GSR deps
 dnl=======================================================================
 
@@ -353,31 +294,6 @@ Makefile
 po/Makefile.in
 sound-theme/Makefile
 sound-theme/sounds/Makefile
-gnome-volume-control/Makefile
-gnome-volume-control/data/Makefile
-gnome-volume-control/data/gnome-volume-control.desktop.in
-gnome-volume-control/data/symbolic-icons/Makefile
-gnome-volume-control/data/symbolic-icons/scalable/Makefile
-gnome-volume-control/data/symbolic-icons/scalable/status/Makefile
-gnome-volume-control/data/icons/Makefile
-gnome-volume-control/data/icons/16x16/Makefile
-gnome-volume-control/data/icons/16x16/apps/Makefile
-gnome-volume-control/data/icons/16x16/status/Makefile
-gnome-volume-control/data/icons/22x22/Makefile
-gnome-volume-control/data/icons/22x22/apps/Makefile
-gnome-volume-control/data/icons/22x22/status/Makefile
-gnome-volume-control/data/icons/24x24/Makefile
-gnome-volume-control/data/icons/24x24/apps/Makefile
-gnome-volume-control/data/icons/24x24/status/Makefile
-gnome-volume-control/data/icons/32x32/Makefile
-gnome-volume-control/data/icons/32x32/apps/Makefile
-gnome-volume-control/data/icons/32x32/status/Makefile
-gnome-volume-control/data/icons/48x48/Makefile
-gnome-volume-control/data/icons/48x48/apps/Makefile
-gnome-volume-control/data/icons/scalable/Makefile
-gnome-volume-control/data/icons/scalable/apps/Makefile
-gnome-volume-control/data/icons/scalable/devices/Makefile
-gnome-volume-control/src/Makefile
 grecord/Makefile
 grecord/gnome-sound-recorder.schemas.in
 grecord/src/Makefile
@@ -417,7 +333,6 @@ echo "
         Compiler:               ${CC}
         CFLAGS:                 ${CFLAGS}
 
-        Volume Control          $have_pulseaudio
         GStreamer properties:   $have_gstprops
         Sound recorder:         $have_grecord$grecord_reason
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]