From 0551a8b21218c7a81fd17242274ace66c3c056f1 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Tue, 12 Aug 2008 09:22:29 +0000
Subject: Pull changes from 0.10.9.2 pre-release branch moving the libcdio

Original commit message from CVS:
* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-good-plugins-docs.sgml:
* docs/plugins/gst-plugins-good-plugins-sections.txt:
* docs/plugins/inspect/plugin-cdio.xml:
* ext/Makefile.am:
* ext/cdio/Makefile.am:
* ext/cdio/gstcdio.c:
* ext/cdio/gstcdio.h:
* ext/cdio/gstcdiocddasrc.c:
* ext/cdio/gstcdiocddasrc.h:
Pull changes from 0.10.9.2 pre-release branch moving the libcdio
CDDA source to -ugly.
* po/LINGUAS:
* po/POTFILES.in:
* po/id.po:
Pull in new translation from 0.10.9.2 release branch.
---
 docs/plugins/Makefile.am                           |  1 -
 docs/plugins/gst-plugins-good-plugins-docs.sgml    |  2 --
 docs/plugins/gst-plugins-good-plugins-sections.txt | 14 -----------
 docs/plugins/inspect/plugin-cdio.xml               | 28 ----------------------
 4 files changed, 45 deletions(-)
 delete mode 100644 docs/plugins/inspect/plugin-cdio.xml

(limited to 'docs')

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index c6ba7e85..6a106a60 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -79,7 +79,6 @@ EXTRA_HFILES = \
 	$(top_srcdir)/ext/annodex/gstcmmldec.h \
 	$(top_srcdir)/ext/annodex/gstcmmlenc.h \
 	$(top_srcdir)/ext/cairo/gsttimeoverlay.h \
-	$(top_srcdir)/ext/cdio/gstcdiocddasrc.h \
 	$(top_srcdir)/ext/dv/gstdvdec.h \
 	$(top_srcdir)/ext/dv/gstdvdemux.h \
 	$(top_srcdir)/ext/esd/esdsink.h \
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index c72f2aa0..180c182b 100644
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -32,7 +32,6 @@
     <xi:include href="xml/element-avisubtitle.xml" />
     <xi:include href="xml/element-cacasink.xml" />
     <xi:include href="xml/element-cairotimeoverlay.xml" />
-    <xi:include href="xml/element-cdiocddasrc.xml" />
     <xi:include href="xml/element-cmmldec.xml" />
     <xi:include href="xml/element-cmmlenc.xml" />
     <xi:include href="xml/element-deinterleave.xml" />
@@ -122,7 +121,6 @@
     <xi:include href="xml/plugin-avi.xml" />
     <xi:include href="xml/plugin-cacasink.xml" />
     <xi:include href="xml/plugin-cairo.xml" />
-    <xi:include href="xml/plugin-cdio.xml" />
     <xi:include href="xml/plugin-cutter.xml" />
     <xi:include href="xml/plugin-debug.xml" />
     <xi:include href="xml/plugin-directdraw.xml" />
diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index 0e56bd5c..dd63c911 100644
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -339,20 +339,6 @@ GST_IS_CMML_ENC_CLASS
 gst_cmml_enc_plugin_init
 </SECTION>
 
-<SECTION>
-<FILE>element-cdiocddasrc</FILE>
-<TITLE>cdiocddasrc</TITLE>
-GstCdioCddaSrc
-<SUBSECTION Standard>
-GstCdioCddaSrcClass
-GST_TYPE_CDIO_CDDA_SRC
-GST_CDIO_CDDA_SRC
-GST_CDIO_CDDA_SRC_CLASS
-GST_IS_CDIO_CDDA_SRC
-GST_IS_CDIO_CDDA_SRC_CLASS
-gst_cdio_cdda_src_get_type
-</SECTION>
-
 <SECTION>
 <FILE>element-deinterleave</FILE>
 <TITLE>deinterleave</TITLE>
diff --git a/docs/plugins/inspect/plugin-cdio.xml b/docs/plugins/inspect/plugin-cdio.xml
deleted file mode 100644
index 18b8cc9c..00000000
--- a/docs/plugins/inspect/plugin-cdio.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<plugin>
-  <name>cdio</name>
-  <description>Read audio from audio CDs</description>
-  <filename>../../ext/cdio/.libs/libgstcdio.so</filename>
-  <basename>libgstcdio.so</basename>
-  <version>0.10.9</version>
-  <license>GPL</license>
-  <source>gst-plugins-good</source>
-  <package>GStreamer Good Plug-ins source release</package>
-  <origin>Unknown package origin</origin>
-  <elements>
-    <element>
-      <name>cdiocddasrc</name>
-      <longname>CD audio source (CDDA)</longname>
-      <class>Source/File</class>
-      <description>Read audio from CD using libcdio</description>
-      <author>Tim-Philipp Müller &lt;tim centricular net&gt;</author>
-      <pads>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-int, endianness=(int)1234, signed=(boolean)true, width=(int)16, depth=(int)16, rate=(int)44100, channels=(int)2</details>
-        </caps>
-      </pads>
-    </element>
-  </elements>
-</plugin>
\ No newline at end of file
-- 
cgit