make this module a bit more 0.9 friendly

Original commit message from CVS:
make this module a bit more 0.9 friendly

ChangeLog

@@ -1,3 +1,8 @@
+2005-05-05  Christian Schaller <uraeus@gnome.org>
+
+	* Update configure.ac and Makefiles to only build what is actually
+	ported and not moved into gst-plugins-base
+
 2005-02-22  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:

Makefile.am

@@ -6,49 +6,22 @@ else
 SUBDIRS_DOCS =
 endif
 
-if USE_GCONFTOOL
+# if USE_GCONFTOOL
-GCONF_DIR = gconf
+# GCONF_DIR = gconf
-else
+# else
-GCONF_DIR =
+# GCONF_DIR =
-endif
+# endif
-
-if BUILD_EXTERNAL
-EXT_DIR = ext
-else
-EXT_DIR =
-endif
-
-if BUILD_EXAMPLES
-EXAMPLES_DIR = examples
-else
-EXAMPLES_DIR =
-endif
 
 SUBDIRS = 			\
-	gst-libs 		\
+	gst sys 		\
-	gst sys $(EXT_DIR) 	\
-	$(EXAMPLES_DIR) 	\
-	tools 			\
 	$(GCONF_DIR) 		\
-	testsuite 		\
+	m4 			
-	po 			\
-	common 			\
-	m4 			\
-	pkgconfig
 # disabled
 #	$(SUBDIRS_DOCS)
 
 DIST_SUBDIRS = 			\
-	gst-libs		\
+	gst sys 		\
-	gst sys ext		\
+	m4 
-	examples		\
-	tools 			\
-	gconf 			\
-	testsuite 		\
-	po 			\
-	common 			\
-	m4 			\
-	pkgconfig
 
 # disabled
 #	docs
@@ -72,5 +45,5 @@ distcheck-hook:
           find $(distdir) -name \*-marshal.[ch] && \
           false )
 
-include $(top_srcdir)/common/release.mak
+# include $(top_srcdir)/common/release.mak
-include $(top_srcdir)/common/po.mak
+# include $(top_srcdir)/common/po.mak

PORTED_09

@@ -0,0 +1,7 @@
+List of ported plugins (update when you commit a ported plugin):
+osssink (wim)
+effectv (wim)
+
+- Remember that some plugins are already ported and now in the gst-plugins-base module.
+
+When you have ported a plugin remember to copy the relevant parts from configure.ac.orig into configure.ac and re-enable it in the Makefile.am files.

autogen.sh

@@ -65,12 +65,12 @@ toplevel_check $srcfile
 #    older autopoint (< 0.12) has a tendency to complain about mkinstalldirs
 if test -x mkinstalldirs; then rm mkinstalldirs; fi
 #    first remove patch if necessary, then run autopoint, then reapply
-if test -f po/Makefile.in.in;
+# if test -f po/Makefile.in.in;
-then
+# then
-  patch -p0 -R < common/gettext.patch
+#   patch -p0 -R < common/gettext.patch
-fi
+# fi
-tool_run "$autopoint --force"
+# tool_run "$autopoint --force"
-patch -p0 < common/gettext.patch
+# patch -p0 < common/gettext.patch
 
 tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
 tool_run "$libtoolize" "--copy --force"

common

@@ -1 +1 @@
-Subproject commit b2638c100721f67b280c3b43b21f1ce1c9b5e316
+Subproject commit 131c2632127e6f061b5270d8f80651782a4fdd13

po/af.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-03-18 14:16+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -121,22 +121,12 @@ msgstr "Geen l
 msgid "Could not write to file \"%s\"."
 msgstr "Kon nie skryf na lêer \"%s\" nie."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Geen of ongeldige klanktoevoer, AVI-stroom sal korrup wees."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
-msgstr ""
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
 msgstr ""
 
 #: sys/dxr3/dxr3audiosink.c:298

po/az.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins-0.8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-03-19 18:29+0200\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -122,22 +122,12 @@ msgstr "Fayl adı verilməyib."
 msgid "Could not write to file \"%s\"."
 msgstr "\"%s\" faylına yazıla bilmədi."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Səhv ya da olmayan audio girişi, AVI yayımı pozulacaqdır."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
-msgstr ""
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
 msgstr ""
 
 #: sys/dxr3/dxr3audiosink.c:298

po/cs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-08-08 22:58+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -123,27 +123,13 @@ msgstr "Nezadán název souboru."
 msgid "Could not write to file \"%s\"."
 msgstr "Nemohu zapisovat do souboru \"%s\"."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Žádný nebo neplatný vstup zvuku, proud AVI bude poškozen."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
 msgstr ""
