summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2009-01-07 10:50:15 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2009-01-07 10:50:15 +0000
commitba03cb6080297dc32b576968850a53b9046c3d69 (patch)
tree30334fda60444e08d7caa7bd3d5115f846026a9d
parentbe8729251419585f485c01e74c2999ded4ef3413 (diff)
gst-libs/gst/cdda/gstcddabasesrc.*: Make the GType of GstCDDABaseSrcMode public for bindings.
Original commit message from CVS: * gst-libs/gst/cdda/gstcddabasesrc.c: * gst-libs/gst/cdda/gstcddabasesrc.h: Make the GType of GstCDDABaseSrcMode public for bindings. Fixes bug #566837.
-rw-r--r--ChangeLog7
-rw-r--r--gst-libs/gst/cdda/gstcddabasesrc.c4
-rw-r--r--gst-libs/gst/cdda/gstcddabasesrc.h3
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 308bbaa7..0f81c46e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-07 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * gst-libs/gst/cdda/gstcddabasesrc.c:
+ * gst-libs/gst/cdda/gstcddabasesrc.h:
+ Make the GType of GstCDDABaseSrcMode public for bindings.
+ Fixes bug #566837.
+
2009-01-06 Tim-Philipp Müller <tim.muller at collabora co uk>
* configure.ac:
diff --git a/gst-libs/gst/cdda/gstcddabasesrc.c b/gst-libs/gst/cdda/gstcddabasesrc.c
index 910d83e5..0ee3afa9 100644
--- a/gst-libs/gst/cdda/gstcddabasesrc.c
+++ b/gst-libs/gst/cdda/gstcddabasesrc.c
@@ -104,8 +104,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_cdda_base_src_debug);
#define TIME_INTERVAL_FROM_SECTORS(sectors) ((SAMPLES_PER_SECTOR * sectors * GST_SECOND) / 44100)
#define SECTORS_FROM_TIME_INTERVAL(dtime) (dtime * 44100 / (SAMPLES_PER_SECTOR * GST_SECOND))
-#define GST_TYPE_CDDA_BASE_SRC_MODE (gst_cdda_base_src_mode_get_type ())
-
enum
{
ARG_0,
@@ -160,7 +158,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
static GstFormat track_format;
static GstFormat sector_format;
-static GType
+GType
gst_cdda_base_src_mode_get_type (void)
{
static GType mode_type; /* 0 */
diff --git a/gst-libs/gst/cdda/gstcddabasesrc.h b/gst-libs/gst/cdda/gstcddabasesrc.h
index 93f4a7c2..b4c6f8e1 100644
--- a/gst-libs/gst/cdda/gstcddabasesrc.h
+++ b/gst-libs/gst/cdda/gstcddabasesrc.h
@@ -54,6 +54,8 @@ typedef enum {
GST_CDDA_BASE_SRC_MODE_CONTINUOUS /* stream = whole disc */
} GstCddaBaseSrcMode;
+#define GST_TYPE_CDDA_BASE_SRC_MODE (gst_cdda_base_src_mode_get_type ())
+
/**
* GstCddaBaseSrcTrack:
* @is_audio: Whether this is an audio track
@@ -134,6 +136,7 @@ struct _GstCddaBaseSrcClass {
};
GType gst_cdda_base_src_get_type (void);
+GType gst_cdda_base_src_mode_get_type (void);
gboolean gst_cdda_base_src_add_track (GstCddaBaseSrc * src,
GstCddaBaseSrcTrack * track);