summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/cdrom/gstcdplayer.c2
-rw-r--r--sys/dxr3/dxr3audiosink.c19
-rw-r--r--sys/dxr3/dxr3audiosink.h4
-rw-r--r--sys/dxr3/dxr3spusink.c17
-rw-r--r--sys/dxr3/dxr3spusink.h4
-rw-r--r--sys/dxr3/dxr3videosink.c17
-rw-r--r--sys/dxr3/dxr3videosink.h4
-rw-r--r--sys/glsink/glimagesink.c4
-rw-r--r--sys/qcam/gstqcamsrc.c8
-rw-r--r--sys/qcam/gstqcamsrc.h4
-rw-r--r--sys/v4l2/gstv4l2src.c2
-rw-r--r--sys/vcd/vcdsrc.c18
-rw-r--r--sys/vcd/vcdsrc.h4
13 files changed, 55 insertions, 52 deletions
diff --git a/sys/cdrom/gstcdplayer.c b/sys/cdrom/gstcdplayer.c
index b67362df..6d3bec03 100644
--- a/sys/cdrom/gstcdplayer.c
+++ b/sys/cdrom/gstcdplayer.c
@@ -160,7 +160,7 @@ cdplayer_init (CDPlayer * cdp)
cdp->paused = FALSE;
- GST_FLAG_SET (cdp, GST_BIN_FLAG_MANAGER);
+ GST_OBJECT_FLAG_SET (cdp, GST_BIN_FLAG_MANAGER);
return;
}
diff --git a/sys/dxr3/dxr3audiosink.c b/sys/dxr3/dxr3audiosink.c
index 2e7026f9..3ac65218 100644
--- a/sys/dxr3/dxr3audiosink.c
+++ b/sys/dxr3/dxr3audiosink.c
@@ -214,7 +214,7 @@ dxr3audiosink_init (Dxr3AudioSink * sink)
gst_pad_set_chain_function (sink->ac3_sinkpad, dxr3audiosink_chain_ac3);
gst_element_add_pad (GST_ELEMENT (sink), sink->ac3_sinkpad);
- GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
sink->card_number = 0;
@@ -285,7 +285,8 @@ dxr3audiosink_get_property (GObject * object, guint prop_id,
static gboolean
dxr3audiosink_open (Dxr3AudioSink * sink)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN),
+ FALSE);
/* Compute the name of the audio device file. */
sink->audio_filename = g_strdup_printf ("/dev/em8300_ma-%d",
@@ -311,7 +312,7 @@ dxr3audiosink_open (Dxr3AudioSink * sink)
return FALSE;
}
- GST_FLAG_SET (sink, DXR3AUDIOSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, DXR3AUDIOSINK_OPEN);
dxr3audiosink_set_mode_pcm (sink);
@@ -414,7 +415,7 @@ dxr3audiosink_set_mode_ac3 (Dxr3AudioSink * sink)
static void
dxr3audiosink_close (Dxr3AudioSink * sink)
{
- g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN));
if (close (sink->audio_fd) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
@@ -430,7 +431,7 @@ dxr3audiosink_close (Dxr3AudioSink * sink)
return;
}
- GST_FLAG_UNSET (sink, DXR3AUDIOSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, DXR3AUDIOSINK_OPEN);
g_free (sink->audio_filename);
sink->audio_filename = NULL;
@@ -543,7 +544,7 @@ dxr3audiosink_chain_pcm (GstPad * pad, GstData * _data)
dxr3audiosink_set_mode_pcm (sink);
}
- if (GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) {
if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) {
/* We have a new scr value. */
sink->scr = GSTTIME_TO_MPEGTIME (GST_BUFFER_TIMESTAMP (buf));
@@ -608,7 +609,7 @@ dxr3audiosink_chain_ac3 (GstPad * pad, GstData * _data)
dxr3audiosink_set_mode_ac3 (sink);
}
- if (GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) {
int event;
if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) {
@@ -709,11 +710,11 @@ dxr3audiosink_change_state (GstElement * element, GstStateChange transition)
GST_STATE_CHANGE_FAILURE);
if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
- if (GST_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
dxr3audiosink_close (DXR3AUDIOSINK (element));
}
} else {
- if (!GST_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
if (!dxr3audiosink_open (DXR3AUDIOSINK (element))) {
return GST_STATE_CHANGE_FAILURE;
}
diff --git a/sys/dxr3/dxr3audiosink.h b/sys/dxr3/dxr3audiosink.h
index 28bb34ec..787e20f7 100644
--- a/sys/dxr3/dxr3audiosink.h
+++ b/sys/dxr3/dxr3audiosink.h
@@ -46,8 +46,8 @@ typedef struct _Dxr3AudioSinkClass Dxr3AudioSinkClass;
typedef enum {
- DXR3AUDIOSINK_OPEN = GST_ELEMENT_FLAG_LAST,
- DXR3AUDIOSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ DXR3AUDIOSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
+ DXR3AUDIOSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} Dxr3AudioSinkFlags;
diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c
index badc2e41..59d965af 100644
--- a/sys/dxr3/dxr3spusink.c
+++ b/sys/dxr3/dxr3spusink.c
@@ -207,7 +207,7 @@ dxr3spusink_init (Dxr3SpuSink * sink)
gst_element_add_pad (GST_ELEMENT (sink), pad);
gst_pad_set_chain_function (pad, dxr3spusink_chain);
- GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
sink->card_number = 0;
@@ -256,7 +256,8 @@ dxr3spusink_get_property (GObject * object, guint prop_id,
static gboolean
dxr3spusink_open (Dxr3SpuSink * sink)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN),
+ FALSE);
/* Compute the name of the spu device file. */
sink->spu_filename = g_strdup_printf ("/dev/em8300_sp-%d", sink->card_number);
@@ -281,7 +282,7 @@ dxr3spusink_open (Dxr3SpuSink * sink)
return FALSE;
}
- GST_FLAG_SET (sink, DXR3SPUSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, DXR3SPUSINK_OPEN);
return TRUE;
}
@@ -290,7 +291,7 @@ dxr3spusink_open (Dxr3SpuSink * sink)
static void
dxr3spusink_close (Dxr3SpuSink * sink)
{
- g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN));
if (close (sink->spu_fd) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
@@ -306,7 +307,7 @@ dxr3spusink_close (Dxr3SpuSink * sink)
return;
}
- GST_FLAG_UNSET (sink, DXR3SPUSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, DXR3SPUSINK_OPEN);
free (sink->spu_filename);
sink->spu_filename = NULL;
@@ -377,7 +378,7 @@ dxr3spusink_chain (GstPad * pad, GstData * _data)
return;
}
- if (GST_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN)) {
/* If we have PTS information for the SPU unit, register it now.
The card needs the PTS to be written *before* the actual data. */
if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) {
@@ -405,7 +406,7 @@ dxr3spusink_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
- if (!GST_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
if (!dxr3spusink_open (DXR3SPUSINK (element))) {
return GST_STATE_CHANGE_FAILURE;
}
@@ -420,7 +421,7 @@ dxr3spusink_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PAUSED_TO_READY:
break;
case GST_STATE_CHANGE_READY_TO_NULL:
- if (GST_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
dxr3spusink_close (DXR3SPUSINK (element));
}
break;
diff --git a/sys/dxr3/dxr3spusink.h b/sys/dxr3/dxr3spusink.h
index e2551714..e1563ab6 100644
--- a/sys/dxr3/dxr3spusink.h
+++ b/sys/dxr3/dxr3spusink.h
@@ -44,8 +44,8 @@ typedef struct _Dxr3SpuSinkClass Dxr3SpuSinkClass;
typedef enum {
- DXR3SPUSINK_OPEN = GST_ELEMENT_FLAG_LAST,
- DXR3SPUSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ DXR3SPUSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
+ DXR3SPUSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} Dxr3SpuSinkFlags;
diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c
index c2222e85..0832ec56 100644
--- a/sys/dxr3/dxr3videosink.c
+++ b/sys/dxr3/dxr3videosink.c
@@ -204,7 +204,7 @@ dxr3videosink_init (Dxr3VideoSink * sink)
gst_element_add_pad (GST_ELEMENT (sink), pad);
gst_pad_set_chain_function (pad, dxr3videosink_chain);
- GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
sink->card_number = 0;
@@ -258,7 +258,8 @@ dxr3videosink_get_property (GObject * object, guint prop_id,
static gboolean
dxr3videosink_open (Dxr3VideoSink * sink)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN),
+ FALSE);
/* Compute the name of the video device file. */
sink->video_filename = g_strdup_printf ("/dev/em8300_mv-%d",
@@ -284,7 +285,7 @@ dxr3videosink_open (Dxr3VideoSink * sink)
return FALSE;
}
- GST_FLAG_SET (sink, DXR3VIDEOSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, DXR3VIDEOSINK_OPEN);
return TRUE;
}
@@ -293,7 +294,7 @@ dxr3videosink_open (Dxr3VideoSink * sink)
static void
dxr3videosink_close (Dxr3VideoSink * sink)
{
- g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN));
if (close (sink->video_fd) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
@@ -309,7 +310,7 @@ dxr3videosink_close (Dxr3VideoSink * sink)
return;
}
- GST_FLAG_UNSET (sink, DXR3VIDEOSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, DXR3VIDEOSINK_OPEN);
free (sink->video_filename);
sink->video_filename = NULL;
@@ -423,7 +424,7 @@ dxr3videosink_write_data (Dxr3VideoSink * sink, guint cut)
g_return_if_fail (sink->cur_buf != NULL);
- if (GST_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN)) {
if (sink->cur_ts != GST_CLOCK_TIME_NONE) {
guint pts;
@@ -642,7 +643,7 @@ dxr3videosink_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
- if (!GST_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
if (!dxr3videosink_open (DXR3VIDEOSINK (element))) {
return GST_STATE_CHANGE_FAILURE;
}
@@ -661,7 +662,7 @@ dxr3videosink_change_state (GstElement * element, GstStateChange transition)
dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_STOP);
break;
case GST_STATE_CHANGE_READY_TO_NULL:
- if (GST_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
dxr3videosink_close (DXR3VIDEOSINK (element));
}
break;
diff --git a/sys/dxr3/dxr3videosink.h b/sys/dxr3/dxr3videosink.h
index b0e5cadf..4af1de1b 100644
--- a/sys/dxr3/dxr3videosink.h
+++ b/sys/dxr3/dxr3videosink.h
@@ -44,8 +44,8 @@ typedef struct _Dxr3VideoSinkClass Dxr3VideoSinkClass;
typedef enum {
- DXR3VIDEOSINK_OPEN = GST_ELEMENT_FLAG_LAST,
- DXR3VIDEOSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ DXR3VIDEOSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
+ DXR3VIDEOSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} Dxr3VideoSinkFlags;
diff --git a/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c
index 01018b5e..d1a76015 100644
--- a/sys/glsink/glimagesink.c
+++ b/sys/glsink/glimagesink.c
@@ -1466,8 +1466,8 @@ gst_glimagesink_init (GstGLImageSink * glimagesink)
glimagesink->synchronous = FALSE;
glimagesink->signal_handoffs = FALSE;
- GST_FLAG_SET (glimagesink, GST_ELEMENT_THREAD_SUGGESTED);
- GST_FLAG_SET (glimagesink, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (glimagesink, GST_ELEMENT_THREAD_SUGGESTED);
+ GST_OBJECT_FLAG_SET (glimagesink, GST_ELEMENT_EVENT_AWARE);
}
static void
diff --git a/sys/qcam/gstqcamsrc.c b/sys/qcam/gstqcamsrc.c
index e34a589e..901beca5 100644
--- a/sys/qcam/gstqcamsrc.c
+++ b/sys/qcam/gstqcamsrc.c
@@ -389,11 +389,11 @@ gst_qcamsrc_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL:
- if (GST_FLAG_IS_SET (element, GST_QCAMSRC_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (element, GST_QCAMSRC_OPEN))
gst_qcamsrc_close (GST_QCAMSRC (element));
break;
case GST_STATE_CHANGE_NULL_TO_READY:
- if (!GST_FLAG_IS_SET (element, GST_QCAMSRC_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, GST_QCAMSRC_OPEN)) {
GST_DEBUG ("opening");
if (!gst_qcamsrc_open (GST_QCAMSRC (element))) {
GST_DEBUG ("open failed");
@@ -420,7 +420,7 @@ gst_qcamsrc_open (GstQCamSrc * qcamsrc)
return FALSE;
}
- GST_FLAG_SET (qcamsrc, GST_QCAMSRC_OPEN);
+ GST_OBJECT_FLAG_SET (qcamsrc, GST_QCAMSRC_OPEN);
return TRUE;
}
@@ -429,7 +429,7 @@ static void
gst_qcamsrc_close (GstQCamSrc * src)
{
qc_close (src->qcam);
- GST_FLAG_UNSET (src, GST_QCAMSRC_OPEN);
+ GST_OBJECT_FLAG_UNSET (src, GST_QCAMSRC_OPEN);
}
static gboolean
diff --git a/sys/qcam/gstqcamsrc.h b/sys/qcam/gstqcamsrc.h
index 0bd201c8..a1873f23 100644
--- a/sys/qcam/gstqcamsrc.h
+++ b/sys/qcam/gstqcamsrc.h
@@ -45,9 +45,9 @@ extern "C" {
/* NOTE: per-element flags start with 16 for now */
typedef enum {
- GST_QCAMSRC_OPEN = GST_ELEMENT_FLAG_LAST,
+ GST_QCAMSRC_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
- GST_QCAMSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2,
+ GST_QCAMSRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstQCamSrcFlags;
typedef struct _GstQCamSrc GstQCamSrc;
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index b273781d..7d0e16a2 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -230,7 +230,7 @@ gst_v4l2src_init (GTypeInstance * instance, gpointer g_class)
{
GstV4l2Src *v4l2src = GST_V4L2SRC (instance);
- GST_FLAG_SET (GST_ELEMENT (v4l2src), GST_ELEMENT_THREAD_SUGGESTED);
+ GST_OBJECT_FLAG_SET (GST_ELEMENT (v4l2src), GST_ELEMENT_THREAD_SUGGESTED);
v4l2src->srcpad =
gst_pad_new_from_template (gst_element_class_get_pad_template
diff --git a/sys/vcd/vcdsrc.c b/sys/vcd/vcdsrc.c
index a6f06b88..107dbb51 100644
--- a/sys/vcd/vcdsrc.c
+++ b/sys/vcd/vcdsrc.c
@@ -219,7 +219,7 @@ gst_vcdsrc_set_property (GObject * object, guint prop_id, const GValue * value,
case ARG_DEVICE:
case ARG_LOCATION:
/* the element must be stopped in order to do this */
-/* g_return_if_fail(!GST_FLAG_IS_SET(src,GST_STATE_RUNNING)); */
+/* g_return_if_fail(!GST_OBJECT_FLAG_IS_SET(src,GST_STATE_RUNNING)); */
g_free (src->device);
/* clear the filename if we get a NULL (is that possible?) */
@@ -411,7 +411,7 @@ gst_vcdsrc_get (GstPad * pad)
g_return_val_if_fail (GST_IS_PAD (pad), NULL);
vcdsrc = GST_VCDSRC (GST_OBJECT_PARENT (pad));
- g_return_val_if_fail (GST_FLAG_IS_SET (vcdsrc, VCDSRC_OPEN), NULL);
+ g_return_val_if_fail (GST_OBJECT_FLAG_IS_SET (vcdsrc, VCDSRC_OPEN), NULL);
offset = vcdsrc->trackoffset + vcdsrc->curoffset;
if (offset >= gst_vcdsrc_msf (vcdsrc, vcdsrc->track + 1)) {
@@ -484,7 +484,7 @@ gst_vcdsrc_open_file (GstVCDSrc * src)
{
int i;
- g_return_val_if_fail (!GST_FLAG_IS_SET (src, VCDSRC_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (src, VCDSRC_OPEN), FALSE);
/* open the device */
src->fd = open (src->device, O_RDONLY);
@@ -520,7 +520,7 @@ gst_vcdsrc_open_file (GstVCDSrc * src)
src->tracks[i].cdte_addr.msf.frame);
}
- GST_FLAG_SET (src, VCDSRC_OPEN);
+ GST_OBJECT_FLAG_SET (src, VCDSRC_OPEN);
gst_vcdsrc_recalculate (src);
return TRUE;
@@ -530,7 +530,7 @@ gst_vcdsrc_open_file (GstVCDSrc * src)
static void
gst_vcdsrc_close_file (GstVCDSrc * src)
{
- g_return_if_fail (GST_FLAG_IS_SET (src, VCDSRC_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (src, VCDSRC_OPEN));
/* close the file */
close (src->fd);
@@ -542,7 +542,7 @@ gst_vcdsrc_close_file (GstVCDSrc * src)
g_free (src->tracks);
- GST_FLAG_UNSET (src, VCDSRC_OPEN);
+ GST_OBJECT_FLAG_UNSET (src, VCDSRC_OPEN);
}
static GstStateChangeReturn
@@ -552,7 +552,7 @@ gst_vcdsrc_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL:
- if (GST_FLAG_IS_SET (element, VCDSRC_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (element, VCDSRC_OPEN))
gst_vcdsrc_close_file (vcdsrc);
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
@@ -560,7 +560,7 @@ gst_vcdsrc_change_state (GstElement * element, GstStateChange transition)
vcdsrc->discont = vcdsrc->flush = FALSE;
break;
case GST_STATE_CHANGE_NULL_TO_READY:
- if (!GST_FLAG_IS_SET (element, VCDSRC_OPEN))
+ if (!GST_OBJECT_FLAG_IS_SET (element, VCDSRC_OPEN))
if (!gst_vcdsrc_open_file (vcdsrc))
return GST_STATE_CHANGE_FAILURE;
break;
@@ -585,7 +585,7 @@ gst_vcdsrc_msf (GstVCDSrc * vcdsrc, gint track)
static void
gst_vcdsrc_recalculate (GstVCDSrc * vcdsrc)
{
- if (GST_FLAG_IS_SET (vcdsrc, VCDSRC_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (vcdsrc, VCDSRC_OPEN)) {
/* calculate track offset (beginning of track) */
vcdsrc->trackoffset = gst_vcdsrc_msf (vcdsrc, vcdsrc->track);
GST_DEBUG ("track offset is %ld", vcdsrc->trackoffset);
diff --git a/sys/vcd/vcdsrc.h b/sys/vcd/vcdsrc.h
index 2ab0e49b..0c349846 100644
--- a/sys/vcd/vcdsrc.h
+++ b/sys/vcd/vcdsrc.h
@@ -41,9 +41,9 @@ G_BEGIN_DECLS
/* NOTE: per-element flags start with 16 for now */
typedef enum {
- VCDSRC_OPEN = GST_ELEMENT_FLAG_LAST,
+ VCDSRC_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
- VCDSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2,
+ VCDSRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstVCDSrcFlags;
typedef struct _GstVCDSrc GstVCDSrc;
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 17:29:33 +0000