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

cdparanoia: update for GstCddaBaseSrc -> GstAudioCdSrc renaming

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-09-24 19:35:40 +01:00
parent dfc13ec632
commit 83a1e31786
3 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/cdparanoia/Makefile.am
View file

@ -7,7 +7,7 @@ libgstcdparanoia_la_CFLAGS = \
$(GST_CFLAGS) \ $(GST_CFLAGS) \
$(CDPARANOIA_CFLAGS) $(CDPARANOIA_CFLAGS)
libgstcdparanoia_la_LIBADD = \ libgstcdparanoia_la_LIBADD = \
$(top_builddir)/gst-libs/gst/cdda/libgstcdda-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_MAJORMINOR).la \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(CDPARANOIA_LIBS) $(CDPARANOIA_LIBS)

32
ext/cdparanoia/gstcdparanoiasrc.c
View file

@ -57,18 +57,18 @@ GST_DEBUG_CATEGORY_STATIC (gst_cd_paranoia_src_debug);
#define GST_CAT_DEFAULT gst_cd_paranoia_src_debug #define GST_CAT_DEFAULT gst_cd_paranoia_src_debug
#define gst_cd_paranoia_src_parent_class parent_class #define gst_cd_paranoia_src_parent_class parent_class
G_DEFINE_TYPE (GstCdParanoiaSrc, gst_cd_paranoia_src, GST_TYPE_CDDA_BASE_SRC); G_DEFINE_TYPE (GstCdParanoiaSrc, gst_cd_paranoia_src, GST_TYPE_AUDIO_CD_SRC);
static void gst_cd_paranoia_src_finalize (GObject * obj); static void gst_cd_paranoia_src_finalize (GObject * obj);
static void gst_cd_paranoia_src_get_property (GObject * object, guint prop_id, static void gst_cd_paranoia_src_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static void gst_cd_paranoia_src_set_property (GObject * object, guint prop_id, static void gst_cd_paranoia_src_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static GstBuffer *gst_cd_paranoia_src_read_sector (GstCddaBaseSrc * src, static GstBuffer *gst_cd_paranoia_src_read_sector (GstAudioCdSrc * src,
gint sector); gint sector);
static gboolean gst_cd_paranoia_src_open (GstCddaBaseSrc * src, static gboolean gst_cd_paranoia_src_open (GstAudioCdSrc * src,
const gchar * device); const gchar * device);
static void gst_cd_paranoia_src_close (GstCddaBaseSrc * src); static void gst_cd_paranoia_src_close (GstAudioCdSrc * src);
/* We use these to serialize calls to paranoia_read() among several /* We use these to serialize calls to paranoia_read() among several
* cdparanoiasrc instances. We do this because it's the only reasonably * cdparanoiasrc instances. We do this because it's the only reasonably
@ -119,7 +119,7 @@ gst_cd_paranoia_src_init (GstCdParanoiaSrc * src)
static void static void
gst_cd_paranoia_src_class_init (GstCdParanoiaSrcClass * klass) gst_cd_paranoia_src_class_init (GstCdParanoiaSrcClass * klass)
{ {
GstCddaBaseSrcClass *cddabasesrc_class = GST_CDDA_BASE_SRC_CLASS (klass); GstAudioCdSrcClass *audiocdsrc_class = GST_AUDIO_CD_SRC_CLASS (klass);
GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@ -132,9 +132,9 @@ gst_cd_paranoia_src_class_init (GstCdParanoiaSrcClass * klass)
"Read audio from CD in paranoid mode", "Read audio from CD in paranoid mode",
"Erik Walthinsen <omega@cse.ogi.edu>, Wim Taymans <wim@fluendo.com>"); "Erik Walthinsen <omega@cse.ogi.edu>, Wim Taymans <wim@fluendo.com>");
cddabasesrc_class->open = gst_cd_paranoia_src_open; audiocdsrc_class->open = gst_cd_paranoia_src_open;
cddabasesrc_class->close = gst_cd_paranoia_src_close; audiocdsrc_class->close = gst_cd_paranoia_src_close;
cddabasesrc_class->read_sector = gst_cd_paranoia_src_read_sector; audiocdsrc_class->read_sector = gst_cd_paranoia_src_read_sector;
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_GENERIC_DEVICE, g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_GENERIC_DEVICE,
g_param_spec_string ("generic-device", "Generic device", g_param_spec_string ("generic-device", "Generic device",
@ -197,9 +197,9 @@ gst_cd_paranoia_src_class_init (GstCdParanoiaSrcClass * klass)
} }
static gboolean static gboolean
gst_cd_paranoia_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device) gst_cd_paranoia_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
{ {
GstCdParanoiaSrc *src = GST_CD_PARANOIA_SRC (cddabasesrc); GstCdParanoiaSrc *src = GST_CD_PARANOIA_SRC (audiocdsrc);
gint i, cache_size; gint i, cache_size;
GST_DEBUG_OBJECT (src, "trying to open device %s (generic-device=%s) ...", GST_DEBUG_OBJECT (src, "trying to open device %s (generic-device=%s) ...",
@ -232,7 +232,7 @@ gst_cd_paranoia_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device)
} }
for (i = 1; i < src->d->tracks + 1; i++) { for (i = 1; i < src->d->tracks + 1; i++) {
GstCddaBaseSrcTrack track = { 0, }; GstAudioCdSrcTrack track = { 0, };
track.num = i; track.num = i;
track.is_audio = IS_AUDIO (src->d, i - 1); track.is_audio = IS_AUDIO (src->d, i - 1);
@ -240,7 +240,7 @@ gst_cd_paranoia_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device)
track.end = cdda_track_lastsector (src->d, i); track.end = cdda_track_lastsector (src->d, i);
track.tags = NULL; track.tags = NULL;
gst_cdda_base_src_add_track (GST_CDDA_BASE_SRC (src), &track); gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track);
} }
/* create the paranoia struct and set it up */ /* create the paranoia struct and set it up */
@ -295,9 +295,9 @@ init_failed:
} }
static void static void
gst_cd_paranoia_src_close (GstCddaBaseSrc * cddabasesrc) gst_cd_paranoia_src_close (GstAudioCdSrc * audiocdsrc)
{ {
GstCdParanoiaSrc *src = GST_CD_PARANOIA_SRC (cddabasesrc); GstCdParanoiaSrc *src = GST_CD_PARANOIA_SRC (audiocdsrc);
if (src->p) { if (src->p) {
paranoia_free (src->p); paranoia_free (src->p);
@ -345,9 +345,9 @@ gst_cd_paranoia_src_signal_is_being_watched (GstCdParanoiaSrc * src, gint sig)
} }
static GstBuffer * static GstBuffer *
gst_cd_paranoia_src_read_sector (GstCddaBaseSrc * cddabasesrc, gint sector) gst_cd_paranoia_src_read_sector (GstAudioCdSrc * audiocdsrc, gint sector)
{ {
GstCdParanoiaSrc *src = GST_CD_PARANOIA_SRC (cddabasesrc); GstCdParanoiaSrc *src = GST_CD_PARANOIA_SRC (audiocdsrc);
GstBuffer *buf; GstBuffer *buf;
gboolean do_serialize; gboolean do_serialize;
gint16 *cdda_buf; gint16 *cdda_buf;

10
ext/cdparanoia/gstcdparanoiasrc.h
View file

@ -20,7 +20,7 @@
#ifndef __GST_CD_PARANOIA_SRC_H__ #ifndef __GST_CD_PARANOIA_SRC_H__
#define __GST_CD_PARANOIA_SRC_H__ #define __GST_CD_PARANOIA_SRC_H__
#include "gst/cdda/gstcddabasesrc.h" #include <gst/audio/gstaudiocdsrc.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -57,7 +57,7 @@ typedef struct _GstCdParanoiaSrcClass GstCdParanoiaSrcClass;
* The cdparanoia object structure. * The cdparanoia object structure.
*/ */
struct _GstCdParanoiaSrc { struct _GstCdParanoiaSrc {
GstCddaBaseSrc cddabasesrc; GstAudioCdSrc audiocdsrc;
/*< private >*/ /*< private >*/
cdrom_drive *d; cdrom_drive *d;
@ -75,12 +75,12 @@ struct _GstCdParanoiaSrc {
}; };
struct _GstCdParanoiaSrcClass { struct _GstCdParanoiaSrcClass {
GstCddaBaseSrcClass parent_class; GstAudioCdSrcClass parent_class;
/* signal callbacks */ /* signal callbacks */
/** /**
* GstCdParanoiaSrcClass::transport-error: * GstCdParanoiaSrcClass::transport-error:
* @src: the GstCddaBaseSrc source element object * @src: the GstAudioCdSrc source element object
* @sector: the sector at which the error happened * @sector: the sector at which the error happened
* *
* This signal is emitted when a sector could not be read * This signal is emitted when a sector could not be read
@ -89,7 +89,7 @@ struct _GstCdParanoiaSrcClass {
void (*transport_error) (GstCdParanoiaSrc * src, gint sector); void (*transport_error) (GstCdParanoiaSrc * src, gint sector);
/** /**
* GstCdParanoiaSrcClass::uncorrected-error: * GstCdParanoiaSrcClass::uncorrected-error:
* @src: the GstCddaBaseSrc source element object * @src: the GstAudioCdSrc source element object
* @sector: the sector at which the error happened * @sector: the sector at which the error happened
* *
* This signal is emitted when a sector could not be read * This signal is emitted when a sector could not be read