mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-04 22:48:54 +00:00
Require libcdio >= 0.76.
Original commit message from CVS: * configure.ac: * ext/cdio/gstcdio.c: * ext/cdio/gstcdio.h: * ext/cdio/gstcdiocddasrc.c: (gst_cdio_cdda_src_open): Require libcdio >= 0.76.
This commit is contained in:
parent
e29dfee55c
commit
366458f79c
4 changed files with 3 additions and 28 deletions
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit 130fa8f739ff09aedb520c33239f53d06cfe9bd5
|
||||
Subproject commit 46ec7dfc1c09ff550ed6b7a4e0d3f2b2ac7d3ee8
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue