renamed GST_FLAGS macros to GST_OBJECT_FLAGS moved bitshift from macro to enum definition
Original commit message from CVS:
* examples/indexing/indexmpeg.c: (main):
* ext/artsd/gstartsdsink.c: (gst_artsdsink_open_audio),
(gst_artsdsink_close_audio), (gst_artsdsink_change_state):
* ext/artsd/gstartsdsink.h:
* ext/audiofile/gstafparse.c: (gst_afparse_open_file),
(gst_afparse_close_file):
* ext/audiofile/gstafparse.h:
* ext/audiofile/gstafsink.c: (gst_afsink_open_file),
(gst_afsink_close_file), (gst_afsink_chain),
(gst_afsink_change_state):
* ext/audiofile/gstafsink.h:
* ext/audiofile/gstafsrc.c: (gst_afsrc_open_file),
(gst_afsrc_close_file), (gst_afsrc_change_state):
* ext/audiofile/gstafsrc.h:
* ext/cdaudio/gstcdaudio.c: (gst_cdaudio_init):
* ext/directfb/directfbvideosink.c: (gst_directfbvideosink_init):
* ext/dts/gstdtsdec.c: (gst_dtsdec_init):
* ext/jack/gstjack.h:
* ext/jack/gstjackbin.c: (gst_jack_bin_init),
(gst_jack_bin_change_state):
* ext/musepack/gstmusepackdec.c: (gst_musepackdec_init):
* ext/musicbrainz/gsttrm.c: (gst_musicbrainz_init):
* ext/nas/nassink.c: (gst_nassink_open_audio),
(gst_nassink_close_audio), (gst_nassink_change_state):
* ext/nas/nassink.h:
* ext/polyp/polypsink.c: (gst_polypsink_init):
* ext/sdl/sdlvideosink.c: (gst_sdlvideosink_change_state):
* ext/sdl/sdlvideosink.h:
* ext/smoothwave/gstsmoothwave.c: (gst_smoothwave_init):
* ext/sndfile/gstsf.c: (gst_sf_set_property),
(gst_sf_change_state), (gst_sf_release_request_pad),
(gst_sf_open_file), (gst_sf_close_file), (gst_sf_loop):
* ext/sndfile/gstsf.h:
* ext/swfdec/gstswfdec.c: (gst_swfdec_init):
* ext/tarkin/gsttarkindec.c: (gst_tarkindec_init):
* gst/apetag/apedemux.c: (gst_ape_demux_init):
* gst/cdxaparse/gstcdxaparse.c: (gst_cdxaparse_init):
* gst/cdxaparse/gstcdxastrip.c: (gst_cdxastrip_init):
* gst/festival/gstfestival.c: (gst_festival_change_state):
* gst/festival/gstfestival.h:
* gst/mpeg2sub/gstmpeg2subt.c: (gst_mpeg2subt_init):
* gst/multifilesink/gstmultifilesink.c: (gst_multifilesink_init),
(gst_multifilesink_set_location), (gst_multifilesink_open_file),
(gst_multifilesink_close_file), (gst_multifilesink_next_file),
(gst_multifilesink_pad_query), (gst_multifilesink_handle_event),
(gst_multifilesink_chain), (gst_multifilesink_change_state):
* gst/multifilesink/gstmultifilesink.h:
* gst/videodrop/gstvideodrop.c: (gst_videodrop_init):
* sys/cdrom/gstcdplayer.c: (cdplayer_init):
* sys/dxr3/dxr3audiosink.c: (dxr3audiosink_init),
(dxr3audiosink_open), (dxr3audiosink_close),
(dxr3audiosink_chain_pcm), (dxr3audiosink_chain_ac3),
(dxr3audiosink_change_state):
* sys/dxr3/dxr3audiosink.h:
* sys/dxr3/dxr3spusink.c: (dxr3spusink_init), (dxr3spusink_open),
(dxr3spusink_close), (dxr3spusink_chain),
(dxr3spusink_change_state):
* sys/dxr3/dxr3spusink.h:
* sys/dxr3/dxr3videosink.c: (dxr3videosink_init),
(dxr3videosink_open), (dxr3videosink_close),
(dxr3videosink_write_data), (dxr3videosink_change_state):
* sys/dxr3/dxr3videosink.h:
* sys/glsink/glimagesink.c: (gst_glimagesink_init):
* sys/qcam/gstqcamsrc.c: (gst_qcamsrc_change_state),
(gst_qcamsrc_open), (gst_qcamsrc_close):
* sys/qcam/gstqcamsrc.h:
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_init):
* sys/vcd/vcdsrc.c: (gst_vcdsrc_set_property), (gst_vcdsrc_get),
(gst_vcdsrc_open_file), (gst_vcdsrc_close_file),
(gst_vcdsrc_change_state), (gst_vcdsrc_recalculate):
* sys/vcd/vcdsrc.h:
renamed GST_FLAGS macros to GST_OBJECT_FLAGS
moved bitshift from macro to enum definition
diff --git a/ChangeLog b/ChangeLog
index f62c583..9a2846b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+2005-10-12 Stefan Kost <ensonic@users.sf.net>
+
+ * examples/indexing/indexmpeg.c: (main):
+ * ext/artsd/gstartsdsink.c: (gst_artsdsink_open_audio),
+ (gst_artsdsink_close_audio), (gst_artsdsink_change_state):
+ * ext/artsd/gstartsdsink.h:
+ * ext/audiofile/gstafparse.c: (gst_afparse_open_file),
+ (gst_afparse_close_file):
+ * ext/audiofile/gstafparse.h:
+ * ext/audiofile/gstafsink.c: (gst_afsink_open_file),
+ (gst_afsink_close_file), (gst_afsink_chain),
+ (gst_afsink_change_state):
+ * ext/audiofile/gstafsink.h:
+ * ext/audiofile/gstafsrc.c: (gst_afsrc_open_file),
+ (gst_afsrc_close_file), (gst_afsrc_change_state):
+ * ext/audiofile/gstafsrc.h:
+ * ext/cdaudio/gstcdaudio.c: (gst_cdaudio_init):
+ * ext/directfb/directfbvideosink.c: (gst_directfbvideosink_init):
+ * ext/dts/gstdtsdec.c: (gst_dtsdec_init):
+ * ext/jack/gstjack.h:
+ * ext/jack/gstjackbin.c: (gst_jack_bin_init),
+ (gst_jack_bin_change_state):
+ * ext/musepack/gstmusepackdec.c: (gst_musepackdec_init):
+ * ext/musicbrainz/gsttrm.c: (gst_musicbrainz_init):
+ * ext/nas/nassink.c: (gst_nassink_open_audio),
+ (gst_nassink_close_audio), (gst_nassink_change_state):
+ * ext/nas/nassink.h:
+ * ext/polyp/polypsink.c: (gst_polypsink_init):
+ * ext/sdl/sdlvideosink.c: (gst_sdlvideosink_change_state):
+ * ext/sdl/sdlvideosink.h:
+ * ext/smoothwave/gstsmoothwave.c: (gst_smoothwave_init):
+ * ext/sndfile/gstsf.c: (gst_sf_set_property),
+ (gst_sf_change_state), (gst_sf_release_request_pad),
+ (gst_sf_open_file), (gst_sf_close_file), (gst_sf_loop):
+ * ext/sndfile/gstsf.h:
+ * ext/swfdec/gstswfdec.c: (gst_swfdec_init):
+ * ext/tarkin/gsttarkindec.c: (gst_tarkindec_init):
+ * gst/apetag/apedemux.c: (gst_ape_demux_init):
+ * gst/cdxaparse/gstcdxaparse.c: (gst_cdxaparse_init):
+ * gst/cdxaparse/gstcdxastrip.c: (gst_cdxastrip_init):
+ * gst/festival/gstfestival.c: (gst_festival_change_state):
+ * gst/festival/gstfestival.h:
+ * gst/mpeg2sub/gstmpeg2subt.c: (gst_mpeg2subt_init):
+ * gst/multifilesink/gstmultifilesink.c: (gst_multifilesink_init),
+ (gst_multifilesink_set_location), (gst_multifilesink_open_file),
+ (gst_multifilesink_close_file), (gst_multifilesink_next_file),
+ (gst_multifilesink_pad_query), (gst_multifilesink_handle_event),
+ (gst_multifilesink_chain), (gst_multifilesink_change_state):
+ * gst/multifilesink/gstmultifilesink.h:
+ * gst/videodrop/gstvideodrop.c: (gst_videodrop_init):
+ * sys/cdrom/gstcdplayer.c: (cdplayer_init):
+ * sys/dxr3/dxr3audiosink.c: (dxr3audiosink_init),
+ (dxr3audiosink_open), (dxr3audiosink_close),
+ (dxr3audiosink_chain_pcm), (dxr3audiosink_chain_ac3),
+ (dxr3audiosink_change_state):
+ * sys/dxr3/dxr3audiosink.h:
+ * sys/dxr3/dxr3spusink.c: (dxr3spusink_init), (dxr3spusink_open),
+ (dxr3spusink_close), (dxr3spusink_chain),
+ (dxr3spusink_change_state):
+ * sys/dxr3/dxr3spusink.h:
+ * sys/dxr3/dxr3videosink.c: (dxr3videosink_init),
+ (dxr3videosink_open), (dxr3videosink_close),
+ (dxr3videosink_write_data), (dxr3videosink_change_state):
+ * sys/dxr3/dxr3videosink.h:
+ * sys/glsink/glimagesink.c: (gst_glimagesink_init):
+ * sys/qcam/gstqcamsrc.c: (gst_qcamsrc_change_state),
+ (gst_qcamsrc_open), (gst_qcamsrc_close):
+ * sys/qcam/gstqcamsrc.h:
+ * sys/v4l2/gstv4l2src.c: (gst_v4l2src_init):
+ * sys/vcd/vcdsrc.c: (gst_vcdsrc_set_property), (gst_vcdsrc_get),
+ (gst_vcdsrc_open_file), (gst_vcdsrc_close_file),
+ (gst_vcdsrc_change_state), (gst_vcdsrc_recalculate):
+ * sys/vcd/vcdsrc.h:
+ renamed GST_FLAGS macros to GST_OBJECT_FLAGS
+ moved bitshift from macro to enum definition
+
2005-10-12 Josef Zlomek <josef dot zlomek at xeris dot cz>
Reviewed by: Tim-Philipp Müller <tim at centricular dot net>
diff --git a/examples/indexing/indexmpeg.c b/examples/indexing/indexmpeg.c
index 3b690af..a670ad8 100644
--- a/examples/indexing/indexmpeg.c
+++ b/examples/indexing/indexmpeg.c
@@ -272,7 +272,7 @@
gst_element_set_state (pipeline, GST_STATE_PAUSED);
if (index)
- GST_FLAG_UNSET (index, GST_INDEX_WRITABLE);
+ GST_OBJECT_FLAG_UNSET (index, GST_INDEX_WRITABLE);
src = gst_bin_get_by_name (GST_BIN (pipeline), "video_decoder");
diff --git a/ext/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c
index f3a06c6..5dcade2 100644
--- a/ext/artsd/gstartsdsink.c
+++ b/ext/artsd/gstartsdsink.c
@@ -304,7 +304,7 @@
/* FIXME: check connection */
/* GST_DEBUG ("artsdsink: can't open connection to aRtsd server"); */
- GST_FLAG_SET (sink, GST_ARTSDSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, GST_ARTSDSINK_OPEN);
sink->connected = TRUE;
return TRUE;
@@ -318,7 +318,7 @@
arts_close_stream (sink->stream);
arts_free ();
- GST_FLAG_UNSET (sink, GST_ARTSDSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, GST_ARTSDSINK_OPEN);
sink->connected = FALSE;
g_print ("artsdsink: closed connection\n");
@@ -331,11 +331,11 @@
/* if going down into NULL state, close the stream if it's open */
if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
- if (GST_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN))
gst_artsdsink_close_audio (GST_ARTSDSINK (element));
/* otherwise (READY or higher) we need to open the stream */
} else {
- if (!GST_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN)) {
if (!gst_artsdsink_open_audio (GST_ARTSDSINK (element)))
return GST_STATE_CHANGE_FAILURE;
}
diff --git a/ext/artsd/gstartsdsink.h b/ext/artsd/gstartsdsink.h
index 6cece27..64b3a2a 100644
--- a/ext/artsd/gstartsdsink.h
+++ b/ext/artsd/gstartsdsink.h
@@ -41,8 +41,8 @@
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ARTSDSINK))
typedef enum {
- GST_ARTSDSINK_OPEN = GST_ELEMENT_FLAG_LAST,
- GST_ARTSDSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2,
+ GST_ARTSDSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0)
+ GST_ARTSDSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstArtsdSinkFlags;
typedef struct _GstArtsdsink GstArtsdsink;
diff --git a/ext/audiofile/gstafparse.c b/ext/audiofile/gstafparse.c
index b576e81..35b5b49 100644
--- a/ext/audiofile/gstafparse.c
+++ b/ext/audiofile/gstafparse.c
@@ -342,7 +342,8 @@
static gboolean
gst_afparse_open_file (GstAFParse * afparse)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN),
+ FALSE);
/* open the file */
@@ -391,7 +392,7 @@
"rate", G_TYPE_INT, afparse->rate,
"channels", G_TYPE_INT, afparse->channels, NULL));
- GST_FLAG_SET (afparse, GST_AFPARSE_OPEN);
+ GST_OBJECT_FLAG_SET (afparse, GST_AFPARSE_OPEN);
return TRUE;
}
@@ -399,11 +400,11 @@
static void
gst_afparse_close_file (GstAFParse * afparse)
{
- g_return_if_fail (GST_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN));
if (afCloseFile (afparse->file) != 0) {
g_warning ("afparse: oops, error closing !\n");
} else {
- GST_FLAG_UNSET (afparse, GST_AFPARSE_OPEN);
+ GST_OBJECT_FLAG_UNSET (afparse, GST_AFPARSE_OPEN);
}
}
diff --git a/ext/audiofile/gstafparse.h b/ext/audiofile/gstafparse.h
index 0f636dc..43f64f4 100644
--- a/ext/audiofile/gstafparse.h
+++ b/ext/audiofile/gstafparse.h
@@ -54,9 +54,9 @@
typedef struct _GstAFParseClass GstAFParseClass;
typedef enum {
- GST_AFPARSE_OPEN = GST_ELEMENT_FLAG_LAST,
+ GST_AFPARSE_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
- GST_AFPARSE_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ GST_AFPARSE_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstAFParseFlags;
struct _GstAFParse {
diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c
index ea331bc..b513a19 100644
--- a/ext/audiofile/gstafsink.c
+++ b/ext/audiofile/gstafsink.c
@@ -292,7 +292,7 @@
int sample_format; /* audiofile's sample format, look in audiofile.h */
int byte_order = 0; /* audiofile's byte order defines */
- g_return_val_if_fail (!GST_FLAG_IS_SET (sink, GST_AFSINK_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, GST_AFSINK_OPEN), FALSE);
/* get the audio parameters */
g_return_val_if_fail (GST_IS_PAD (sink->sinkpad), FALSE);
@@ -348,7 +348,7 @@
afFreeFileSetup (outfilesetup);
/* afSetVirtualByteOrder (sink->file, AF_DEFAULT_TRACK, byte_order); */
- GST_FLAG_SET (sink, GST_AFSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, GST_AFSINK_OPEN);
return TRUE;
}
@@ -357,14 +357,14 @@
gst_afsink_close_file (GstAFSink * sink)
{
/* g_print ("DEBUG: closing sinkfile...\n"); */
- g_return_if_fail (GST_FLAG_IS_SET (sink, GST_AFSINK_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, GST_AFSINK_OPEN));
/* g_print ("DEBUG: past flag test\n"); */
/* if (fclose (sink->file) != 0) */
if (afCloseFile (sink->file) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
(_("Error closing file \"%s\"."), sink->filename), GST_ERROR_SYSTEM);
} else {
- GST_FLAG_UNSET (sink, GST_AFSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, GST_AFSINK_OPEN);
}
}
@@ -393,7 +393,7 @@
buf = GST_BUFFER (_data);
afsink = GST_AFSINK (gst_pad_get_parent (pad));
/* we use audiofile now
- if (GST_FLAG_IS_SET (afsink, GST_AFSINK_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (afsink, GST_AFSINK_OPEN))
{
bytes_written = fwrite (GST_BUFFER_DATA (buf), 1, GST_BUFFER_SIZE (buf), afsink->file);
if (bytes_written < GST_BUFFER_SIZE (buf))
@@ -404,14 +404,14 @@
}
*/
- if (!GST_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) {
/* it's not open yet, open it */
if (!gst_afsink_open_file (afsink))
g_print ("WARNING: gstafsink: can't open file !\n");
/* return FALSE; Can't return value */
}
- if (GST_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) {
int frameCount = 0;
frameCount =
@@ -437,7 +437,7 @@
/* if going to NULL? then close the file */
if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
/* printf ("DEBUG: afsink state change: null pending\n"); */
- if (GST_FLAG_IS_SET (element, GST_AFSINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (element, GST_AFSINK_OPEN)) {
/* g_print ("DEBUG: trying to close the sink file\n"); */
gst_afsink_close_file (GST_AFSINK (element));
}
@@ -449,7 +449,7 @@
the caps are set and can be known
{
g_print ("DEBUG: it's not going to null\n");
- if (!GST_FLAG_IS_SET (element, GST_AFSINK_OPEN))
+ if (!GST_OBJECT_FLAG_IS_SET (element, GST_AFSINK_OPEN))
{
g_print ("DEBUG: GST_AFSINK_OPEN not set\n");
if (!gst_afsink_open_file (GST_AFSINK (element)))
diff --git a/ext/audiofile/gstafsink.h b/ext/audiofile/gstafsink.h
index 76ce30a..9b0d0e4 100644
--- a/ext/audiofile/gstafsink.h
+++ b/ext/audiofile/gstafsink.h
@@ -52,9 +52,9 @@
typedef struct _GstAFSinkClass GstAFSinkClass;
typedef enum {
- GST_AFSINK_OPEN = GST_ELEMENT_FLAG_LAST,
+ GST_AFSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
- GST_AFSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ GST_AFSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstAFSinkFlags;
struct _GstAFSink {
diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c
index 109bf12..b17a877 100644
--- a/ext/audiofile/gstafsrc.c
+++ b/ext/audiofile/gstafsrc.c
@@ -308,7 +308,7 @@
static gboolean
gst_afsrc_open_file (GstAFSrc * src)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (src, GST_AFSRC_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (src, GST_AFSRC_OPEN), FALSE);
/* open the file */
src->file = afOpenFile (src->filename, "r", AF_NULL_FILESETUP);
@@ -353,7 +353,7 @@
"rate", G_TYPE_INT, src->rate,
"channels", G_TYPE_INT, src->channels, NULL));
- GST_FLAG_SET (src, GST_AFSRC_OPEN);
+ GST_OBJECT_FLAG_SET (src, GST_AFSRC_OPEN);
return TRUE;
}
@@ -362,14 +362,14 @@
gst_afsrc_close_file (GstAFSrc * src)
{
/* g_print ("DEBUG: closing srcfile...\n"); */
- g_return_if_fail (GST_FLAG_IS_SET (src, GST_AFSRC_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (src, GST_AFSRC_OPEN));
/* g_print ("DEBUG: past flag test\n"); */
/* if (fclose (src->file) != 0) */
if (afCloseFile (src->file) != 0) {
GST_ELEMENT_ERROR (src, RESOURCE, CLOSE,
(_("Error closing file \"%s\"."), src->filename), GST_ERROR_SYSTEM);
} else {
- GST_FLAG_UNSET (src, GST_AFSRC_OPEN);
+ GST_OBJECT_FLAG_UNSET (src, GST_AFSRC_OPEN);
}
}
@@ -381,13 +381,13 @@
/* if going to NULL then close the file */
if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
/* printf ("DEBUG: afsrc state change: null pending\n"); */
- if (GST_FLAG_IS_SET (element, GST_AFSRC_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (element, GST_AFSRC_OPEN)) {
/* g_print ("DEBUG: trying to close the src file\n"); */
gst_afsrc_close_file (GST_AFSRC (element));
}
} else if (GST_STATE_PENDING (element) == GST_STATE_READY) {
/* g_print ("DEBUG: afsrc: ready state pending. This shouldn't happen at the *end* of a stream\n"); */
- if (!GST_FLAG_IS_SET (element, GST_AFSRC_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, GST_AFSRC_OPEN)) {
/* g_print ("DEBUG: GST_AFSRC_OPEN not set\n"); */
if (!gst_afsrc_open_file (GST_AFSRC (element))) {
/* g_print ("DEBUG: element tries to open file\n"); */
diff --git a/ext/audiofile/gstafsrc.h b/ext/audiofile/gstafsrc.h
index c96c20c..b5dcfba 100644
--- a/ext/audiofile/gstafsrc.h
+++ b/ext/audiofile/gstafsrc.h
@@ -52,9 +52,9 @@
typedef struct _GstAFSrcClass GstAFSrcClass;
typedef enum {
- GST_AFSRC_OPEN = GST_ELEMENT_FLAG_LAST,
+ GST_AFSRC_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
- GST_AFSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ GST_AFSRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstAFSrcFlags;
struct _GstAFSrc {
diff --git a/ext/cdaudio/gstcdaudio.c b/ext/cdaudio/gstcdaudio.c
index 2a28d99..e278a68 100644
--- a/ext/cdaudio/gstcdaudio.c
+++ b/ext/cdaudio/gstcdaudio.c
@@ -206,8 +206,8 @@
cdaudio->was_playing = FALSE;
cdaudio->timer = g_timer_new ();
- GST_FLAG_SET (cdaudio, GST_BIN_FLAG_MANAGER);
- GST_FLAG_SET (cdaudio, GST_BIN_SELF_SCHEDULABLE);
+ GST_OBJECT_FLAG_SET (cdaudio, GST_BIN_FLAG_MANAGER);
+ GST_OBJECT_FLAG_SET (cdaudio, GST_BIN_SELF_SCHEDULABLE);
}
static void
diff --git a/ext/directfb/directfbvideosink.c b/ext/directfb/directfbvideosink.c
index 2f5536f..ee630dc 100644
--- a/ext/directfb/directfbvideosink.c
+++ b/ext/directfb/directfbvideosink.c
@@ -682,8 +682,8 @@
directfbvideosink->internal_surface = FALSE;
directfbvideosink->surface_locked = FALSE;
- GST_FLAG_SET (directfbvideosink, GST_ELEMENT_THREAD_SUGGESTED);
- GST_FLAG_SET (directfbvideosink, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (directfbvideosink, GST_ELEMENT_THREAD_SUGGESTED);
+ GST_OBJECT_FLAG_SET (directfbvideosink, GST_ELEMENT_EVENT_AWARE);
}
static void
diff --git a/ext/dts/gstdtsdec.c b/ext/dts/gstdtsdec.c
index cf99439..aaf73c0 100644
--- a/ext/dts/gstdtsdec.c
+++ b/ext/dts/gstdtsdec.c
@@ -178,7 +178,7 @@
gst_pad_use_explicit_caps (dtsdec->srcpad);
gst_element_add_pad (element, dtsdec->srcpad);
- GST_FLAG_SET (element, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (element, GST_ELEMENT_EVENT_AWARE);
dtsdec->dynamic_range_compression = FALSE;
}
diff --git a/ext/jack/gstjack.h b/ext/jack/gstjack.h
index e0b255a..738168c 100644
--- a/ext/jack/gstjack.h
+++ b/ext/jack/gstjack.h
@@ -65,9 +65,9 @@
enum {
- GST_JACK_OPEN = GST_BIN_FLAG_LAST,
- GST_JACK_ACTIVE,
- GST_JACK_FLAG_LAST = GST_BIN_FLAG_LAST + 3
+ GST_JACK_OPEN = (GST_BIN_FLAG_LAST << 0),
+ GST_JACK_ACTIVE = (GST_BIN_FLAG_LAST << 1),
+ GST_JACK_FLAG_LAST = (GST_BIN_FLAG_LAST << 3)
};
diff --git a/ext/jack/gstjackbin.c b/ext/jack/gstjackbin.c
index 85a31b1..1d79b72 100644
--- a/ext/jack/gstjackbin.c
+++ b/ext/jack/gstjackbin.c
@@ -92,8 +92,8 @@
GST_DEBUG ("initializing jack bin");
/* jack bins are managing bins and iterate themselves */
- GST_FLAG_SET (this, GST_BIN_FLAG_MANAGER);
- GST_FLAG_SET (this, GST_BIN_SELF_SCHEDULABLE);
+ GST_OBJECT_FLAG_SET (this, GST_BIN_FLAG_MANAGER);
+ GST_OBJECT_FLAG_SET (this, GST_BIN_SELF_SCHEDULABLE);
/* make a new scheduler and associate it with the bin */
gst_scheduler_factory_make (NULL, GST_ELEMENT (this));
@@ -148,7 +148,7 @@
jack_on_shutdown (this->client, shutdown, this);
}
- if (GST_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_OPEN)) {
l = this->src_pads;
while (l) {
JACK_DEBUG ("jackbin: unregistering pad %s:%s",
@@ -163,12 +163,12 @@
jack_port_unregister (this->client, GST_JACK_PAD (l)->port);
l = g_list_next (l);
}
- GST_FLAG_UNSET (GST_OBJECT (this), GST_JACK_OPEN);
+ GST_OBJECT_FLAG_UNSET (GST_OBJECT (this), GST_JACK_OPEN);
- if (GST_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_ACTIVE)) {
+ if (GST_OBJECT_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_ACTIVE)) {
JACK_DEBUG ("jackbin: deactivating client");
jack_deactivate (this->client);
- GST_FLAG_UNSET (GST_OBJECT (this), GST_JACK_ACTIVE);
+ GST_OBJECT_FLAG_UNSET (GST_OBJECT (this), GST_JACK_ACTIVE);
}
}
@@ -180,7 +180,7 @@
case GST_STATE_PAUSED:
JACK_DEBUG ("jackbin: PAUSED");
- if (!GST_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_OPEN)) {
l = this->src_pads;
while (l) {
pad = GST_JACK_PAD (l);
@@ -204,10 +204,10 @@
}
/* must activate before connecting */
- if (!GST_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_ACTIVE)) {
+ if (!GST_OBJECT_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_ACTIVE)) {
JACK_DEBUG ("jackbin: activating client");
jack_activate (this->client);
- GST_FLAG_SET (GST_OBJECT (this), GST_JACK_ACTIVE);
+ GST_OBJECT_FLAG_SET (GST_OBJECT (this), GST_JACK_ACTIVE);
}
l = this->src_pads;
@@ -238,7 +238,7 @@
}
JACK_DEBUG ("jackbin: setting OPEN flag");
- GST_FLAG_SET (GST_OBJECT (this), GST_JACK_OPEN);
+ GST_OBJECT_FLAG_SET (GST_OBJECT (this), GST_JACK_OPEN);
if (GST_ELEMENT_CLASS (parent_class)->change_state)
return GST_ELEMENT_CLASS (parent_class)->change_state (element,
diff --git a/ext/musepack/gstmusepackdec.c b/ext/musepack/gstmusepackdec.c
index 46b6578..607cf96 100644
--- a/ext/musepack/gstmusepackdec.c
+++ b/ext/musepack/gstmusepackdec.c
@@ -129,7 +129,7 @@
static void
gst_musepackdec_init (GstMusepackDec * musepackdec)
{
- GST_FLAG_SET (musepackdec, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (musepackdec, GST_ELEMENT_EVENT_AWARE);
musepackdec->r = g_new (mpc_reader, 1);
musepackdec->d = g_new (mpc_decoder, 1);
diff --git a/ext/musicbrainz/gsttrm.c b/ext/musicbrainz/gsttrm.c
index 3f88e9a..987e14d 100644
--- a/ext/musicbrainz/gsttrm.c
+++ b/ext/musicbrainz/gsttrm.c
@@ -229,8 +229,8 @@
musicbrainz->total_time = 0;
musicbrainz->signature_available = FALSE;
- GST_FLAG_SET (musicbrainz, GST_ELEMENT_EVENT_AWARE);
- /*GST_FLAG_SET(musicbrainz, GST_ELEMENT_THREAD_SUGGESTED); */
+ GST_OBJECT_FLAG_SET (musicbrainz, GST_ELEMENT_EVENT_AWARE);
+ /*GST_OBJECT_FLAG_SET(musicbrainz, GST_ELEMENT_THREAD_SUGGESTED); */
}
static void
diff --git a/ext/nas/nassink.c b/ext/nas/nassink.c
index c685eb9..dafe71b 100644
--- a/ext/nas/nassink.c
+++ b/ext/nas/nassink.c
@@ -425,7 +425,7 @@
/* Start a flow */
- GST_FLAG_SET (sink, GST_NASSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, GST_NASSINK_OPEN);
GST_CAT_DEBUG (NAS, "opened audio device");
return TRUE;
@@ -455,7 +455,7 @@
AuCloseServer (sink->audio);
sink->audio = NULL;
- GST_FLAG_UNSET (sink, GST_NASSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, GST_NASSINK_OPEN);
GST_CAT_DEBUG (NAS, "closed audio device");
}
@@ -471,12 +471,12 @@
switch (GST_STATE_PENDING (element)) {
case GST_STATE_NULL:
- if (GST_FLAG_IS_SET (element, GST_NASSINK_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (element, GST_NASSINK_OPEN))
gst_nassink_close_audio (nassink);
break;
case GST_STATE_READY:
- if (!GST_FLAG_IS_SET (element, GST_NASSINK_OPEN))
+ if (!GST_OBJECT_FLAG_IS_SET (element, GST_NASSINK_OPEN))
gst_nassink_open_audio (nassink);
break;
diff --git a/ext/nas/nassink.h b/ext/nas/nassink.h
index 3206541..e94a6e6 100644
--- a/ext/nas/nassink.h
+++ b/ext/nas/nassink.h
@@ -40,8 +40,8 @@
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NASSINK))
typedef enum {
- GST_NASSINK_OPEN = GST_ELEMENT_FLAG_LAST,
- GST_NASSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2
+ GST_NASSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
+ GST_NASSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2)
} GstNasSinkFlags;
typedef struct _GstNassink GstNassink;
diff --git a/ext/polyp/polypsink.c b/ext/polyp/polypsink.c
index 7fa2a12..8afc870 100644
--- a/ext/polyp/polypsink.c
+++ b/ext/polyp/polypsink.c
@@ -599,8 +599,8 @@
gst_pad_set_link_function (polypsink->sinkpad, gst_polypsink_link);
gst_pad_set_fixate_function (polypsink->sinkpad, gst_polypsink_sink_fixate);
-/* GST_FLAG_SET(polypsink, GST_ELEMENT_THREAD_SUGGESTED); */
- GST_FLAG_SET (polypsink, GST_ELEMENT_EVENT_AWARE);
+/* GST_OBJECT_FLAG_SET(polypsink, GST_ELEMENT_THREAD_SUGGESTED); */
+ GST_OBJECT_FLAG_SET (polypsink, GST_ELEMENT_EVENT_AWARE);
polypsink->context = NULL;
polypsink->stream = NULL;
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c
index aaf0e57..cdf560b 100644
--- a/ext/sdl/sdlvideosink.c
+++ b/ext/sdl/sdlvideosink.c
@@ -661,14 +661,14 @@
case GST_STATE_CHANGE_NULL_TO_READY:
if (!gst_sdlvideosink_initsdl (sdlvideosink))
return GST_STATE_CHANGE_FAILURE;
- GST_FLAG_SET (sdlvideosink, GST_SDLVIDEOSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sdlvideosink, GST_SDLVIDEOSINK_OPEN);
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_sdlvideosink_destroy (sdlvideosink);
break;
case GST_STATE_CHANGE_READY_TO_NULL:
gst_sdlvideosink_deinitsdl (sdlvideosink);
- GST_FLAG_UNSET (sdlvideosink, GST_SDLVIDEOSINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sdlvideosink, GST_SDLVIDEOSINK_OPEN);
break;
default: /* do nothing */
break;
diff --git a/ext/sdl/sdlvideosink.h b/ext/sdl/sdlvideosink.h
index ad68238..3dc2923 100644
--- a/ext/sdl/sdlvideosink.h
+++ b/ext/sdl/sdlvideosink.h
@@ -38,9 +38,9 @@
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SDLVIDEOSINK))
typedef enum {
- GST_SDLVIDEOSINK_OPEN = GST_ELEMENT_FLAG_LAST,
+ GST_SDLVIDEOSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
- GST_SDLVIDEOSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ GST_SDLVIDEOSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstSDLVideoSinkFlags;
typedef struct _GstSDLVideoSink GstSDLVideoSink;
diff --git a/ext/smoothwave/gstsmoothwave.c b/ext/smoothwave/gstsmoothwave.c
index 97d1dd5..7063456 100644
--- a/ext/smoothwave/gstsmoothwave.c
+++ b/ext/smoothwave/gstsmoothwave.c
@@ -167,7 +167,7 @@
gst_element_add_pad (GST_ELEMENT (smoothwave), smoothwave->srcpad);
gst_pad_set_link_function (smoothwave->srcpad, gst_sw_srclink);
- GST_FLAG_SET (smoothwave, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (smoothwave, GST_ELEMENT_EVENT_AWARE);
smoothwave->adapter = gst_adapter_new ();
diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c
index 5a5e371..e200474 100644
--- a/ext/sndfile/gstsf.c
+++ b/ext/sndfile/gstsf.c
@@ -344,7 +344,7 @@
switch (prop_id) {
case ARG_LOCATION:
- if (GST_FLAG_IS_SET (object, GST_SF_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (object, GST_SF_OPEN))
gst_sf_close_file (this);
if (this->filename)
g_free (this->filename);
@@ -462,7 +462,7 @@
case GST_STATE_CHANGE_PAUSED_TO_READY:
break;
case GST_STATE_CHANGE_READY_TO_NULL:
- if (GST_FLAG_IS_SET (this, GST_SF_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN))
gst_sf_close_file (this);
break;
}
@@ -536,7 +536,7 @@
INFO_OBJ (element, "Releasing request pad %s", GST_PAD_NAME (channel->pad));
- if (GST_FLAG_IS_SET (element, GST_SF_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (element, GST_SF_OPEN))
gst_sf_close_file (this);
gst_element_remove_pad (element, channel->pad);
@@ -577,7 +577,7 @@
int mode;
SF_INFO info;
- g_return_val_if_fail (!GST_FLAG_IS_SET (this, GST_SF_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN), FALSE);
this->time = 0;
@@ -647,7 +647,7 @@
GST_SF_CHANNEL (l)->caps_set = FALSE;
}
- GST_FLAG_SET (this, GST_SF_OPEN);
+ GST_OBJECT_FLAG_SET (this, GST_SF_OPEN);
return TRUE;
}
@@ -657,7 +657,7 @@
{
int err = 0;
- g_return_if_fail (GST_FLAG_IS_SET (this, GST_SF_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN));
INFO_OBJ (this, "Closing file %s", this->filename);
@@ -666,7 +666,7 @@
("Could not close file file \"%s\".", this->filename),
("soundfile error: %s", strerror (err)));
else
- GST_FLAG_UNSET (this, GST_SF_OPEN);
+ GST_OBJECT_FLAG_UNSET (this, GST_SF_OPEN);
this->file = NULL;
if (this->buffer)
@@ -699,7 +699,7 @@
gfloat *buf = this->buffer;
GstBuffer *out;
- if (!GST_FLAG_IS_SET (this, GST_SF_OPEN))
+ if (!GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN))
if (!gst_sf_open_file (this))
return; /* we've already set gst_element_error */
@@ -805,7 +805,7 @@
num_to_write = buffer_frames;
}
- if (!GST_FLAG_IS_SET (this, GST_SF_OPEN))
+ if (!GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN))
if (!gst_sf_open_file (this))
return; /* we've already set gst_element_error */
diff --git a/ext/sndfile/gstsf.h b/ext/sndfile/gstsf.h
index a253111..54ef629 100644
--- a/ext/sndfile/gstsf.h
+++ b/ext/sndfile/gstsf.h
@@ -66,8 +66,8 @@
typedef struct _GstSFClass GstSFClass;
typedef enum {
- GST_SF_OPEN = GST_ELEMENT_FLAG_LAST,
- GST_SF_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ GST_SF_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
+ GST_SF_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstSFlags;
typedef struct {
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index ef8077a..b9e12d7 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -375,7 +375,7 @@
swfdec_decoder_set_colorspace (swfdec->decoder, SWF_COLORSPACE_RGB888);
- GST_FLAG_SET (GST_ELEMENT (swfdec), GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (GST_ELEMENT (swfdec), GST_ELEMENT_EVENT_AWARE);
swfdec->frame_rate = 0.;
}
diff --git a/ext/tarkin/gsttarkindec.c b/ext/tarkin/gsttarkindec.c
index 07ec652..a7066f3 100644
--- a/ext/tarkin/gsttarkindec.c
+++ b/ext/tarkin/gsttarkindec.c
@@ -171,7 +171,7 @@
tarkindec->nheader = 0;
/* we're chained and we can deal with events */
- GST_FLAG_SET (tarkindec, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (tarkindec, GST_ELEMENT_EVENT_AWARE);
}
static void
diff --git a/gst/apetag/apedemux.c b/gst/apetag/apedemux.c
index 8f8197c..36f4c97 100644
--- a/gst/apetag/apedemux.c
+++ b/gst/apetag/apedemux.c
@@ -118,7 +118,7 @@
static void
gst_ape_demux_init (GstApeDemux * ape)
{
- GST_FLAG_SET (ape, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (ape, GST_ELEMENT_EVENT_AWARE);
ape->sinkpad =
gst_pad_new_from_template (gst_static_pad_template_get (&sink_templ),
diff --git a/gst/cdxaparse/gstcdxaparse.c b/gst/cdxaparse/gstcdxaparse.c
index 10dbd6f..b95c659 100644
--- a/gst/cdxaparse/gstcdxaparse.c
+++ b/gst/cdxaparse/gstcdxaparse.c
@@ -131,7 +131,7 @@
cdxaparse->seek_pending = FALSE;
cdxaparse->seek_offset = 0;
- GST_FLAG_SET (cdxaparse, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (cdxaparse, GST_ELEMENT_EVENT_AWARE);
}
static gboolean
diff --git a/gst/cdxaparse/gstcdxastrip.c b/gst/cdxaparse/gstcdxastrip.c
index 2138ce3..66bd9a2 100644
--- a/gst/cdxaparse/gstcdxastrip.c
+++ b/gst/cdxaparse/gstcdxastrip.c
@@ -113,7 +113,7 @@
static void
gst_cdxastrip_init (GstCDXAStrip * cdxastrip)
{
- GST_FLAG_SET (cdxastrip, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (cdxastrip, GST_ELEMENT_EVENT_AWARE);
cdxastrip->sinkpad =
gst_pad_new_from_template (gst_static_pad_template_get
diff --git a/gst/cdxaparse/gstvcdparse.c b/gst/cdxaparse/gstvcdparse.c
index 2138ce3..66bd9a2 100644
--- a/gst/cdxaparse/gstvcdparse.c
+++ b/gst/cdxaparse/gstvcdparse.c
@@ -113,7 +113,7 @@
static void
gst_cdxastrip_init (GstCDXAStrip * cdxastrip)
{
- GST_FLAG_SET (cdxastrip, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (cdxastrip, GST_ELEMENT_EVENT_AWARE);
cdxastrip->sinkpad =
gst_pad_new_from_template (gst_static_pad_template_get
diff --git a/gst/festival/gstfestival.c b/gst/festival/gstfestival.c
index 62e60e6..ffe2fc1 100644
--- a/gst/festival/gstfestival.c
+++ b/gst/festival/gstfestival.c
@@ -417,10 +417,10 @@
g_return_val_if_fail (GST_IS_FESTIVAL (element), GST_STATE_CHANGE_FAILURE);
if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
- if (GST_FLAG_IS_SET (element, GST_FESTIVAL_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (element, GST_FESTIVAL_OPEN))
gst_festival_close (GST_FESTIVAL (element));
} else {
- if (!GST_FLAG_IS_SET (element, GST_FESTIVAL_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, GST_FESTIVAL_OPEN)) {
if (!gst_festival_open (GST_FESTIVAL (element)))
return GST_STATE_CHANGE_FAILURE;
}
diff --git a/gst/festival/gstfestival.h b/gst/festival/gstfestival.h
index ab46310..c7c91e3 100644
--- a/gst/festival/gstfestival.h
+++ b/gst/festival/gstfestival.h
@@ -94,9 +94,9 @@
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FESTIVAL))
typedef enum {
- GST_FESTIVAL_OPEN = GST_ELEMENT_FLAG_LAST,
+ GST_FESTIVAL_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
- GST_FESTIVAL_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+ GST_FESTIVAL_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstFestivalFlags;
typedef struct _GstFestival GstFestival;
diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c
index 7e17820..b6feb84 100644
--- a/gst/mpeg2sub/gstmpeg2subt.c
+++ b/gst/mpeg2sub/gstmpeg2subt.c
@@ -231,7 +231,7 @@
GST_DEBUG_FUNCPTR (gst_mpeg2subt_src_event));
gst_element_set_loop_function (GST_ELEMENT (mpeg2subt), gst_mpeg2subt_loop);
- GST_FLAG_SET (GST_ELEMENT (mpeg2subt), GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (GST_ELEMENT (mpeg2subt), GST_ELEMENT_EVENT_AWARE);
mpeg2subt->partialbuf = NULL;
mpeg2subt->hold_frame = NULL;
diff --git a/gst/multifilesink/gstmultifilesink.c b/gst/multifilesink/gstmultifilesink.c
index 4f32046..1c96ef8 100644
--- a/gst/multifilesink/gstmultifilesink.c
+++ b/gst/multifilesink/gstmultifilesink.c
@@ -170,7 +170,7 @@
gst_element_add_pad (GST_ELEMENT (filesink), pad);
gst_pad_set_chain_function (pad, gst_multifilesink_chain);
- GST_FLAG_SET (GST_ELEMENT (filesink), GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (GST_ELEMENT (filesink), GST_ELEMENT_EVENT_AWARE);
gst_pad_set_query_function (pad, gst_multifilesink_pad_query);
gst_pad_set_query_type_function (pad, gst_multifilesink_get_query_types);
@@ -207,11 +207,11 @@
/* the element must be stopped or paused in order to do this or in newfile
signal */
if (GST_STATE (sink) > GST_STATE_PAUSED &&
- !GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE))
+ !GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE))
return FALSE;
if (GST_STATE (sink) == GST_STATE_PAUSED &&
- (GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN) ||
- !GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE)))
+ (GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN) ||
+ !GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE)))
return FALSE;
@@ -228,7 +228,7 @@
}
if (GST_STATE (sink) == GST_STATE_PAUSED &&
- !GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE))
+ !GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE))
gst_multifilesink_open_file (sink);
return TRUE;
@@ -275,7 +275,8 @@
static gboolean
gst_multifilesink_open_file (GstMultiFileSink * sink)
{
- g_return_val_if_fail (!GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN),
+ FALSE);
/* open the file */
if (sink->curfilename == NULL || sink->curfilename[0] == '\0') {
@@ -292,7 +293,7 @@
return FALSE;
}
- GST_FLAG_SET (sink, GST_MULTIFILESINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, GST_MULTIFILESINK_OPEN);
sink->data_written = 0;
sink->curfileindex++;
@@ -303,13 +304,13 @@
static void
gst_multifilesink_close_file (GstMultiFileSink * sink)
{
- g_return_if_fail (GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN));
+ g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN));
if (fclose (sink->file) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
(_("Error closing file \"%s\"."), sink->curfilename), GST_ERROR_SYSTEM);
} else {
- GST_FLAG_UNSET (sink, GST_MULTIFILESINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, GST_MULTIFILESINK_OPEN);
}
}
@@ -317,16 +318,18 @@
gst_multifilesink_next_file (GstMultiFileSink * sink)
{
GST_DEBUG ("next file");
- g_return_val_if_fail (GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN), FALSE);
+ g_return_val_if_fail (GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN),
+ FALSE);
if (fclose (sink->file) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
(_("Error closing file \"%s\"."), sink->curfilename), GST_ERROR_SYSTEM);
} else {
- GST_FLAG_UNSET (sink, GST_MULTIFILESINK_OPEN);
+ GST_OBJECT_FLAG_UNSET (sink, GST_MULTIFILESINK_OPEN);
}
- g_return_val_if_fail (!GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN), FALSE);
+ g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN),
+ FALSE);
if (sink->curfilename)
g_free (sink->curfilename);
if (sink->uri)
@@ -349,7 +352,7 @@
return FALSE;
}
- GST_FLAG_SET (sink, GST_MULTIFILESINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, GST_MULTIFILESINK_OPEN);
sink->data_written = 0;
if (sink->streamheader) {
GSList *l;
@@ -394,7 +397,8 @@
case GST_QUERY_TOTAL:
switch (*format) {
case GST_FORMAT_BYTES:
- if (GST_FLAG_IS_SET (GST_ELEMENT (sink), GST_MULTIFILESINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (GST_ELEMENT (sink),
+ GST_MULTIFILESINK_OPEN)) {
*value = sink->data_written; /* FIXME - doesn't the kernel provide
such a function? */
break;
@@ -406,7 +410,8 @@
case GST_QUERY_POSITION:
switch (*format) {
case GST_FORMAT_BYTES:
- if (GST_FLAG_IS_SET (GST_ELEMENT (sink), GST_MULTIFILESINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (GST_ELEMENT (sink),
+ GST_MULTIFILESINK_OPEN)) {
*value = ftell (sink->file);
break;
}
@@ -431,7 +436,7 @@
filesink = GST_MULTIFILESINK (gst_pad_get_parent (pad));
- if (!(GST_FLAG_IS_SET (filesink, GST_MULTIFILESINK_OPEN))) {
+ if (!(GST_OBJECT_FLAG_IS_SET (filesink, GST_MULTIFILESINK_OPEN))) {
gst_event_unref (event);
return FALSE;
}
@@ -478,10 +483,10 @@
if (GST_EVENT_DISCONT_NEW_MEDIA (event)) {
/* do not create a new file on the first new media discont */
if (filesink->numfiles > 0) {
- GST_FLAG_SET (filesink, GST_MULTIFILESINK_NEWFILE);
+ GST_OBJECT_FLAG_SET (filesink, GST_MULTIFILESINK_NEWFILE);
g_signal_emit (G_OBJECT (filesink),
gst_multifilesink_signals[SIGNAL_NEWFILE], 0);
- GST_FLAG_UNSET (filesink, GST_MULTIFILESINK_NEWFILE);
+ GST_OBJECT_FLAG_UNSET (filesink, GST_MULTIFILESINK_NEWFILE);
if (!gst_multifilesink_next_file (filesink))
GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE,
(_("Error switching files to \"%s\"."),
@@ -557,7 +562,7 @@
gst_buffer_ref (buf);
filesink->streamheader = g_slist_append (filesink->streamheader, buf);
}
- if (GST_FLAG_IS_SET (filesink, GST_MULTIFILESINK_OPEN)) {
+ if (GST_OBJECT_FLAG_IS_SET (filesink, GST_MULTIFILESINK_OPEN)) {
guint bytes_written = 0, back_pending = 0;
@@ -595,12 +600,12 @@
switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY:
- if (GST_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN))
gst_multifilesink_close_file (GST_MULTIFILESINK (element));
break;
case GST_STATE_CHANGE_READY_TO_PAUSED:
- if (!GST_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN)) {
+ if (!GST_OBJECT_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN)) {
if (!gst_multifilesink_open_file (GST_MULTIFILESINK (element)))
return GST_STATE_CHANGE_FAILURE;
}
diff --git a/gst/multifilesink/gstmultifilesink.h b/gst/multifilesink/gstmultifilesink.h
index 4177f60..89a741a 100644
--- a/gst/multifilesink/gstmultifilesink.h
+++ b/gst/multifilesink/gstmultifilesink.h
@@ -44,10 +44,10 @@
typedef struct _GstMultiFileSinkClass GstMultiFileSinkClass;
typedef enum {
- GST_MULTIFILESINK_OPEN = GST_ELEMENT_FLAG_LAST,
- GST_MULTIFILESINK_NEWFILE = GST_ELEMENT_FLAG_LAST +2,
+ GST_MULTIFILESINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
+ GST_MULTIFILESINK_NEWFILE = (GST_ELEMENT_FLAG_LAST << 1),
- GST_MULTIFILESINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 4
+ GST_MULTIFILESINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 4)
} GstMultiFileSinkFlags;
struct _GstMultiFileSink {
diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c
index 97d1dd5..7063456 100644
--- a/gst/smoothwave/gstsmoothwave.c
+++ b/gst/smoothwave/gstsmoothwave.c
@@ -167,7 +167,7 @@
gst_element_add_pad (GST_ELEMENT (smoothwave), smoothwave->srcpad);
gst_pad_set_link_function (smoothwave->srcpad, gst_sw_srclink);
- GST_FLAG_SET (smoothwave, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (smoothwave, GST_ELEMENT_EVENT_AWARE);
smoothwave->adapter = gst_adapter_new ();
diff --git a/gst/videodrop/gstvideodrop.c b/gst/videodrop/gstvideodrop.c
index 352e61d..0aff4a7 100644
--- a/gst/videodrop/gstvideodrop.c
+++ b/gst/videodrop/gstvideodrop.c
@@ -228,7 +228,7 @@
static void
gst_videodrop_init (GstVideodrop * videodrop)
{
- GST_FLAG_SET (videodrop, GST_ELEMENT_EVENT_AWARE);
+ GST_OBJECT_FLAG_SET (videodrop, GST_ELEMENT_EVENT_AWARE);
GST_DEBUG ("gst_videodrop_init");
videodrop->sinkpad =
diff --git a/sys/cdrom/gstcdplayer.c b/sys/cdrom/gstcdplayer.c
index b67362d..6d3bec0 100644
--- a/sys/cdrom/gstcdplayer.c
+++ b/sys/cdrom/gstcdplayer.c
@@ -160,7 +160,7 @@
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 2e7026f..3ac6521 100644
--- a/sys/dxr3/dxr3audiosink.c
+++ b/sys/dxr3/dxr3audiosink.c
@@ -214,7 +214,7 @@
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 @@
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 @@
return FALSE;
}
- GST_FLAG_SET (sink, DXR3AUDIOSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, DXR3AUDIOSINK_OPEN);
dxr3audiosink_set_mode_pcm (sink);
@@ -414,7 +415,7 @@
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 @@
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_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_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 @@
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 28bb34e..787e20f 100644
--- a/sys/dxr3/dxr3audiosink.h
+++ b/sys/dxr3/dxr3audiosink.h
@@ -46,8 +46,8 @@
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 badc2e4..59d965a 100644
--- a/sys/dxr3/dxr3spusink.c
+++ b/sys/dxr3/dxr3spusink.c
@@ -207,7 +207,7 @@
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 @@
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 @@
return FALSE;
}
- GST_FLAG_SET (sink, DXR3SPUSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, DXR3SPUSINK_OPEN);
return TRUE;
}
@@ -290,7 +291,7 @@
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 @@
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 @@
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 @@
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 @@
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 e255171..e1563ab 100644
--- a/sys/dxr3/dxr3spusink.h
+++ b/sys/dxr3/dxr3spusink.h
@@ -44,8 +44,8 @@
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 c2222e8..0832ec5 100644
--- a/sys/dxr3/dxr3videosink.c
+++ b/sys/dxr3/dxr3videosink.c
@@ -204,7 +204,7 @@
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 @@
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 @@
return FALSE;
}
- GST_FLAG_SET (sink, DXR3VIDEOSINK_OPEN);
+ GST_OBJECT_FLAG_SET (sink, DXR3VIDEOSINK_OPEN);
return TRUE;
}
@@ -293,7 +294,7 @@
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 @@
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 @@
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 @@
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_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 b0e5cad..4af1de1 100644
--- a/sys/dxr3/dxr3videosink.h
+++ b/sys/dxr3/dxr3videosink.h
@@ -44,8 +44,8 @@
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 01018b5..d1a7601 100644
--- a/sys/glsink/glimagesink.c
+++ b/sys/glsink/glimagesink.c
@@ -1466,8 +1466,8 @@
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 e34a589..901beca 100644
--- a/sys/qcam/gstqcamsrc.c
+++ b/sys/qcam/gstqcamsrc.c
@@ -389,11 +389,11 @@
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 @@
return FALSE;
}
- GST_FLAG_SET (qcamsrc, GST_QCAMSRC_OPEN);
+ GST_OBJECT_FLAG_SET (qcamsrc, GST_QCAMSRC_OPEN);
return TRUE;
}
@@ -429,7 +429,7 @@
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 0bd201c..a1873f2 100644
--- a/sys/qcam/gstqcamsrc.h
+++ b/sys/qcam/gstqcamsrc.h
@@ -45,9 +45,9 @@
/* 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 b273781..7d0e16a 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -230,7 +230,7 @@
{
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 a6f06b8..107dbb5 100644
--- a/sys/vcd/vcdsrc.c
+++ b/sys/vcd/vcdsrc.c
@@ -219,7 +219,7 @@
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 @@
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 @@
{
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 @@
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 @@
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 @@
g_free (src->tracks);
- GST_FLAG_UNSET (src, VCDSRC_OPEN);
+ GST_OBJECT_FLAG_UNSET (src, VCDSRC_OPEN);
}
static GstStateChangeReturn
@@ -552,7 +552,7 @@
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 @@
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 @@
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 2ab0e49..0c34984 100644
--- a/sys/vcd/vcdsrc.h
+++ b/sys/vcd/vcdsrc.h
@@ -41,9 +41,9 @@
/* 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;