-"Element %s nelze najít. Tento element je pro přehrávání nutný. Nainstalujte "
-"prosím potřebný modul a ověřte, že funguje, spuštěním 'gst-inspect %s'"
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
-msgstr ""
-"Nenalezen použitelný element colorspace.\n"
-"Nainstalujte prosím nějaký a restartujte."
 
 #: sys/dxr3/dxr3audiosink.c:298
 #, c-format
@@ -327,3 +313,19 @@ msgstr "Nemohu od zařízení \"%s\" získat vyrovnávací paměti."
 #, c-format
 msgid "Could not get enough buffers from device \"%s\"."
 msgstr "Nemohu od zařízení \"%s\" získat dost vyrovnávacích pamětí."
+
+#~ msgid ""
+#~ "The %s element could not be found. This element is essential for "
+#~ "playback. Please install the right plug-in and verify that it works by "
+#~ "running 'gst-inspect %s'"
+#~ msgstr ""
+#~ "Element %s nelze najít. Tento element je pro přehrávání nutný. "
+#~ "Nainstalujte prosím potřebný modul a ověřte, že funguje, spuštěním 'gst-"
+#~ "inspect %s'"
+
+#~ msgid ""
+#~ "No usable colorspace element could be found.\n"
+#~ "Please install one and restart."
+#~ msgstr ""
+#~ "Nenalezen použitelný element colorspace.\n"
+#~ "Nainstalujte prosím nějaký a restartujte."

po/en_GB.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-04-26 10:41-0400\n"
 "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
 "Language-Team: English (British) <en_gb@li.org>\n"
@@ -119,22 +119,12 @@ msgstr "No filename specified."
 msgid "Could not write to file \"%s\"."
 msgstr "Could not write to file \"%s\"."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "No or invalid input audio, AVI stream will be corrupt."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
-msgstr ""
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
 msgstr ""
 
 #: sys/dxr3/dxr3audiosink.c:298

po/hu.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-07-18 11:03+0200\n"
 "Last-Translator: Laszlo Dvornik <dvornik@invitel.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -119,22 +119,12 @@ msgstr "Nincs fájlnév megadva."
 msgid "Could not write to file \"%s\"."
 msgstr "Nem lehet írni a(z) \"%s\" fájlba."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Nincs vagy érvénytelen bemeneti hang, az AVI-folyam sérült lesz."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
-msgstr ""
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
 msgstr ""
 
 #: sys/dxr3/dxr3audiosink.c:298

po/it.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-11-07 19:11+0100\n"
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -120,28 +120,13 @@ msgstr "Nessun nome di file specificato."
 msgid "Could not write to file \"%s\"."
 msgstr "Impossibile scrivere sul file «%s»."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Ingresso audio assente o non valido. Lo stream AVI risulterà corrotto."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
 msgstr ""
-"Impossibile trovare l'elemento %s, essenziale per la riproduzione. "
-"Installare il plugin corretto e verificare che sia funzionante eseguendo "
-"«gst-inspect %s»"
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
-msgstr ""
-"Impossibile trovare un elemento colorspace utilizzabile.\n"
-"Installarne uno e riavviare."
 
 #: sys/dxr3/dxr3audiosink.c:298
 #, c-format
@@ -325,3 +310,19 @@ msgstr "Impossibile ottenere dei buffer dal device «%s»."
 #, c-format
 msgid "Could not get enough buffers from device \"%s\"."
 msgstr "Impossibile ottenere abbastanza buffer dal device «%s»."
+
+#~ msgid ""
+#~ "The %s element could not be found. This element is essential for "
+#~ "playback. Please install the right plug-in and verify that it works by "
+#~ "running 'gst-inspect %s'"
+#~ msgstr ""
+#~ "Impossibile trovare l'elemento %s, essenziale per la riproduzione. "
+#~ "Installare il plugin corretto e verificare che sia funzionante eseguendo "
+#~ "«gst-inspect %s»"
+
+#~ msgid ""
+#~ "No usable colorspace element could be found.\n"
+#~ "Please install one and restart."
+#~ msgstr ""
+#~ "Impossibile trovare un elemento colorspace utilizzabile.\n"
+#~ "Installarne uno e riavviare."

po/nb.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-10-04 15:54+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@broadpark.no>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -118,22 +118,12 @@ msgstr "Ingen filnavn oppgitt."
 msgid "Could not write to file \"%s\"."
 msgstr "Kunne ikke skrive til fil «%s»."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr ""
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
-msgstr ""
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
 msgstr ""
 
 #: sys/dxr3/dxr3audiosink.c:298

