[gnome-media] Remove vumeter, cddb, and gnome-cd
- From: Marc-Andre Lureau <malureau src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-media] Remove vumeter, cddb, and gnome-cd
- Date: Mon, 27 Jul 2009 20:29:55 +0000 (UTC)
commit ce6efc01b852c92db7f783f538b42f82065c11ed
Author: Marc-André Lureau <marcandre lureau gmail com>
Date: Mon Jul 27 21:56:29 2009 +0300
Remove vumeter, cddb, and gnome-cd
"the time has come to set aside childish things"
(first Google suggestion for "the time has come")
Rest in peace, fellow gnome-media bonobos.
AUTHORS | 7 +-
COPYING.vu-meter | 481 -----
Makefile.am | 20 -
README | 32 +-
autogen.sh | 2 +-
cddb-slave2/CDDB-Slave2.schemas.in | 79 -
cddb-slave2/COPYING.LIB | 390 ----
cddb-slave2/ChangeLog.pre-2-26 | 881 --------
cddb-slave2/GNOME_Media_CDDBSlave2.idl | 134 --
cddb-slave2/GNOME_Media_CDDBSlave2.server.in.in | 45 -
cddb-slave2/HACKING | 158 --
cddb-slave2/Makefile.am | 164 --
cddb-slave2/README.GNET | 42 -
cddb-slave2/cddb-parser.c | 485 -----
cddb-slave2/cddb-parser.h | 34 -
cddb-slave2/cddb-slave-capplet.c | 1135 -----------
cddb-slave2/cddb-slave-client.c | 738 -------
cddb-slave2/cddb-slave-client.h | 112 -
cddb-slave2/cddb-slave-private.c | 41 -
cddb-slave2/cddb-slave-private.h | 24 -
cddb-slave2/cddb-slave.c | 1794 ----------------
cddb-slave2/cddb-slave.desktop.in.in | 16 -
cddb-slave2/cddb-slave.h | 76 -
cddb-slave2/cddb-slave2-query.c | 262 ---
cddb-slave2/cddb-track-editor.c | 1133 -----------
cddb-slave2/gnet-private.c | 393 ----
cddb-slave2/gnet-private.h | 333 ---
cddb-slave2/gnet.h | 70 -
cddb-slave2/inetaddr.c | 2136 -------------------
cddb-slave2/inetaddr.h | 207 --
cddb-slave2/iochannel.c | 323 ---
cddb-slave2/iochannel.h | 174 --
cddb-slave2/main.c | 190 --
cddb-slave2/socks-private.c | 142 --
cddb-slave2/socks-private.h | 54 -
cddb-slave2/socks.c | 184 --
cddb-slave2/socks.h | 47 -
cddb-slave2/tcp.c | 513 -----
cddb-slave2/tcp.h | 202 --
configure.ac | 330 +---
gnome-cd/ChangeLog.pre-2-26 | 1532 --------------
gnome-cd/HACKING | 14 -
gnome-cd/Makefile.am | 132 --
gnome-cd/access/Makefile.am | 24 -
gnome-cd/access/cddisplayaccessible.c | 218 --
gnome-cd/access/cddisplayaccessible.h | 58 -
gnome-cd/access/cddisplayaccessiblefactory.c | 95 -
gnome-cd/access/cddisplayaccessiblefactory.h | 58 -
gnome-cd/access/factory.c | 63 -
gnome-cd/access/factory.h | 32 -
gnome-cd/access/pangoaccessible.c | 667 ------
gnome-cd/access/pangoaccessible.h | 60 -
gnome-cd/access/pangoaccessiblefactory.c | 94 -
gnome-cd/access/pangoaccessiblefactory.h | 58 -
gnome-cd/bsd-cdrom.c | 1222 -----------
gnome-cd/bsd-cdrom.h | 57 -
gnome-cd/callbacks.c | 1285 ------------
gnome-cd/callbacks.h | 102 -
gnome-cd/cd-selection.c | 221 --
gnome-cd/cd-selection.h | 33 -
gnome-cd/cddb.c | 284 ---
gnome-cd/cddb.h | 33 -
gnome-cd/cdrom.c | 895 --------
gnome-cd/cdrom.h | 264 ---
gnome-cd/display.c | 930 ---------
gnome-cd/display.h | 94 -
.../doc/C/figures/cdplayer_trackeditor_button.png | Bin 1157 -> 0 bytes
.../doc/C/figures/cdplayer_trackeditor_window.png | Bin 7056 -> 0 bytes
gnome-cd/doc/C/figures/cdplayer_window.png | Bin 10134 -> 0 bytes
gnome-cd/doc/C/figures/eject_button.png | Bin 1101 -> 0 bytes
gnome-cd/doc/C/figures/forward_button.png | Bin 1103 -> 0 bytes
gnome-cd/doc/C/figures/next_button.png | Bin 1098 -> 0 bytes
gnome-cd/doc/C/figures/pause_button.png | Bin 1094 -> 0 bytes
gnome-cd/doc/C/figures/play_button.png | Bin 1110 -> 0 bytes
gnome-cd/doc/C/figures/preferences_button.png | Bin 1198 -> 0 bytes
gnome-cd/doc/C/figures/previous_button.png | Bin 1105 -> 0 bytes
gnome-cd/doc/C/figures/rewind_button.png | Bin 1100 -> 0 bytes
gnome-cd/doc/C/figures/stop_button.png | Bin 1083 -> 0 bytes
gnome-cd/doc/C/gnome-cd.xml | 454 -----
gnome-cd/doc/C/l10n.txt | 99 -
gnome-cd/doc/C/legal.xml | 76 -
gnome-cd/doc/ChangeLog | 82 -
gnome-cd/doc/Makefile.am | 18 -
gnome-cd/doc/ca/ca.po | 843 --------
.../doc/ca/figures/cdplayer_trackeditor_button.png | Bin 1256 -> 0 bytes
.../doc/ca/figures/cdplayer_trackeditor_window.png | Bin 34778 -> 0 bytes
gnome-cd/doc/ca/figures/cdplayer_window.png | Bin 21458 -> 0 bytes
gnome-cd/doc/ca/figures/eject_button.png | Bin 1055 -> 0 bytes
gnome-cd/doc/ca/figures/forward_button.png | Bin 1280 -> 0 bytes
gnome-cd/doc/ca/figures/next_button.png | Bin 1373 -> 0 bytes
gnome-cd/doc/ca/figures/pause_button.png | Bin 958 -> 0 bytes
gnome-cd/doc/ca/figures/play_button.png | Bin 1196 -> 0 bytes
gnome-cd/doc/ca/figures/preferences_button.png | Bin 1827 -> 0 bytes
gnome-cd/doc/ca/figures/previous_button.png | Bin 1353 -> 0 bytes
gnome-cd/doc/ca/figures/rewind_button.png | Bin 1304 -> 0 bytes
gnome-cd/doc/ca/figures/stop_button.png | Bin 802 -> 0 bytes
gnome-cd/doc/de/de.po | 850 --------
gnome-cd/doc/de/gnome-cd-de.omf | 37 -
gnome-cd/doc/de/gnome-cd.xml | 437 ----
gnome-cd/doc/de/legal.xml | 22 -
gnome-cd/doc/el/el.po | 603 ------
gnome-cd/doc/en_GB/en_GB.po | 825 --------
gnome-cd/doc/es/es.po | 844 --------
.../doc/es/figures/cdplayer_trackeditor_window.png | Bin 17537 -> 0 bytes
gnome-cd/doc/es/figures/cdplayer_window.png | Bin 9529 -> 0 bytes
gnome-cd/doc/es/figures/gnome-cd-prefs.png | Bin 13707 -> 0 bytes
gnome-cd/doc/es/figures/gnome-cd-track.eps | 2137 --------------------
gnome-cd/doc/es/figures/gnome-cd-track.png | Bin 18360 -> 0 bytes
gnome-cd/doc/es/gnome-cd-es.omf | 35 -
.../doc/fr/figures/cdplayer_trackeditor_window.png | Bin 35080 -> 0 bytes
gnome-cd/doc/fr/figures/cdplayer_window.png | Bin 17081 -> 0 bytes
gnome-cd/doc/fr/fr.po | 804 --------
gnome-cd/doc/gnome-cd.omf.in | 30 -
.../doc/it/figures/cdplayer_trackeditor_window.png | Bin 11832 -> 0 bytes
gnome-cd/doc/it/figures/cdplayer_window.png | Bin 8900 -> 0 bytes
gnome-cd/doc/it/figures/gnome-cd-prefs.eps | 1613 ---------------
gnome-cd/doc/it/figures/gnome-cd-prefs.png | Bin 10051 -> 0 bytes
gnome-cd/doc/it/figures/gnome-cd-track.eps | 2137 --------------------
gnome-cd/doc/it/figures/gnome-cd-track.png | Bin 12548 -> 0 bytes
gnome-cd/doc/it/figures/gnome-cd.eps | 891 --------
gnome-cd/doc/it/figures/gnome-cd.png | Bin 10269 -> 0 bytes
gnome-cd/doc/it/it.po | 1067 ----------
.../doc/ja/figures/cdplayer_trackeditor_button.png | Bin 1157 -> 0 bytes
.../doc/ja/figures/cdplayer_trackeditor_window.png | Bin 16495 -> 0 bytes
gnome-cd/doc/ja/figures/cdplayer_window.png | Bin 17835 -> 0 bytes
gnome-cd/doc/ja/figures/eject_button.png | Bin 1101 -> 0 bytes
gnome-cd/doc/ja/figures/forward_button.png | Bin 1103 -> 0 bytes
gnome-cd/doc/ja/figures/gnome-cd-prefs.eps | 1613 ---------------
gnome-cd/doc/ja/figures/gnome-cd-prefs.png | Bin 16641 -> 0 bytes
gnome-cd/doc/ja/figures/gnome-cd-track.eps | 2137 --------------------
gnome-cd/doc/ja/figures/gnome-cd-track.png | Bin 18147 -> 0 bytes
gnome-cd/doc/ja/figures/gnome-cd.eps | 891 --------
gnome-cd/doc/ja/figures/gnome-cd.png | Bin 3772 -> 0 bytes
gnome-cd/doc/ja/figures/next_button.png | Bin 1098 -> 0 bytes
gnome-cd/doc/ja/figures/pause_button.png | Bin 1094 -> 0 bytes
gnome-cd/doc/ja/figures/play_button.png | Bin 1110 -> 0 bytes
gnome-cd/doc/ja/figures/preferences_button.png | Bin 1198 -> 0 bytes
gnome-cd/doc/ja/figures/previous_button.png | Bin 1105 -> 0 bytes
gnome-cd/doc/ja/figures/rewind_button.png | Bin 1100 -> 0 bytes
gnome-cd/doc/ja/figures/stop_button.png | Bin 1083 -> 0 bytes
gnome-cd/doc/ja/gnome-cd-ja.omf | 35 -
gnome-cd/doc/ja/gnome-cd.xml | 377 ----
gnome-cd/doc/ja/legal.xml | 47 -
.../doc/ko/figures/cdplayer_trackeditor_button.png | Bin 1157 -> 0 bytes
.../doc/ko/figures/cdplayer_trackeditor_window.png | Bin 15863 -> 0 bytes
gnome-cd/doc/ko/figures/cdplayer_window.png | Bin 17393 -> 0 bytes
gnome-cd/doc/ko/figures/eject_button.png | Bin 1101 -> 0 bytes
gnome-cd/doc/ko/figures/forward_button.png | Bin 1103 -> 0 bytes
gnome-cd/doc/ko/figures/gnome-cd-prefs.eps | 1613 ---------------
gnome-cd/doc/ko/figures/gnome-cd-prefs.png | Bin 13071 -> 0 bytes
gnome-cd/doc/ko/figures/gnome-cd-track.eps | 2137 --------------------
gnome-cd/doc/ko/figures/gnome-cd-track.png | Bin 15845 -> 0 bytes
gnome-cd/doc/ko/figures/gnome-cd.eps | 891 --------
gnome-cd/doc/ko/figures/gnome-cd.png | Bin 17727 -> 0 bytes
gnome-cd/doc/ko/figures/next_button.png | Bin 1098 -> 0 bytes
gnome-cd/doc/ko/figures/pause_button.png | Bin 1094 -> 0 bytes
gnome-cd/doc/ko/figures/play_button.png | Bin 1110 -> 0 bytes
gnome-cd/doc/ko/figures/preferences_button.png | Bin 1198 -> 0 bytes
gnome-cd/doc/ko/figures/previous_button.png | Bin 1105 -> 0 bytes
gnome-cd/doc/ko/figures/rewind_button.png | Bin 1100 -> 0 bytes
gnome-cd/doc/ko/figures/stop_button.png | Bin 1083 -> 0 bytes
gnome-cd/doc/ko/gnome-cd-ko.omf | 35 -
gnome-cd/doc/ko/gnome-cd.xml | 431 ----
gnome-cd/doc/ko/legal.xml | 71 -
.../doc/nl/figures/cdplayer_trackeditor_button.png | Bin 1157 -> 0 bytes
.../doc/nl/figures/cdplayer_trackeditor_window.png | Bin 7056 -> 0 bytes
gnome-cd/doc/nl/figures/cdplayer_window.png | Bin 10134 -> 0 bytes
gnome-cd/doc/nl/figures/eject_button.png | Bin 1101 -> 0 bytes
gnome-cd/doc/nl/figures/forward_button.png | Bin 1103 -> 0 bytes
gnome-cd/doc/nl/figures/next_button.png | Bin 1098 -> 0 bytes
gnome-cd/doc/nl/figures/pause_button.png | Bin 1094 -> 0 bytes
gnome-cd/doc/nl/figures/play_button.png | Bin 1110 -> 0 bytes
gnome-cd/doc/nl/figures/preferences_button.png | Bin 1198 -> 0 bytes
gnome-cd/doc/nl/figures/previous_button.png | Bin 1105 -> 0 bytes
gnome-cd/doc/nl/figures/rewind_button.png | Bin 1100 -> 0 bytes
gnome-cd/doc/nl/figures/stop_button.png | Bin 1083 -> 0 bytes
gnome-cd/doc/nl/gnome-cd-nl.omf | 30 -
gnome-cd/doc/nl/gnome-cd.xml | 439 ----
gnome-cd/doc/nl/legal.xml | 76 -
gnome-cd/doc/oc/oc.po | 700 -------
gnome-cd/doc/ru/ru.po | 815 --------
.../doc/sv/figures/cdplayer_trackeditor_window.png | Bin 41791 -> 0 bytes
gnome-cd/doc/sv/figures/cdplayer_window.png | Bin 15596 -> 0 bytes
gnome-cd/doc/sv/sv.po | 585 ------
.../doc/uk/figures/cdplayer_trackeditor_button.png | Bin 1157 -> 0 bytes
.../doc/uk/figures/cdplayer_trackeditor_window.png | Bin 7056 -> 0 bytes
gnome-cd/doc/uk/figures/cdplayer_window.png | Bin 10134 -> 0 bytes
gnome-cd/doc/uk/figures/eject_button.png | Bin 1101 -> 0 bytes
gnome-cd/doc/uk/figures/forward_button.png | Bin 1103 -> 0 bytes
gnome-cd/doc/uk/figures/next_button.png | Bin 1098 -> 0 bytes
gnome-cd/doc/uk/figures/pause_button.png | Bin 1094 -> 0 bytes
gnome-cd/doc/uk/figures/play_button.png | Bin 1110 -> 0 bytes
gnome-cd/doc/uk/figures/preferences_button.png | Bin 1198 -> 0 bytes
gnome-cd/doc/uk/figures/previous_button.png | Bin 1105 -> 0 bytes
gnome-cd/doc/uk/figures/rewind_button.png | Bin 1100 -> 0 bytes
gnome-cd/doc/uk/figures/stop_button.png | Bin 1083 -> 0 bytes
gnome-cd/doc/uk/gnome-cd-uk.omf | 30 -
gnome-cd/doc/uk/gnome-cd.xml | 359 ----
gnome-cd/doc/uk/legal.xml | 76 -
gnome-cd/doc/zh_CN/zh_CN.po | 782 -------
.../zh_TW/figures/cdplayer_trackeditor_button.png | Bin 1157 -> 0 bytes
.../zh_TW/figures/cdplayer_trackeditor_window.png | Bin 16603 -> 0 bytes
gnome-cd/doc/zh_TW/figures/cdplayer_window.png | Bin 17150 -> 0 bytes
gnome-cd/doc/zh_TW/figures/eject_button.png | Bin 1101 -> 0 bytes
gnome-cd/doc/zh_TW/figures/forward_button.png | Bin 1103 -> 0 bytes
gnome-cd/doc/zh_TW/figures/gnome-cd-prefs.eps | 1613 ---------------
gnome-cd/doc/zh_TW/figures/gnome-cd-prefs.png | Bin 13548 -> 0 bytes
gnome-cd/doc/zh_TW/figures/gnome-cd-track.eps | 2137 --------------------
gnome-cd/doc/zh_TW/figures/gnome-cd-track.png | Bin 17305 -> 0 bytes
gnome-cd/doc/zh_TW/figures/gnome-cd.eps | 891 --------
gnome-cd/doc/zh_TW/figures/gnome-cd.png | Bin 17668 -> 0 bytes
gnome-cd/doc/zh_TW/figures/next_button.png | Bin 1098 -> 0 bytes
gnome-cd/doc/zh_TW/figures/pause_button.png | Bin 1094 -> 0 bytes
gnome-cd/doc/zh_TW/figures/play_button.png | Bin 1110 -> 0 bytes
gnome-cd/doc/zh_TW/figures/preferences_button.png | Bin 1198 -> 0 bytes
gnome-cd/doc/zh_TW/figures/previous_button.png | Bin 1105 -> 0 bytes
gnome-cd/doc/zh_TW/figures/rewind_button.png | Bin 1100 -> 0 bytes
gnome-cd/doc/zh_TW/figures/stop_button.png | Bin 1083 -> 0 bytes
gnome-cd/doc/zh_TW/gnome-cd-zh_TW.omf | 35 -
gnome-cd/doc/zh_TW/gnome-cd.xml | 390 ----
gnome-cd/doc/zh_TW/legal.xml | 54 -
gnome-cd/gnome-cd-type.h | 28 -
gnome-cd/gnome-cd.c | 969 ---------
gnome-cd/gnome-cd.desktop.in.in | 15 -
gnome-cd/gnome-cd.h | 137 --
gnome-cd/gnome-cd.png | Bin 4061 -> 0 bytes
gnome-cd/gnome-cd.schemas.in.in | 75 -
gnome-cd/gst-cdrom.c | 1217 -----------
gnome-cd/gst-cdrom.h | 58 -
gnome-cd/images/Makefile.am | 13 -
gnome-cd/images/None/Makefile.am | 16 -
gnome-cd/images/None/None.theme | 15 -
gnome-cd/images/None/bottom-left.png | Bin 393 -> 0 bytes
gnome-cd/images/None/bottom-right.png | Bin 418 -> 0 bytes
gnome-cd/images/None/bottom.png | Bin 255 -> 0 bytes
gnome-cd/images/None/middle-left.png | Bin 267 -> 0 bytes
gnome-cd/images/None/middle-right.png | Bin 186 -> 0 bytes
gnome-cd/images/None/middle.png | Bin 177 -> 0 bytes
gnome-cd/images/None/top-left.png | Bin 456 -> 0 bytes
gnome-cd/images/None/top-right.png | Bin 429 -> 0 bytes
gnome-cd/images/None/top.png | Bin 318 -> 0 bytes
gnome-cd/images/Theme-Limitations | 14 -
gnome-cd/images/disc.png | Bin 330 -> 0 bytes
gnome-cd/images/lcd/Makefile.am | 16 -
gnome-cd/images/lcd/bottom-left.png | Bin 187 -> 0 bytes
gnome-cd/images/lcd/bottom-right.png | Bin 179 -> 0 bytes
gnome-cd/images/lcd/bottom.png | Bin 112 -> 0 bytes
gnome-cd/images/lcd/lcd.theme | 15 -
gnome-cd/images/lcd/middle-left.png | Bin 100 -> 0 bytes
gnome-cd/images/lcd/middle-right.png | Bin 105 -> 0 bytes
gnome-cd/images/lcd/middle.png | Bin 106 -> 0 bytes
gnome-cd/images/lcd/top-left.png | Bin 172 -> 0 bytes
gnome-cd/images/lcd/top-right.png | Bin 203 -> 0 bytes
gnome-cd/images/lcd/top.png | Bin 109 -> 0 bytes
gnome-cd/images/media/Makefile.am | 16 -
gnome-cd/images/media/bottom-left.png | Bin 245 -> 0 bytes
gnome-cd/images/media/bottom-right.png | Bin 243 -> 0 bytes
gnome-cd/images/media/bottom.png | Bin 169 -> 0 bytes
gnome-cd/images/media/media.theme | 15 -
gnome-cd/images/media/middle-left.png | Bin 158 -> 0 bytes
gnome-cd/images/media/middle-right.png | Bin 163 -> 0 bytes
gnome-cd/images/media/middle.png | Bin 164 -> 0 bytes
gnome-cd/images/media/top-left.png | Bin 226 -> 0 bytes
gnome-cd/images/media/top-right.png | Bin 261 -> 0 bytes
gnome-cd/images/media/top.png | Bin 168 -> 0 bytes
gnome-cd/images/once.png | Bin 232 -> 0 bytes
gnome-cd/images/red-lcd/Makefile.am | 16 -
gnome-cd/images/red-lcd/bottom-left.png | Bin 245 -> 0 bytes
gnome-cd/images/red-lcd/bottom-right.png | Bin 243 -> 0 bytes
gnome-cd/images/red-lcd/bottom.png | Bin 169 -> 0 bytes
gnome-cd/images/red-lcd/middle-left.png | Bin 158 -> 0 bytes
gnome-cd/images/red-lcd/middle-right.png | Bin 163 -> 0 bytes
gnome-cd/images/red-lcd/middle.png | Bin 164 -> 0 bytes
gnome-cd/images/red-lcd/red-lcd.theme | 15 -
gnome-cd/images/red-lcd/top-left.png | Bin 226 -> 0 bytes
gnome-cd/images/red-lcd/top-right.png | Bin 261 -> 0 bytes
gnome-cd/images/red-lcd/top.png | Bin 168 -> 0 bytes
gnome-cd/images/repeat.png | Bin 303 -> 0 bytes
gnome-cd/images/track.png | Bin 408 -> 0 bytes
gnome-cd/linux-cdrom.c | 1208 -----------
gnome-cd/linux-cdrom.h | 57 -
gnome-cd/preferences.c | 680 -------
gnome-cd/preferences.h | 46 -
gnome-cd/solaris-cdrom.c | 1380 -------------
gnome-cd/solaris-cdrom.h | 59 -
gnome-cd/theme.c | 161 --
m4/as-ac-expand.m4 | 34 +
m4/esd.m4 | 199 --
po/POTFILES.in | 18 -
po/POTFILES.skip | 5 -
vu-meter/AUTHORS | 4 -
vu-meter/ChangeLog.pre-2-26 | 219 --
vu-meter/Makefile.am | 43 -
vu-meter/README | 3 -
vu-meter/TODO | 4 -
vu-meter/gnome-reclevel.png | Bin 341 -> 0 bytes
vu-meter/gnome-vumeter.png | Bin 341 -> 0 bytes
vu-meter/gtkled.c | 260 ---
vu-meter/gtkled.h | 71 -
vu-meter/gtkledbar.c | 274 ---
vu-meter/gtkledbar.h | 81 -
vu-meter/main.c | 341 ----
vu-meter/reclevel.desktop.in.in | 9 -
vu-meter/vumeter.desktop.in.in | 14 -
304 files changed, 48 insertions(+), 63074 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index 1a1e273..7f25feb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,11 +4,8 @@ Bastien Nocera <hadess hadess net>
-------------------------------------------------------------------------------
Authors:
-Iain Holmes <iain ximian com> (gnome-cd, CDDBSlave2)
-Tim P. Gerla <timg rrv net> (tcd, cddbslave)
-Gregory McLean <gregm comstar net> (vumeter)
Andreas Hyden <a hyden cyberpoint se> (grecord)
-Seth Nickell <snickell stanford edu> (gnome-volume-control)
-Balamurali Viswanathan <balamurali viswanathan wipro com> (Solaris CD stuff)
+Seth Nickell <snickell stanford edu> (gst-mixer)
Ronald Bultje <rbultje ronald bitfreak net> (gst-mixer)
Thomas Vander Stichele <thomas at apestaart dot org> (profiles)
+William Jon McCann <jmccann redhat com> (gnome-volume-control)
diff --git a/Makefile.am b/Makefile.am
index 705c482..ea19ae9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,22 +6,10 @@ if HAVE_GMP
SUBDIRS += profiles
endif
-if HAVE_CDDBSLAVE
-SUBDIRS += cddb-slave2
-endif
-
-if HAVE_VUMETER
-SUBDIRS += vu-meter
-endif
-
if HAVE_GRECORD
SUBDIRS += grecord
endif
-if HAVE_GNOMECD
-SUBDIRS += gnome-cd
-endif
-
if HAVE_SOUND_THEME
SUBDIRS += sound-theme
endif
@@ -46,21 +34,15 @@ INTLTOOL_BUILT = \
DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper \
- --disable-gnomecd \
- --enable-cddbslave \
- --enable-vumeter \
--enable-more-warnings \
--enable-compile-warnings=maximum
DIST_SUBDIRS = \
po \
profiles \
- cddb-slave2 \
- vu-meter \
gnome-volume-control \
grecord \
gst-mixer \
- gnome-cd \
gstreamer-properties \
sound-theme \
$(NULL)
@@ -74,13 +56,11 @@ EXTRA_DIST = \
COPYING.grecord \
COPYING.gst-mixer \
COPYING.profiles \
- COPYING.vu-meter \
MAINTAINERS \
build-aux/git-version-gen \
build-aux/gnome-doc-utils.make \
m4/as-compiler-flag.m4 \
m4/as-version.m4 \
- m4/esd.m4 \
ChangeLog.pre-2-26 \
$(INTLTOOL_BUILT:=.in) \
$(NULL)
diff --git a/README b/README
index 30a14bf..1e2f0bf 100644
--- a/README
+++ b/README
@@ -1,35 +1,23 @@
-These are the GNOME media tools for GNOME 2.24 (and beyond):
+These are the GNOME media tools for GNOME 2.28 (and beyond):
-gst-mixer/ - GNOME GStreamer-based audio mixer.
-grecord/ - GNOME Sound Recorder.
-gstreamer-properties/ - GStreamer Properties Capplet.
-profiles/ - Audio Profile library.
+gnome-volume-control - PulseAudio based volume control applets.
+grecord - GNOME Sound Recorder.
+gstreamer-properties - GStreamer Properties Capplet.
+profiles - Audio Profile library.
-The latest roadmap is published on
-http://live.gnome.org/RoadMap/GnomeMedia.
-
-
-Those projects are disabled by default, starting from GNOME 2.23:
+gst-mixer - GNOME GStreamer-based audio mixer. (deprecated)
-gnome-cd/ - GNOME CD player, with CDDB support.
-cddb-slave2/ - Helper daemon for gnome-cd's CDDB support.
-vu-meter/ - ESD volume level meter. (esd should die, use
- pavumeter)
Refer to the following files for license information for each sub-component
of gnome-media:
-cddb-slave - COPYING
-gnome-cd - COPYING
+gstreamer-properties - COPYING
+gnome-volume-control - COPYING
grecord - COPYING.grecord
gst-mixer - COPYING.gst-mixer
-gstreamer-properties - COPYING
profiles - COPYING.profiles
-vu-meter - COPYING.vu-meter
documentation - COPYING-DOCS
-Diffs should be done with -U2 option.
-The style of code should be the same as the rest of the code in the program:
-IE for gnome-cd or CDDBSlave tab setting of 8, braces at the end of lines. etc.
+The latest roadmap is published on
+http://live.gnome.org/RoadMap/GnomeMedia.
-Please pass non-translation patches through bugzilla.
diff --git a/autogen.sh b/autogen.sh
index a3b2546..72fda48 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,7 +10,7 @@ REQUIRED_INTLTOOL_VERSION=0.35
USE_COMMON_DOC_BUILD=yes
(test -f $srcdir/configure.ac \
- && test -d $srcdir/cddb-slave2) || {
+ && test -d $srcdir/gnome-volume-control) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
diff --git a/configure.ac b/configure.ac
index 717e647..df75456 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,10 +57,6 @@ then
fi
AC_MSG_NOTICE([Using $GM_ERROR_CFLAGS as error checking CFLAGS])
-dnl=======================================================================
-dnl Start of pkg-config checks - common libs
-dnl=======================================================================
-
GLIB_REQUIRED_VERSION=2.18.2
GTK_REQUIRED_VERSION=2.14.0
LIBGLADE_REQUIRED_VERSION=1.99.2
@@ -68,22 +64,6 @@ GCONF_REQUIRED_VERSION=2.6.1
PA_REQUIRED_VERSION=0.9.15
CANBERRA_REQUIRED_VERSION=0.4
-PKG_CHECK_MODULES(MEDIA, [
- glib-2.0 >= $GLIB_REQUIRED_VERSION
- gmodule-2.0 >= $GLIB_REQUIRED_VERSION
- gtk+-2.0 >= $GTK_REQUIRED_VERSION
-])
-
-host=`uname -s`
-case "$host" in
-*SunOS*)
- MEDIA_LIBS="$MEDIA_LIBS -ldevinfo -lX11"
- ;;
-esac
-
-AC_SUBST(MEDIA_CFLAGS)
-AC_SUBST(MEDIA_LIBS)
-
dnl=======================================================================
dnl Check for libcanberra
dnl=======================================================================
@@ -151,76 +131,6 @@ AC_SUBST(HAVE_PULSEAUDIO)
AC_SUBST(PULSEAUDIO_CFLAGS)
AC_SUBST(PULSEAUDIO_LIBS)
-
-dnl=======================================================================
-dnl Check for the CDDBSlave2 modules
-dnl=======================================================================
-
-have_cddbslave=no
-
-AC_ARG_ENABLE([cddbslave],
- AS_HELP_STRING([--enable-cddbslave], [enable gnome cd database]),
- ,enable_cddbslave=no)
-
-if test "x$enable_cddbslave" != "xno"; then
- PKG_CHECK_MODULES(CDDBSLAVE, [
- glib-2.0 >= 1.3.7
- gmodule-2.0 >= 1.3.7
- libgnomeui-2.0 >= 1.102.0
- libbonobo-2.0 >= 2.0.0],
- have_cddbslave=yes)
-fi
-
-# Check for network stuff
-AC_CHECK_FUNCS(poll basename)
-AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton,CDDBSLAVE_LIBS="$CDDBSLAVE_LIBS -lresolv")])
-AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket,CDDBSLAVE_LIBS="$CDDBSLAVE_LIBS -lsocket")])
-AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,CDDBSLAVE_LIBS="$CDDBSLAVE_LIBS -lnsl")])
-
-dnl=======================================================================
-dnl IPv6 related checks
-dnl=======================================================================
-
-have_ipv6=no
-
-AC_ARG_ENABLE(ipv6,
- AS_HELP_STRING([--enable-ipv6],[enable IPv6 extension]),
- ,enable_ipv6=yes)
-
-if test "x$enable_ipv6" = "xyes"; then
- AC_MSG_CHECKING([whether to enable IPv6])
- AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/socket.h>], [
- struct sockaddr_storage ss;
- socket(AF_INET6, SOCK_STREAM, 0)
- ], have_ipv6=yes)
- AC_MSG_RESULT($have_ipv6)
-
- if test "x$have_ipv6" = "xyes"; then
- have_getaddrinfo=no
- AC_CHECK_FUNC(getaddrinfo, have_getaddrinfo=yes)
-
- if test "x$have_getaddrinfo" = "xno"; then
- for lib in bsd socket inet; do
- AC_CHECK_LIB($lib,getaddrinfo,[LIBS="$LIBS -l$lib";have_getaddrinfo=yes;break])
- done
- fi
-
- if test "x$have_getaddrinfo" = "xyes"; then
- AC_DEFINE(ENABLE_IPV6, 1, [Define if we have IPv6 support])
- fi
- fi
-fi
-
-dnl=======================================================================
-dnl IPv6 related checks ends..
-dnl=======================================================================
-
-AC_SUBST(CDDBSLAVE_CFLAGS, "$CDDBSLAVE_CFLAGS $GM_ERROR_CFLAGS")
-AC_SUBST(CDDBSLAVE_LIBS)
-AM_CONDITIONAL(HAVE_CDDBSLAVE, [test x$have_cddbslave = xyes])
-
dnl=======================================================================
dnl profiles
dnl=======================================================================
@@ -308,46 +218,6 @@ AM_GCONF_SOURCE_2
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-AC_SUBST(BONOBO_IDLDIR)
-BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-AC_SUBST(BONOBO_ACT_IDLDIR)
-
-ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-AC_SUBST(ORBIT_IDL)
-
-dnl=======================================================================
-dnl Check for esound library
-dnl=======================================================================
-
-have_esd=no
-
-AC_ARG_ENABLE([esound],
- AS_HELP_STRING([--enable-esound], [enable support for esound daemon]),
- ,enable_esound=yes)
-
-if test "x$enable_esound" = "xyes"; then
- AM_PATH_ESD(0.2.7, have_esd=yes)
-
- if test "x$have_esd" = "xyes"; then
- AC_DEFINE(HAVE_ESD, 1, [Defined if we have Esound])
- fi
-fi
-
-dnl=======================================================================
-dnl Test whether jw is installed
-dnl=======================================================================
-
-AC_PATH_PROG(JW,jw,no)
-if test x$JW = xno; then
- HAVE_JW="no"
-else
- HAVE_JW="yes"
-fi
-
-AM_CONDITIONAL(HAVE_JW, [test x$HAVE_JW = xyes])
-AC_SUBST(HAVE_JW)
-
dnl=======================================================================
dnl i18n
dnl=======================================================================
@@ -363,179 +233,6 @@ AM_PROG_LIBTOOL
AM_PROG_CC_C_O
dnl=======================================================================
-dnl vu-meter
-dnl=======================================================================
-
-have_vumeter=no
-vumeter_reason=""
-
-AC_ARG_ENABLE([vumeter],
- AS_HELP_STRING([--enable-vumeter], [enable vumeter]),
- ,enable_vumeter=no)
-
-if test "x$enable_vumeter" = "xyes" ; then
- if test "x$have_esd" = "xyes"; then
- PKG_CHECK_MODULES(VUMETER, [
- glib-2.0 >= 1.3.7
- gtk+-2.0 >= 2.3.1
- libgnomeui-2.0 >= 1.102.0
- esound >= 0.2.23],
- have_vumeter=yes)
- else
- AC_MSG_WARN([vu-meter disabled because esound couldn't be found])
- vumeter_reason=", esound not found"
- fi
-fi
-
-AC_SUBST(VUMETER_CFLAGS)
-AC_SUBST(VUMETER_LIBS)
-AM_CONDITIONAL(HAVE_VUMETER, [test x$have_vumeter = xyes])
-
-dnl=======================================================================
-dnl check for gnome-cd requirements
-dnl=======================================================================
-
-# GStreamer is optional
-# libnautilus-burn is required
-
-have_gnomecd=no
-gnomecd_reason=""
-
-AC_ARG_ENABLE([gnomecd],
- AS_HELP_STRING([--enable-gnomecd], [enable gnome cd player]),
- ,enable_gnomecd=no)
-
-if test "x$have_cddbslave" = "xno" ; then
- AC_MSG_WARN([gnome-cd will be disabled because of disabled cddb-slave2])
- enable_gnomecd=no
- have_gnomecd=no
- gnomecd_reason=", missing cddb-slave support"
-fi
-
-if test "x$enable_gnomecd" = "xyes"; then
- PKG_CHECK_MODULES(LIBXML2, [libxml-2.0 >= 2.5.0])
-
- PKG_CHECK_MODULES(GNOMECD, [
- gstreamer-$GST_MAJORMINOR >= $GST_REQ
- gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ
- libnautilus-burn >= 2.9.0
- gtk+-2.0 >= 2.10.0],
- have_gnomecd=yes)
-
- if test "x$have_gnomecd" = "xno"; then
- PKG_CHECK_MODULES(GNOMECD, [
- libnautilus-burn >= 2.9.0
- gtk+-2.0 >= 2.10.0],
- have_gnomecd=yes)
- fi
-fi
-
-AC_SUBST(LIBXML2_CFLAGS)
-AC_SUBST(LIBXML2_LIBS)
-
-AC_SUBST(GNOMECD_CFLAGS)
-AC_SUBST(GNOMECD_LIBS)
-AM_CONDITIONAL(HAVE_GNOMECD, [test x$have_gnomecd = xyes])
-
-if test "x$have_gnomecd" = "xyes" && test "x$enable_gnomecd" = "xyes" ; then
- cdrom_header=""
- AC_CHECK_HEADERS(linux/cdrom.h,[
- PROGRAMS_GNOME_CD=gnome-cd
- cdrom_header=linux/cdrom.h])
- AC_CHECK_HEADERS(linux/ucdrom.h,[
- cdrom_header=linux/ucdrom.h])
- AC_CHECK_HEADERS(sys/cdio.h,[
- PROGRAMS_GNOME_CD=gnome-cd
- cdrom_header=sys/cdio.h])
- AC_CHECK_HEADERS(sun/dkio.h,[
- PROGRAMS_GNOME_CD=gnome-cd
- cdrom_header=sun/dkio.h])
-
- AC_MSG_CHECKING([whether to use cd changer support])
- AC_EGREP_CPP(answer_affirmatively,
- [#include <linux/cdrom.h>
- #ifdef CDROM_CHANGER_NSLOTS
- answer_affirmatively
- #endif
- ], cd_changer=yes, cd_changer=no)
- if test "$cd_changer" = "yes"; then
- USE_CD_CHANGER="-DTCD_CHANGER_ENABLED"
- fi
- AC_MSG_RESULT($cd_changer)
-
- AC_SUBST(USE_CD_CHANGER)
- AC_SUBST(PROGRAMS_GNOME_CD)
-
- close_tray=no
- AC_MSG_CHECKING([whether OS supports the CDROMCLOSETRAY ioctl])
- AC_EGREP_CPP(answer_affirmatively,
- [#include <$cdrom_header>
- #ifdef CDROMCLOSETRAY
- answer_affirmatively
- #endif
- ], close_tray=yes)
- if test "$close_tray" = "yes"; then
- AC_DEFINE(HAVE_CDROMCLOSETRAY_IOCTL, 1,
- [Defined if have an ioctl to close the CD-rom tray])
- fi
- AC_MSG_RESULT($close_tray)
-
- host=`uname -s`
-
- CDROM_HOST_BSD=false
- CDROM_HOST_LINUX=false
- CDROM_HOST_SOLARIS=false
- case "$host" in
- *FreeBSD*)
- CDROM_HOST=bsd
- CDROM_HOST_BSD=true
- default_cd_device="/dev/acd0c"
- ;;
- *NetBSD*)
- CDROM_HOST=bsd
- CDROM_HOST_BSD=true
- default_cd_device="/dev/rcd0d"
- ;;
- *Linux*)
- CDROM_HOST=linux
- CDROM_HOST_LINUX=true
- default_cd_device="/dev/cdrom"
- ;;
- *SunOS*)
- CDROM_HOST=solaris
- CDROM_HOST_SOLARIS=true
- default_cd_device="/vol/dev/aliases/cdrom0"
- ;;
- esac
-
- AC_SUBST(CDROM_HOST)
- AC_SUBST(CDROM_HOST_BSD)
- AC_SUBST(CDROM_HOST_LINUX)
- AC_SUBST(CDROM_HOST_SOLARIS)
-
- AC_SUBST(default_cd_device)
- AC_DEFINE_UNQUOTED(default_cd_device, "$default_cd_device",
- [Default CD device to use])
-
- dnl uninstalled theme dir
- AC_DEFINE_UNQUOTED(THEME_DIR_UNINSTALLED, "`pwd`/gnome-cd/images",
- [path to uninstalled gnome-cd themes dir])
- AC_SUBST(THEME_DIR_UNINSTALLED)
-
- dnl used for accessibility of gnome-cd
- PKG_CHECK_MODULES(GAILUTIL,
- gail >= 0.0.3
- libbonobo-2.0 >= 2.0.0
- gconf-2.0)
- AC_SUBST(GAILUTIL_CFLAGS)
- AC_SUBST(GAILUTIL_LIBS)
-fi
-
-AM_CONDITIONAL(CDROM_HOST_BSD, test "x$CDROM_HOST_BSD" = "xtrue")
-AM_CONDITIONAL(CDROM_HOST_LINUX, test "x$CDROM_HOST_LINUX" = "xtrue")
-AM_CONDITIONAL(CDROM_HOST_SOLARIS, test "x$CDROM_HOST_SOLARIS" = "xtrue")
-
-dnl=======================================================================
dnl gstreamer-properties
dnl=======================================================================
@@ -689,17 +386,6 @@ gnome-volume-control/data/icons/scalable/Makefile
gnome-volume-control/data/icons/scalable/apps/Makefile
gnome-volume-control/data/icons/scalable/status/Makefile
gnome-volume-control/src/Makefile
-vu-meter/Makefile
-cddb-slave2/Makefile
-gnome-cd/Makefile
-gnome-cd/gnome-cd.schemas.in
-gnome-cd/images/Makefile
-gnome-cd/images/None/Makefile
-gnome-cd/images/lcd/Makefile
-gnome-cd/images/red-lcd/Makefile
-gnome-cd/images/media/Makefile
-gnome-cd/access/Makefile
-gnome-cd/doc/Makefile
grecord/Makefile
grecord/gnome-sound-recorder.schemas.in
grecord/src/Makefile
@@ -726,13 +412,9 @@ profiles/gnome-audio-profiles.schemas.in
profiles/gnome-media-profiles.pc
profiles/glade/Makefile
profiles/help/Makefile
-cddb-slave2/cddb-slave.desktop.in
-gnome-cd/gnome-cd.desktop.in
grecord/gnome-sound-recorder.desktop.in
gst-mixer/gnome-volume-control.desktop.in
gstreamer-properties/gstreamer-properties.desktop.in
-vu-meter/reclevel.desktop.in
-vu-meter/vumeter.desktop.in
])
SHAVE_INIT
@@ -757,16 +439,6 @@ echo "
*Deprecated*:
GStreamer mixer: $have_gstmixer
- vu-meter: $have_vumeter$vumeter_reason
- cddb-slave: $have_cddbslave
- gnome-cd: $have_gnomecd$gnomecd_reason"
-
-if test x$enable_gnomecd = xyes; then
-echo " System CDRom header: ${cdrom_header}
- Default CD device: ${default_cd_device}
- OS supports close tray: ${close_tray}
- Architecture: ${CDROM_HOST}"
-fi
-echo ""
+"
diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4
new file mode 100644
index 0000000..89c90c0
--- /dev/null
+++ b/m4/as-ac-expand.m4
@@ -0,0 +1,34 @@
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+dnl example
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+ EXP_VAR=[$1]
+ FROM_VAR=[$2]
+
+ dnl first expand prefix and exec_prefix if necessary
+ prefix_save=$prefix
+ if test "x$prefix" = "xNONE"; then
+ prefix=/usr/local
+ fi
+ exec_prefix_save=$exec_prefix
+ if test "x$exec_prefix" = "xNONE"; then
+ exec_prefix=/usr/local
+ fi
+
+ full_var="$FROM_VAR"
+ dnl loop until it doesn't change anymore
+ while true; do
+ new_full_var="`eval echo $full_var`"
+ if test "x$new_full_var"="x$full_var"; then break; fi
+ full_var=$new_full_var
+ done
+
+ dnl clean up
+ full_var=$new_full_var
+ AC_SUBST([$1], "$full_var")
+ prefix=$prefix_save
+ exec_prefix=$exec_prefix_save
+])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 13e7b11..b77b79b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,21 +1,6 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
[encoding: UTF-8]
-cddb-slave2/CDDB-Slave2.schemas.in
-cddb-slave2/GNOME_Media_CDDBSlave2.server.in.in
-cddb-slave2/cddb-slave-capplet.c
-cddb-slave2/cddb-slave.c
-cddb-slave2/cddb-slave.desktop.in.in
-cddb-slave2/cddb-track-editor.c
-gnome-cd/access/cddisplayaccessible.c
-gnome-cd/callbacks.c
-gnome-cd/cdrom.c
-gnome-cd/display.c
-gnome-cd/gnome-cd.c
-gnome-cd/gnome-cd.desktop.in.in
-gnome-cd/gnome-cd.schemas.in.in
-gnome-cd/gst-cdrom.c
-gnome-cd/preferences.c
gnome-volume-control/data/gnome-volume-control-applet.desktop.in
gnome-volume-control/data/gnome-volume-control.desktop.in.in
gnome-volume-control/src/applet-main.c
@@ -55,6 +40,3 @@ sound-theme/gvc-sound-theme-chooser.c
sound-theme/gvc-sound-theme-editor.c
sound-theme/sound-theme-file-utils.c
sound-theme/sounds/gnome-sounds-default.xml.in.in
-vu-meter/main.c
-vu-meter/reclevel.desktop.in.in
-vu-meter/vumeter.desktop.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5101092..9b2f2b2 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,3 @@
-cddb-slave2/cddb-slave.desktop.in
-gnome-cd/gnome-cd.desktop.in
-gnome-cd/gnome-cd.schemas.in
gnome-volume-control/data/gnome-volume-control.desktop.in
gnome-volume-control/data/sounds/gnome-sounds-default.xml.in
grecord/gnome-sound-recorder.desktop.in
@@ -8,6 +5,4 @@ grecord/gnome-sound-recorder.schemas.in
gst-mixer/gnome-volume-control.desktop.in
gstreamer-properties/gstreamer-properties.desktop.in
profiles/gnome-audio-profiles.schemas.in
-vu-meter/reclevel.desktop.in
-vu-meter/vumeter.desktop.in
sound-theme/sounds/gnome-sounds-default.xml.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
