summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--configure.ac9
-rw-r--r--ext/Makefile.am8
3 files changed, 35 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 64a9dc2b..93b2cc81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2005-03-26 Tim-Philipp Müller <tim at centricular dot net>
+
+ * configure.ac:
+ * ext/Makefile.am:
+ * ext/cdio/Makefile.am:
+ * ext/cdio/cddasrc.c: (_do_init), (cddasrc_mode_get_type),
+ (cddasrc_base_init), (cddasrc_class_init), (cddasrc_init),
+ (cddasrc_finalize), (cddasrc_set_property), (cddasrc_get_property),
+ (cddasrc_get_sectors_from_start), (cddasrc_do_seek), (cddasrc_get),
+ (cddasrc_cddb_sum), (cddasrc_calculate_discid), (cddasrc_open),
+ (cddasrc_close), (cddasrc_change_state), (cddasrc_get_event_mask),
+ (cddasrc_event), (cddasrc_get_formats),
+ (cddasrc_get_track_from_sector), (cddasrc_get_query_types),
+ (cddasrc_query), (plugin_init), (cddasrc_uri_get_type),
+ (cddasrc_uri_get_protocols), (cddasrc_uri_get_uri),
+ (cddasrc_uri_set_uri), (cddasrc_uri_handler_init):
+ Add new libcdio-based cddasrc plugin (fixes #171530)
+
2005-03-25 David Schleef <ds@schleef.org>
* gst/librfb/gstrfbsrc.c: (gst_rfbsrc_get): Check return values
diff --git a/configure.ac b/configure.ac
index 7ca63562..5bcdce4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -855,6 +855,14 @@ GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [
AC_SUBST(CDAUDIO_LIBS)
])
+dnl *** cdio ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_CDIO, true)
+GST_CHECK_FEATURE(CDIO, [cdio library], cdio, [
+ PKG_CHECK_MODULES(CDIO, libcdio >= 0.71, HAVE_CDIO=yes, HAVE_CDIO=no)
+ AC_SUBST(CDIO_CFLAGS)
+ AC_SUBST(CDIO_LIBS)
+])
+
dnl *** CDParanoia ***
translit(dnm, m, l) AM_CONDITIONAL(USE_CDPARANOIA, true)
@@ -2053,6 +2061,7 @@ ext/audiofile/Makefile
ext/audioresample/Makefile
ext/cairo/Makefile
ext/cdaudio/Makefile
+ext/cdio/Makefile
ext/cdparanoia/Makefile
ext/dirac/Makefile
ext/directfb/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index d5a3e127..2c483ebc 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -58,6 +58,12 @@ else
CDAUDIO_DIR=
endif
+if USE_CDIO
+CDIO_DIR=cdio
+else
+CDIO_DIR=
+endif
+
if USE_CDPARANOIA
CDPARANOIA_DIR=cdparanoia
else
@@ -411,6 +417,7 @@ SUBDIRS=\
$(AUDIORESAMPLE_DIR) \
$(CAIRO_DIR) \
$(CDAUDIO_DIR) \
+ $(CDIO_DIR) \
$(CDPARANOIA_DIR) \
$(DIRAC_DIR) \
$(DIRECTFB_DIR) \
@@ -478,6 +485,7 @@ DIST_SUBDIRS=\
audioresample \
cairo \
cdaudio \
+ cdio \
cdparanoia \
dirac \
directfb \