po/nl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-08-05 16:26+0200\n"
 "Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -120,28 +120,13 @@ msgstr "Geen bestandsnaam opgegeven."
 msgid "Could not write to file \"%s\"."
 msgstr "Kon niet schrijven naar bestand \"%s\"."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Geen of ongeldig invoergeluid, AVI-stroom zal slecht zijn."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
 msgstr ""
-"Het %s element kon niet worden gevonden. Dit element is essentieel om af te "
-"spelen. Installeer alstublieft de juiste plug-in en controleer dat die werkt "
-"door 'gst-inspect %s' uit te voeren"
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
-msgstr ""
-"Er kon geen bruikbaar kleurruimte-element worden gevonden.\n"
-"Installeer er alstublieft een en start opnieuw dit programma."
 
 #: sys/dxr3/dxr3audiosink.c:298
 #, c-format
@@ -326,3 +311,19 @@ msgstr "Kon geen buffers opvragen van apparaat \"%s\"."
 #, c-format
 msgid "Could not get enough buffers from device \"%s\"."
 msgstr "Kon niet voldoende buffers opvragen van apparaat \"%s\"."
+
+#~ msgid ""
+#~ "The %s element could not be found. This element is essential for "
+#~ "playback. Please install the right plug-in and verify that it works by "
+#~ "running 'gst-inspect %s'"
+#~ msgstr ""
+#~ "Het %s element kon niet worden gevonden. Dit element is essentieel om af "
+#~ "te spelen. Installeer alstublieft de juiste plug-in en controleer dat die "
+#~ "werkt door 'gst-inspect %s' uit te voeren"
+
+#~ msgid ""
+#~ "No usable colorspace element could be found.\n"
+#~ "Please install one and restart."
+#~ msgstr ""
+#~ "Er kon geen bruikbaar kleurruimte-element worden gevonden.\n"
+#~ "Installeer er alstublieft een en start opnieuw dit programma."

po/or.po

@@ -2,13 +2,13 @@
 # Copyright (C) 2004, Free Software Foundation, Inc.
 # This file is distributed under the same license as the gst-plugins-0.8.3 package.
 # Gora Mohanty <gora_mohanty@yahoo.co.in>, 2004.
-# $Id: or.po,v 1.3 2004/11/25 18:55:57 thomasvs Exp $
+# $Id: or.po,v 1.4 2005/01/03 16:16:27 thomasvs Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins-0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-09-27 13:32+0530\n"
 "Last-Translator: Gora Mohanty <gora_mohanty@yahoo.co.in>\n"
 "Language-Team: Oriya <gora_mohanty@yahoo.co.in>\n"
@@ -121,27 +121,13 @@ msgstr "କୌଣସି ଫାଇଲନାମ ଉଲ୍ଲେଖିତ ହୋଇ
 msgid "Could not write to file \"%s\"."
 msgstr "\"%s\" ଫାଇଲ ଲେଖିହେଲା ନାହିଁ."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "ନିବେଶ ଧ୍ବନି ନାହିଁ ବା ଅବୈଧ ଅଛି. ଏ.ଭି.ଆଇ. ଧାରା ଭ୍ରଷ୍ଟ ହୋଇଯିବ."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
 msgstr ""
-"%s ଉପାଦାନ ମିଳିଲା ନାହିଁ. ପୁନଃପ୍ରଦର୍ଶନ ପାଇଁ ଏହି ଉପାଦାନଟି ଆବଶ୍ଯକ. ଦୟା କରି ସଠିକ ପ୍ଲଗ୍ଇନ୍ ସ୍ଥାପିତ "
-"କରନ୍ତୁ, ଓ 'gst-inspect %s' ଚଳାଇ ଯାଞ୍ଚ କରନ୍ତୁ କି ଏହା କାର୍ଯ୍ଯକାରୀ ଅଛି"
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
-msgstr ""
-"କୌଣସି ବ୍ଯବହାରଯୋଗ୍ଯ ରଙ୍ଗକ୍ଷେତ୍ର ଉପାଦାନ ମିଳିଲା ନାହିଁ.\n"
-"ଦୟା କରି ଗୋଟିଏ ଉପାଦାନ ସ୍ଥାପିତ କରି ପୁନଃପ୍ରାରମ୍ଭ କରନ୍ତୁ."
 
 #: sys/dxr3/dxr3audiosink.c:298
 #, c-format
