diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/cdio/gstcdio.c | 14 | ||||
| -rw-r--r-- | ext/cdio/gstcdio.h | 7 | ||||
| -rw-r--r-- | ext/cdio/gstcdiocddasrc.c | 8 |
6 files changed, 11 insertions, 28 deletions
@@ -1,3 +1,11 @@ +2008-06-07 Tim-Philipp Müller <tim.muller at collabora co uk> + + * configure.ac: + * ext/cdio/gstcdio.c: + * ext/cdio/gstcdio.h: + * ext/cdio/gstcdiocddasrc.c: (gst_cdio_cdda_src_open): + Require libcdio >= 0.76. + 2008-06-05 Thijs Vermeir <thijsvermeir@gmail.com> * gst/avi/gstavidemux.c: diff --git a/common b/common -Subproject 68fb019d4044b9878aef4ca223fc13c19ffc7d0 +Subproject 46ec7dfc1c09ff550ed6b7a4e0d3f2b2ac7d3ee diff --git a/configure.ac b/configure.ac index 13ffd8ec..dc4f065d 100644 --- a/configure.ac +++ b/configure.ac @@ -662,7 +662,7 @@ AG_GST_CHECK_FEATURE(CAIRO, [Cairo graphics rendering], cairo, [ dnl *** cdio *** translit(dnm, m, l) AM_CONDITIONAL(USE_CDIO, true) AG_GST_CHECK_FEATURE(CDIO, [cdio library], cdio, [ - AG_GST_PKG_CHECK_MODULES(CDIO, libcdio >= 0.71) + AG_GST_PKG_CHECK_MODULES(CDIO, libcdio >= 0.76) ]) dnl **** ESound **** diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c index 5c23a77b..1534bda3 100644 --- a/ext/cdio/gstcdio.c +++ b/ext/cdio/gstcdio.c @@ -29,8 +29,6 @@ GST_DEBUG_CATEGORY (gst_cdio_debug); -#if (LIBCDIO_VERSION_NUM >= 76) - void gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) @@ -76,18 +74,6 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) return tags; } -#else - -GstTagList * -gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) -{ - GST_DEBUG_OBJECT (src, "This libcdio version (%u) does not support " - "CDTEXT (want >= 76)", LIBCDIO_VERSION_NUM); - return NULL; -} - -#endif - static void gst_cdio_log_handler (cdio_log_level_t level, const char *msg) { diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h index 605ad10f..cbef7d93 100644 --- a/ext/cdio/gstcdio.h +++ b/ext/cdio/gstcdio.h @@ -23,22 +23,17 @@ #include <gst/gst.h> #include <cdio/cdio.h> +#include <cdio/cdtext.h> GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); #define GST_CAT_DEFAULT gst_cdio_debug -#if (LIBCDIO_VERSION_NUM >= 76) - -#include <cdio/cdtext.h> - void gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags); -#endif - GstTagList * gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track); diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c index 245240ec..d85e792d 100644 --- a/ext/cdio/gstcdiocddasrc.c +++ b/ext/cdio/gstcdiocddasrc.c @@ -245,14 +245,8 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device) if (num_tracks <= 0 || first_track < 0) return TRUE; /* base class will generate 'has no tracks' error */ - if (src->read_speed != -1) { -#if (LIBCDIO_VERSION_NUM >= 76) + if (src->read_speed != -1) cdio_set_speed (src->cdio, src->read_speed); -#else - GST_WARNING_OBJECT (src, "This libcdio version (%u) does not support " - "setting the drive reading speed (want >= 76)", LIBCDIO_VERSION_NUM); -#endif - } GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); |