mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/cdio/: Fix build for libcdio versions >= 76; give slightly lower rank than cdparanoia.

Browse source 
Original commit message from CVS:
* ext/cdio/gstcdio.c: (gst_cdio_add_cdtext_field), (plugin_init):
* ext/cdio/gstcdio.h:
* ext/cdio/gstcdiocddasrc.c: (gst_cdio_cdda_src_get_cdtext):
Fix build for libcdio versions >= 76; give slightly lower rank
than cdparanoia.
This commit is contained in:
Tim-Philipp Müller 2006-01-19 00:10:51 +00:00
parent 16333549fd
commit 82e24850a2
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/cdio/gstcdio.c
View file

@ -37,7 +37,7 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
{ {
const gchar *txt; const gchar *txt;
txt = cdtext_get_const (cdtext, field); txt = cdtext_get_const (field, cdtext);
if (txt == NULL || *txt == '\0') { if (txt == NULL || *txt == '\0') {
GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag);
return; return;
@ -73,7 +73,7 @@ gst_cdio_log_handler (cdio_log_level_t level, const char *msg)
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
if (!gst_element_register (plugin, "cdiocddasrc", GST_RANK_PRIMARY, if (!gst_element_register (plugin, "cdiocddasrc", GST_RANK_SECONDARY - 1,
GST_TYPE_CDIO_CDDA_SRC)) GST_TYPE_CDIO_CDDA_SRC))
return FALSE; return FALSE;

3
ext/cdio/gstcdio.h
View file

@ -21,7 +21,8 @@
#ifndef __GST_CDIO_H__ #ifndef __GST_CDIO_H__
#define __GST_CDIO_H__ #define __GST_CDIO_H__
#include <gst/gstinfo.h> #include <gst/gst.h>
#include <cdio/version.h>
GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);
#define GST_CAT_DEFAULT gst_cdio_debug #define GST_CAT_DEFAULT gst_cdio_debug

12
ext/cdio/gstcdiocddasrc.c
View file

@ -21,6 +21,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "gstcdio.h"
#include "gstcdiocddasrc.h" #include "gstcdiocddasrc.h"
#include <gst/gst.h> #include <gst/gst.h>
@ -161,8 +162,7 @@ static GstTagList *
gst_cdio_cdda_src_get_cdtext (GstCdioCddaSrc * src, track_t i_track) gst_cdio_cdda_src_get_cdtext (GstCdioCddaSrc * src, track_t i_track)
{ {
GstTagList *tags = NULL; GstTagList *tags = NULL;
const gchar *artist; GstObject *obj;
const gchar *title;
cdtext_t *t; cdtext_t *t;
t = cdio_get_cdtext (src->cdio, i_track); t = cdio_get_cdtext (src->cdio, i_track);
@ -171,11 +171,9 @@ gst_cdio_cdda_src_get_cdtext (GstCdioCddaSrc * src, track_t i_track)
return NULL; return NULL;
} }
gst_cdio_cdda_src_add_cdtext_field (src, t, CDTEXT_PERFOMER, obj = GST_OBJECT (src);
GST_TAG_ARTIST, &tags); gst_cdio_add_cdtext_field (obj, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags);
gst_cdio_add_cdtext_field (obj, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags);
gst_cdio_cdda_src_add_cdtext_field (src, t, CDTEXT_TITLE,
GST_TAG_TITLE, &tags);
return tags; return tags;
} }