@@ -325,3 +311,18 @@ msgstr "\"%s\" ଯନ୍ତ୍ରରୁ ଅସ୍ଥାୟୀ ସଞ୍ଚୟ
 #, c-format
 msgid "Could not get enough buffers from device \"%s\"."
 msgstr "\"%s\" ଯନ୍ତ୍ରରୁ ପର୍ଯ୍ଯାପ୍ତ ଅସ୍ଥାୟୀ ସଞ୍ଚୟ ସ୍ଥାନ ଆଣିହେଲା ନାହିଁ."
+
+#~ msgid ""
+#~ "The %s element could not be found. This element is essential for "
+#~ "playback. Please install the right plug-in and verify that it works by "
+#~ "running 'gst-inspect %s'"
+#~ msgstr ""
+#~ "%s ଉପାଦାନ ମିଳିଲା ନାହିଁ. ପୁନଃପ୍ରଦର୍ଶନ ପାଇଁ ଏହି ଉପାଦାନଟି ଆବଶ୍ଯକ. ଦୟା କରି ସଠିକ ପ୍ଲଗ୍ଇନ୍ "
+#~ "ସ୍ଥାପିତ କରନ୍ତୁ, ଓ 'gst-inspect %s' ଚଳାଇ ଯାଞ୍ଚ କରନ୍ତୁ କି ଏହା କାର୍ଯ୍ଯକାରୀ ଅଛି"
+
+#~ msgid ""
+#~ "No usable colorspace element could be found.\n"
+#~ "Please install one and restart."
+#~ msgstr ""
+#~ "କୌଣସି ବ୍ଯବହାରଯୋଗ୍ଯ ରଙ୍ଗକ୍ଷେତ୍ର ଉପାଦାନ ମିଳିଲା ନାହିଁ.\n"
+#~ "ଦୟା କରି ଗୋଟିଏ ଉପାଦାନ ସ୍ଥାପିତ କରି ପୁନଃପ୍ରାରମ୍ଭ କରନ୍ତୁ."

po/sq.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-08-07 20:29+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <begraj@hotmail.com>\n"
@@ -119,28 +119,13 @@ msgstr "Nuk është përcaktuar emri i file."
 msgid "Could not write to file \"%s\"."
 msgstr "I pamundur shkrimi tek file \"%s\"."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Input audio i gabuar ose mungon, stream AVI mund të jetë i dëmtuar."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
 msgstr ""
-"E pamundur gjetja e elementit %s. Ky element është thelbësor për playback. "
-"Ju lutem instaloni plug-in e duhur dhe kontrollo funksionimin duke "
-"ekzekutuar 'gst-inspect %s'"
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
-msgstr ""
-"Nuk arrin të gjehet asnjë element ngjyra e hapësirës.\n"
-"Ju lutem instaloni një dhe rinisni."
 
 #: sys/dxr3/dxr3audiosink.c:298
 #, c-format
@@ -324,3 +309,19 @@ msgstr "E pamundur marrja e buffers nga dispozitivi \"%s\"."
 #, c-format
 msgid "Could not get enough buffers from device \"%s\"."
 msgstr "E pamundur marrja e buffers të mjaftueshëm nga dispozitivi \"%s\"."
+
+#~ msgid ""
+#~ "The %s element could not be found. This element is essential for "
+#~ "playback. Please install the right plug-in and verify that it works by "
+#~ "running 'gst-inspect %s'"
+#~ msgstr ""
+#~ "E pamundur gjetja e elementit %s. Ky element është thelbësor për "
+#~ "playback. Ju lutem instaloni plug-in e duhur dhe kontrollo funksionimin "
+#~ "duke ekzekutuar 'gst-inspect %s'"
+
+#~ msgid ""
+#~ "No usable colorspace element could be found.\n"
+#~ "Please install one and restart."
+#~ msgstr ""
+#~ "Nuk arrin të gjehet asnjë element ngjyra e hapësirës.\n"
+#~ "Ju lutem instaloni një dhe rinisni."

po/sr.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-03-13 00:18+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
@@ -123,22 +123,12 @@ msgstr "Име датотеке није задато."
 msgid "Could not write to file \"%s\"."
 msgstr "Не могу да пишем у датотеку „%s“."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Улазног звука нема или је неисправан, АВИ ток ће бити искварен."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
-msgstr ""
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
 msgstr ""
 
 #: sys/dxr3/dxr3audiosink.c:298

po/sv.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-08-03 20:53+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -124,28 +124,13 @@ msgstr "Inget filnamn angivet."
 msgid "Could not write to file \"%s\"."
 msgstr "Kunde inte skriva till filen \"%s\"."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Inget eller ogiltigt inljud. AVI-flödet kommer att skadas."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
 msgstr ""
