4 files changed, 23 insertions, 39 deletions
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 83e803936..b5f21fe5c 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -59,7 +59,6 @@ GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) -DGST_USE_UNSTABLE
 GTKDOC_LIBS = \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
 	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
-	$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la \
 	$(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_MAJORMINOR@.la \
 	$(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la \
 	$(top_builddir)/gst-libs/gst/rtsp/libgstrtsp-@GST_MAJORMINOR@.la \
diff --git a/docs/libs/gst-plugins-base-libs-docs.sgml b/docs/libs/gst-plugins-base-libs-docs.sgml
index 243c7fc33..a2bbdb47e 100644
--- a/docs/libs/gst-plugins-base-libs-docs.sgml
+++ b/docs/libs/gst-plugins-base-libs-docs.sgml
@@ -43,6 +43,7 @@
         <filename>-lgstaudio-&GST_MAJORMINOR;</filename> to the library flags.
       </para>
       <xi:include href="xml/gstaudio.xml" />
+      <xi:include href="xml/gstaudiocdsrc.xml" />
       <xi:include href="xml/gstaudioclock.xml" />
       <xi:include href="xml/gstaudiodecoder.xml" />
       <xi:include href="xml/gstaudioencoder.xml" />
@@ -57,16 +58,6 @@
       <xi:include href="xml/gstaudioiec61937.xml" />
     </chapter>
 
-    <chapter id="gstreamer-cdda">
-      <title>CDDA Library</title>
-      <para>
-        This library should be linked to by getting cflags and libs from
-        <filename>gstreamer-plugins-base-&GST_MAJORMINOR;.pc</filename> and adding
-        <filename>-lgstcdda-&GST_MAJORMINOR;</filename> to the library flags.
-      </para>
-      <xi:include href="xml/gstcddabasesrc.xml" />
-    </chapter>
-
     <chapter id="gstreamer-ffft">
       <title>FFT Library</title>
       <para>
diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt
index 29af9b387..a4834618f 100644
--- a/docs/libs/gst-plugins-base-libs-sections.txt
+++ b/docs/libs/gst-plugins-base-libs-sections.txt
@@ -150,6 +150,26 @@ GST_AUDIO_CLOCK_CAST
 </SECTION>
 
 <SECTION>
+<FILE>gstaudiocdsrc</FILE>
+<INCLUDE>gst/audio/gstaudiocdsrc.h</INCLUDE>
+GstAudioCdSrc
+GstAudioCdSrcClass
+GstAudioCdSrcTrack
+GstAudioCdSrcMode
+gst_audio_cd_src_add_track
+<SUBSECTION Standard>
+GST_TYPE_AUDIO_CD_SRC_MODE
+gst_audio_cd_src_mode_get_type
+GST_AUDIO_CD_SRC
+GST_AUDIO_CD_SRC_CLASS
+GST_AUDIO_CD_SRC_GET_CLASS
+GST_IS_AUDIO_CD_SRC
+GST_IS_AUDIO_CD_SRC_CLASS
+GST_TYPE_AUDIO_CD_SRC
+gst_audio_cd_src_get_type
+</SECTION>
+
+<SECTION>
 <FILE>gstaudiodecoder</FILE>
 <INCLUDE>gst/audio/gstaudiodecoder.h</INCLUDE>
 GstAudioDecoder
@@ -431,29 +451,6 @@ gst_audio_iec61937_frame_size
 gst_audio_iec61937_payload
 </SECTION>
 
-
-# cdda
-
-<SECTION>
-<FILE>gstcddabasesrc</FILE>
-<INCLUDE>gst/cdda/gstcddabasesrc.h</INCLUDE>
-GstCddaBaseSrc
-GstCddaBaseSrcClass
-GstCddaBaseSrcTrack
-GstCddaBaseSrcMode
-gst_cdda_base_src_add_track
-<SUBSECTION Standard>
-GST_TYPE_CDDA_BASE_SRC_MODE
-gst_cdda_base_src_mode_get_type
-GST_CDDA_BASE_SRC
-GST_CDDA_BASE_SRC_CLASS
-GST_CDDA_BASE_SRC_GET_CLASS
-GST_IS_CDDA_BASE_SRC
-GST_IS_CDDA_BASE_SRC_CLASS
-GST_TYPE_CDDA_BASE_SRC
-gst_cdda_base_src_get_type
-</SECTION>
-
 # fft
 
 <SECTION>
diff --git a/docs/libs/gst-plugins-base-libs.types b/docs/libs/gst-plugins-base-libs.types
index 4b8731a5c..b09184548 100644
--- a/docs/libs/gst-plugins-base-libs.types
+++ b/docs/libs/gst-plugins-base-libs.types
@@ -1,6 +1,8 @@
 #include <gst/gst.h>
 
 
+#include <gst/audio/gstaudiocdsrc.h>
+gst_audio_cd_src_get_type
 #include <gst/audio/gstaudioclock.h>
 gst_audio_clock_get_type
 #include <gst/audio/gstaudiodecoder.h>
@@ -20,11 +22,6 @@ gst_audio_base_src_get_type
 #include <gst/audio/gstaudioringbuffer.h>
 gst_audio_ring_buffer_get_type
 
-
-#include <gst/cdda/gstcddabasesrc.h>
-gst_cdda_base_src_get_type
-
-
 #include <gst/interfaces/colorbalance.h>
 gst_color_balance_get_type
 gst_color_balance_channel_get_type