-"Elementet %s kunde inte hittas. Detta element är nödvändigt för uppspelning. "
-"Installera rätt insticksmodul och verifiera att den fungerar genom att köra "
-"\"gst-inspect %s\""
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
-msgstr ""
-"Inget användbart namnrymdselement kunde hittas.\n"
-"Installera ett och starta om."
 
 #: sys/dxr3/dxr3audiosink.c:298
 #, c-format
@@ -330,6 +315,22 @@ msgstr "Kunde inte få tag i buffertar från enheten \"%s\"."
 msgid "Could not get enough buffers from device \"%s\"."
 msgstr "Kunde inte få tag i tillräckligt många buffertar från enheten \"%s\"."
 
+#~ msgid ""
+#~ "The %s element could not be found. This element is essential for "
+#~ "playback. Please install the right plug-in and verify that it works by "
+#~ "running 'gst-inspect %s'"
+#~ msgstr ""
+#~ "Elementet %s kunde inte hittas. Detta element är nödvändigt för "
+#~ "uppspelning. Installera rätt insticksmodul och verifiera att den fungerar "
+#~ "genom att köra \"gst-inspect %s\""
+
+#~ msgid ""
+#~ "No usable colorspace element could be found.\n"
+#~ "Please install one and restart."
+#~ msgstr ""
+#~ "Inget användbart namnrymdselement kunde hittas.\n"
+#~ "Installera ett och starta om."
+
 #~ msgid "Line"
 #~ msgstr "Linje"
 

po/uk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-30 20:49+0100\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2004-08-03 15:40+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -122,22 +122,12 @@ msgstr "Не вказаний файл."
 msgid "Could not write to file \"%s\"."
 msgstr "Не вдається записати у файл \"%s\"."
 
-#: gst/avi/gstavimux.c:1056
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Відсутній або неправильний вхід звуку, AVI потік буде пошкоджений."
 
-#: gst-libs/gst/play/play.c:110
+#: gst-libs/gst/play/play.c:719
-#, c-format
+msgid "Failed to create playbin object"
-msgid ""
-"The %s element could not be found. This element is essential for playback. "
-"Please install the right plug-in and verify that it works by running 'gst-"
-"inspect %s'"
-msgstr ""
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
 msgstr ""
 
 #: sys/dxr3/dxr3audiosink.c:298

po/vi.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins-0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-02 13:00+0200\n"
+"POT-Creation-Date: 2005-01-28 12:07+0100\n"
 "PO-Revision-Date: 2005-01-22 17:17+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net> \n"
@@ -16,69 +16,120 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:346 ext/sndfile/gstsf.c:621
+#: ext/alsa/gstalsamixertrack.c:83
+msgid "Master"
+msgstr ""
+
+#: ext/alsa/gstalsamixertrack.c:84 sys/oss/gstossmixer.c:100
+msgid "Bass"
+msgstr "Trầm"
+
+#: ext/alsa/gstalsamixertrack.c:85 sys/oss/gstossmixer.c:102
+msgid "Treble"
+msgstr "Cao"
+
+#: ext/alsa/gstalsamixertrack.c:86 sys/oss/gstossmixer.c:106
+msgid "PCM"
+msgstr "PCM"
+
+#: ext/alsa/gstalsamixertrack.c:87 sys/oss/gstossmixer.c:104
+msgid "Synth"
+msgstr "Tổng hợp"
+
+#: ext/alsa/gstalsamixertrack.c:88 sys/oss/gstossmixer.c:110
+msgid "Line-in"
+msgstr "Dây-vào"
+
+#: ext/alsa/gstalsamixertrack.c:89 sys/oss/gstossmixer.c:114
+msgid "CD"
+msgstr "CD"
+
+#: ext/alsa/gstalsamixertrack.c:90 sys/oss/gstossmixer.c:112
+msgid "Microphone"
+msgstr "Micrô"
+
+#: ext/alsa/gstalsamixertrack.c:91
+#, fuzzy
+msgid "PC Speaker"
+msgstr "Loa"
+
+#: ext/alsa/gstalsamixertrack.c:92
+msgid "Playback"
+msgstr ""
+
+#: ext/alsa/gstalsamixertrack.c:93
+msgid "Capture"
+msgstr ""
+
+#: ext/audiofile/gstafsink.c:344 ext/sndfile/gstsf.c:624
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Đã không mở được tập tin \"%s\" để ghi."
 
-#: ext/audiofile/gstafsink.c:368 ext/audiofile/gstafsrc.c:373
+#: ext/audiofile/gstafsink.c:366 ext/audiofile/gstafsrc.c:371
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Lỗi khi đóng tập tin \"%s\"."
 
-#: ext/audiofile/gstafsrc.c:320
+#: ext/audiofile/gstafsrc.c:318
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Đã không mở được tập tin \"%s\" để đọc."
 
-#: ext/cdparanoia/gstcdparanoia.c:657 ext/cdparanoia/gstcdparanoia.c:673
+#: ext/cdparanoia/gstcdparanoia.c:278
+msgid "discid"
+msgstr ""
+
+#: ext/cdparanoia/gstcdparanoia.c:278
+msgid "CDDA discid for metadata retrieval"
+msgstr ""
+
+#: ext/cdparanoia/gstcdparanoia.c:683 ext/cdparanoia/gstcdparanoia.c:699
 msgid "Could not open CD device for reading."
 msgstr "Đã không mở được thiết bị CD để đọc"
 
-#: ext/gnomevfs/gstgnomevfssrc.c:1067 ext/gnomevfs/gstgnomevfssrc.c:1090
+#: ext/gnomevfs/gstgnomevfssrc.c:1157
 #, c-format
 msgid "Could not open vfs file \"%s\" for reading."
 msgstr "Đã không mở được tập tin vfs \"%s\" để đọc."
 
-#: ext/gnomevfs/gstgnomevfssink.c:344
+#: ext/gnomevfs/gstgnomevfssrc.c:1165
+#, fuzzy
+msgid "No filename given."
+msgstr "Chưa nhập tên tập tin "
+
+#: ext/gnomevfs/gstgnomevfssink.c:432
 #, c-format
 msgid "Could not open vfs file \"%s\" for writing: %s."
 msgstr "Đã không mở được tập tin vfs \"%s\" để ghi: %s."
 
-#: ext/gnomevfs/gstgnomevfssink.c:351
+#: ext/gnomevfs/gstgnomevfssink.c:439
 msgid "No filename given"
 msgstr "Chưa nhập tên tập tin "
 
-#: ext/gnomevfs/gstgnomevfssink.c:377
+#: ext/gnomevfs/gstgnomevfssink.c:467
 #, c-format
 msgid "Could not close vfs file \"%s\"."
 msgstr "Đã không đóng được tập tin vfs \"%s\"."
 
-#: ext/sndfile/gstsf.c:582
+#: ext/sndfile/gstsf.c:585
 msgid "No filename specified."
 msgstr "Chưa ghi rõ tên tập tin."
 
-#: ext/sndfile/gstsf.c:835
+#: ext/sndfile/gstsf.c:838
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Đã không ghi được vào tập tin \"%s\"."
 
-#: gst/avi/gstavimux.c:1052
+#: gst/avi/gstavimux.c:1007
 msgid "No or invalid input audio, AVI stream will be corrupt."
-msgstr "Chưa có dữ liệu âm thanh nhập, hoặc dữ liệu âm thanh nhập không hợp lệ. Sẽ có dòng AVI hư."
-
-#: gst-libs/gst/play/play.c:110
-#, c-format
-msgid "The %s element could not be found. This element is essential for playback. Please install the right plug-in and verify that it works by running 'gst-inspect %s'"
-msgstr "Chưa tìm được yếu tố %s. Phải có yếu tố này để phát lại được.Hãy cài đặt trình cầm phít đúng và kiểm chứng nó hoạt động được bằng cách chạy lệnh 'gst-inspect %s'"
-
-#: gst-libs/gst/play/play.c:139
-msgid ""
-"No usable colorspace element could be found.\n"
-"Please install one and restart."
 msgstr ""
-"Chưa tìm được yếu tố colorspace (khoảng cách màu) có thể sử dụng.\n"
+"Chưa có dữ liệu âm thanh nhập, hoặc dữ liệu âm thanh nhập không hợp lệ. Sẽ "
-"Hãy cài đặt nó rồi khởi động lại."
+"có dòng AVI hư."
+
+#: gst-libs/gst/play/play.c:719
+msgid "Failed to create playbin object"
+msgstr ""
 
 #: sys/dxr3/dxr3audiosink.c:298
 #, c-format
@@ -120,37 +171,42 @@ msgstr "Đã không mở được thiết bị ảnh động \"%s\" để ghi."
 msgid "Could not close video device \"%s\"."
 msgstr "Đã không đóng được thiết bị ảnh động \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:453 sys/v4l2/v4l2src_calls.c:123
+#: sys/dxr3/dxr3videosink.c:453 sys/v4l2/v4l2src_calls.c:124
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Đã không ghi được vào thiết bị \"%s\"."
 
-#: sys/oss/gstosselement.c:725
+#: sys/oss/gstosselement.c:726
 #, c-format
 msgid "OSS device \"%s\" is already in use by another program."
 msgstr "Một chương trình khác đang sử dụng thiết bị OSS \"%s\"."
 
-#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736
+#: sys/oss/gstosselement.c:733 sys/oss/gstosselement.c:737
 #, c-format
 msgid "Could not access device \"%s\", check its permissions."
 msgstr "Đã không truy cập được thiết bị \"%s\", nên hãy kiểm tra quyền nó."
 
-#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:167
+#: sys/oss/gstosselement.c:744 sys/v4l/v4l_calls.c:168
 #, c-format
 msgid "Device \"%s\" does not exist."
 msgstr "Không có thiết bị \"%s\" ."
 
-#: sys/oss/gstosselement.c:750
+#: sys/oss/gstosselement.c:751
 #, c-format
 msgid "Could not open device \"%s\" for writing."
 msgstr "Đã không mở được thiết bị \"%s\" để ghi."
 
-#: sys/oss/gstosselement.c:754
+#: sys/oss/gstosselement.c:755
 #, c-format
 msgid "Could not open device \"%s\" for reading."
 msgstr "Đã không mở được thiết bị \"%s\" để đọc."
 
-#: sys/oss/gstosselement.c:1131
+#: sys/oss/gstosselement.c:1153
+#, fuzzy
+msgid "Your OSS device doesn't support mono or stereo."
+msgstr "Đã không dò được cho đúng thiết bị OSS của bạn"
+
+#: sys/oss/gstosselement.c:1167
 msgid "Your OSS device could not be probed correctly"
 msgstr "Đã không dò được cho đúng thiết bị OSS của bạn"
 
@@ -158,38 +214,10 @@ msgstr "Đã không dò được cho đúng thiết bị OSS của bạn"
 msgid "Volume"
 msgstr "Âm lượng"
 
-#: sys/oss/gstossmixer.c:100
-msgid "Bass"
-msgstr "Trầm"
-
-#: sys/oss/gstossmixer.c:102
-msgid "Treble"
-msgstr "Cao"
-
-#: sys/oss/gstossmixer.c:104
-msgid "Synth"
-msgstr "Tổng hợp"
-
-#: sys/oss/gstossmixer.c:106
-msgid "PCM"
-msgstr "PCM"
-
 #: sys/oss/gstossmixer.c:108
 msgid "Speaker"
 msgstr "Loa"
 
-#: sys/oss/gstossmixer.c:110
-msgid "Line-in"
-msgstr "Dây-vào"
-
-#: sys/oss/gstossmixer.c:112
-msgid "Microphone"
-msgstr "Micrô"
-
-#: sys/oss/gstossmixer.c:114
-msgid "CD"
-msgstr "CD"
-
 #: sys/oss/gstossmixer.c:116
 msgid "Mixer"
 msgstr "Trộn"
@@ -254,11 +282,11 @@ msgstr "Thu thanh"
 msgid "Monitor"
 msgstr "Màn hình"
 
-#: sys/v4l/v4l_calls.c:158
+#: sys/v4l/v4l_calls.c:159
 msgid "No device specified."
 msgstr "Chưa ghi rõ thiết bị nào"
 
-#: sys/v4l/v4l_calls.c:171 sys/v4l2/v4l2_calls.c:397
+#: sys/v4l/v4l_calls.c:172 sys/v4l2/v4l2_calls.c:400
 #, c-format
 msgid "Could not open device \"%s\" for reading and writing."
 msgstr "Đã không mở được thiết bị \"%s\" để đọc và ghi."
@@ -271,17 +299,33 @@ msgstr "Thiết bị chưa mở"
 msgid "Device is open."
 msgstr "Thiết bị mở rồi"
 
-#: sys/v4l2/v4l2_calls.c:411
+#: sys/v4l2/v4l2_calls.c:414
 #, c-format
 msgid "Device \"%s\" is not a capture device."
 msgstr "Thiết bị \"%s\" không bắt gì được."
 
-#: sys/v4l2/v4l2src_calls.c:255
+#: sys/v4l2/v4l2src_calls.c:256
 #, c-format
 msgid "Could not get buffers from device \"%s\"."
 msgstr "Đã không gọi được bộ đệm nào từ thiết bị \"%s\"."
 
-#: sys/v4l2/v4l2src_calls.c:264
+#: sys/v4l2/v4l2src_calls.c:265
 #, c-format
 msgid "Could not get enough buffers from device \"%s\"."
 msgstr "Đã không gọi được đủ bộ đệm từ thiết bị \"%s\"."
+
+#~ msgid ""
+#~ "The %s element could not be found. This element is essential for "
+#~ "playback. Please install the right plug-in and verify that it works by "
+#~ "running 'gst-inspect %s'"
+#~ msgstr ""
+#~ "Chưa tìm được yếu tố %s. Phải có yếu tố này để phát lại được.Hãy cài đặt "
+#~ "trình cầm phít đúng và kiểm chứng nó hoạt động được bằng cách chạy lệnh "
+#~ "'gst-inspect %s'"
+
+#~ msgid ""
+#~ "No usable colorspace element could be found.\n"
+#~ "Please install one and restart."
+#~ msgstr ""
+#~ "Chưa tìm được yếu tố colorspace (khoảng cách màu) có thể sử dụng.\n"
+#~ "Hãy cài đặt nó rồi khởi động lại."

sys/Makefile.am

@@ -1,8 +1,8 @@
-if USE_DXR3
+# if USE_DXR3
-DXR3_DIR=dxr3
+# DXR3_DIR=dxr3
-else
+# else
-DXR3_DIR=
+# DXR3_DIR=
-endif
+# endif
 
 if USE_OSS
 OSS_DIR=oss
@@ -10,76 +10,60 @@ else
 OSS_DIR=
 endif
 
-if USE_OSX_AUDIO
+# if USE_OSX_AUDIO
-OSX_AUDIO_DIR=osxaudio
+# OSX_AUDIO_DIR=osxaudio
-else
+# else
-OSX_AUDIO_DIR=
+# OSX_AUDIO_DIR=
-endif
+# endif
 
-if USE_OSX_VIDEO
+# if USE_OSX_VIDEO
-OSX_VIDEO_DIR=osxvideo
+# OSX_VIDEO_DIR=osxvideo
-else
+# else
-OSX_VIDEO_DIR=
+# OSX_VIDEO_DIR=
-endif
+# endif
 
-if USE_QCAM
+# if USE_QCAM
-QCAM_DIR=qcam
+# QCAM_DIR=qcam
-else
+# else
-QCAM_DIR=
+# QCAM_DIR=
-endif
+# endif
 
-if USE_SUNAUDIO
+# if USE_SUNAUDIO
-SUNAUDIO_DIR=sunaudio
+# SUNAUDIO_DIR=sunaudio
-else
+# else
-SUNAUDIO_DIR=
+# SUNAUDIO_DIR=
-endif
+# endif
 
-if USE_GST_V4L
+# if USE_GST_V4L
-V4L_DIR=v4l
+# V4L_DIR=v4l
-else
+# else
-V4L_DIR=
+# V4L_DIR=
-endif
+# endif
 
-if USE_GST_V4L2
+# if USE_GST_V4L2
-V4L2_DIR=v4l2
+# V4L2_DIR=v4l2
-else
+# else
-V4L2_DIR=
+# V4L2_DIR=
-endif
+# endif
 
-if USE_VCD
+# if USE_VCD
-VCD_DIR=vcd
+# VCD_DIR=vcd
-else
+# else
-VCD_DIR=
+# VCD_DIR=
-endif
+# endif
 
-if USE_X
+# if USE_CDROM
-XI_DIR=ximage
+#  CDROM_DIR=cdrom
-else
+# else
-XI_DIR=
+# CDROM_DIR=
-endif
+# endif
 
-if USE_XVIDEO
+# if USE_OPENGL
-XV_DIR=xvimage
+# GL_DIR=glsink
-else
+# else
-XV_DIR=
+# GL_DIR=
-endif
+# endif
 
-if USE_CDROM
+SUBDIRS=$(OSS_DIR) 
-CDROM_DIR=cdrom
-else
-CDROM_DIR=
-endif
-
-if USE_OPENGL
-GL_DIR=glsink
-else
-GL_DIR=
-endif
-
-SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(QCAM_DIR) \
-        $(SUNAUDIO_DIR) $(V4L_DIR) $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) \
-        $(XI_DIR) $(XV_DIR) $(GL_DIR)
-
-DIST_SUBDIRS=dxr3 oss osxaudio osxvideo qcam sunaudio v4l v4l2 vcd ximage \
-        xvimage glsink cdrom
 
+DIST_SUBDIRS=oss