summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/artsd/gstartsdsink.c8
-rw-r--r--ext/artsd/gstartsdsink.h4
-rw-r--r--ext/audiofile/gstafparse.c9
-rw-r--r--ext/audiofile/gstafparse.h4
-rw-r--r--ext/audiofile/gstafsink.c18
-rw-r--r--ext/audiofile/gstafsink.h4
-rw-r--r--ext/audiofile/gstafsrc.c12
-rw-r--r--ext/audiofile/gstafsrc.h4
-rw-r--r--ext/cdaudio/gstcdaudio.c4
-rw-r--r--ext/directfb/directfbvideosink.c4
-rw-r--r--ext/dts/gstdtsdec.c2
-rw-r--r--ext/jack/gstjack.h6
-rw-r--r--ext/jack/gstjackbin.c20
-rw-r--r--ext/musepack/gstmusepackdec.c2
-rw-r--r--ext/musicbrainz/gsttrm.c4
-rw-r--r--ext/nas/nassink.c8
-rw-r--r--ext/nas/nassink.h4
-rw-r--r--ext/polyp/polypsink.c4
-rw-r--r--ext/sdl/sdlvideosink.c4
-rw-r--r--ext/sdl/sdlvideosink.h4
-rw-r--r--ext/smoothwave/gstsmoothwave.c2
-rw-r--r--ext/sndfile/gstsf.c18
-rw-r--r--ext/sndfile/gstsf.h4
-rw-r--r--ext/swfdec/gstswfdec.c2
-rw-r--r--ext/tarkin/gsttarkindec.c2
25 files changed, 79 insertions, 78 deletions
diff --git a/ext/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c
index f3a06c6c..5dcade2d 100644
--- a/ext/artsd/gstartsdsink.c
+++ b/ext/artsd/gstartsdsink.c
@@ -304,7 +304,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
/* 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 @@ gst_artsdsink_close_audio (GstArtsdsink * sink)
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 @@ gst_artsdsink_change_state (GstElement * element, GstStateChange transition)
/* 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 6cece273..64b3a2a2 100644
--- a/ext/artsd/gstartsdsink.h
+++ b/ext/artsd/gstartsdsink.h
@@ -41,8 +41,8 @@ extern "C" {
(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 b576e814..35b5b497 100644
--- a/ext/audiofile/gstafparse.c
+++ b/ext/audiofile/gstafparse.c
@@ -342,7 +342,8 @@ gst_afparse_plugin_init (GstPlugin * plugin)
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 @@ gst_afparse_open_file (GstAFParse * afparse)
"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 @@ gst_afparse_open_file (GstAFParse * afparse)
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 0f636dcd..43f64f4f 100644
--- a/ext/audiofile/gstafparse.h
+++ b/ext/audiofile/gstafparse.h
@@ -54,9 +54,9 @@ typedef struct _GstAFParse GstAFParse;
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 ea331bcd..b513a198 100644
--- a/ext/audiofile/gstafsink.c
+++ b/ext/audiofile/gstafsink.c
@@ -292,7 +292,7 @@ gst_afsink_open_file (GstAFSink * sink)
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 @@ gst_afsink_open_file (GstAFSink * sink)
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 @@ static void
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 @@ gst_afsink_chain (GstPad * pad, GstData * _data)
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 @@ gst_afsink_chain (GstPad * pad, GstData * _data)
}
*/
- 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 @@ gst_afsink_change_state (GstElement * element, GstStateChange transition)
/* 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 @@ gst_afsink_change_state (GstElement * element, GstStateChange transition)
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 76ce30af..9b0d0e4e 100644
--- a/ext/audiofile/gstafsink.h
+++ b/ext/audiofile/gstafsink.h
@@ -52,9 +52,9 @@ typedef struct _GstAFSink GstAFSink;
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 109bf12b..b17a8770 100644
--- a/ext/audiofile/gstafsrc.c
+++ b/ext/audiofile/gstafsrc.c
@@ -308,7 +308,7 @@ gst_afsrc_plugin_init (GstPlugin * plugin)
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 @@ gst_afsrc_open_file (GstAFSrc * src)
"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 @@ static void
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 @@ gst_afsrc_change_state (GstElement * element, GstStateChange transition)
/* 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 c96c20c3..b5dcfba3 100644
--- a/ext/audiofile/gstafsrc.h
+++ b/ext/audiofile/gstafsrc.h
@@ -52,9 +52,9 @@ typedef struct _GstAFSrc GstAFSrc;
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 2a28d991..e278a687 100644
--- a/ext/cdaudio/gstcdaudio.c
+++ b/ext/cdaudio/gstcdaudio.c
@@ -206,8 +206,8 @@ gst_cdaudio_init (GstCDAudio * cdaudio, GstCDAudioClass * g_class)
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 2f5536f9..ee630dc0 100644
--- a/ext/directfb/directfbvideosink.c
+++ b/ext/directfb/directfbvideosink.c
@@ -682,8 +682,8 @@ gst_directfbvideosink_init (GstDirectFBVideoSink * directfbvideosink)
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 cf994394..aaf73c0d 100644
--- a/ext/dts/gstdtsdec.c
+++ b/ext/dts/gstdtsdec.c
@@ -178,7 +178,7 @@ gst_dtsdec_init (GstDtsDec * dtsdec)
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 e0b255a6..738168ca 100644
--- a/ext/jack/gstjack.h
+++ b/ext/jack/gstjack.h
@@ -65,9 +65,9 @@ typedef GstJackClass GstJackSrcClass;
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 85a31b1b..1d79b72e 100644
--- a/ext/jack/gstjackbin.c
+++ b/ext/jack/gstjackbin.c
@@ -92,8 +92,8 @@ gst_jack_bin_init (GstJackBin * this)
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 @@ gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
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 @@ gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
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 @@ gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
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 @@ gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
}
/* 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 @@ gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
}
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 46b65783..607cf960 100644
--- a/ext/musepack/gstmusepackdec.c
+++ b/ext/musepack/gstmusepackdec.c
@@ -129,7 +129,7 @@ gst_musepackdec_class_init (GstMusepackDecClass * klass)
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 3f88e9ae..987e14dd 100644
--- a/ext/musicbrainz/gsttrm.c
+++ b/ext/musicbrainz/gsttrm.c
@@ -229,8 +229,8 @@ gst_musicbrainz_init (GstMusicBrainz * musicbrainz)
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 c685eb91..dafe71bc 100644
--- a/ext/nas/nassink.c
+++ b/ext/nas/nassink.c
@@ -425,7 +425,7 @@ gst_nassink_open_audio (GstNassink * sink)
/* 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 @@ gst_nassink_close_audio (GstNassink * sink)
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 @@ gst_nassink_change_state (GstElement * element, GstStateChange transition)
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 3206541c..e94a6e68 100644
--- a/ext/nas/nassink.h
+++ b/ext/nas/nassink.h
@@ -40,8 +40,8 @@ extern "C" {
(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 7fa2a124..8afc8708 100644
--- a/ext/polyp/polypsink.c
+++ b/ext/polyp/polypsink.c
@@ -599,8 +599,8 @@ gst_polypsink_init (GTypeInstance * instance, gpointer g_class)
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 aaf0e57d..cdf560b8 100644
--- a/ext/sdl/sdlvideosink.c
+++ b/ext/sdl/sdlvideosink.c
@@ -661,14 +661,14 @@ gst_sdlvideosink_change_state (GstElement * element, GstStateChange transition)
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 ad682385..3dc29236 100644
--- a/ext/sdl/sdlvideosink.h
+++ b/ext/sdl/sdlvideosink.h
@@ -38,9 +38,9 @@ G_BEGIN_DECLS
(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 97d1dd5f..70634564 100644
--- a/ext/smoothwave/gstsmoothwave.c
+++ b/ext/smoothwave/gstsmoothwave.c
@@ -167,7 +167,7 @@ gst_smoothwave_init (GstSmoothWave * smoothwave)
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 5a5e3712..e2004745 100644
--- a/ext/sndfile/gstsf.c
+++ b/ext/sndfile/gstsf.c
@@ -344,7 +344,7 @@ gst_sf_set_property (GObject * object, guint prop_id, const GValue * value,
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 @@ gst_sf_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 (this, GST_SF_OPEN))
+ if (GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN))
gst_sf_close_file (this);
break;
}
@@ -536,7 +536,7 @@ gst_sf_release_request_pad (GstElement * element, GstPad * pad)
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 @@ gst_sf_open_file (GstSF * this)
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_open_file (GstSF * this)
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 @@ gst_sf_close_file (GstSF * this)
{
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 @@ gst_sf_close_file (GstSF * this)
("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 @@ gst_sf_loop (GstElement * element)
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 @@ gst_sf_loop (GstElement * element)
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 a2531112..54ef6297 100644
--- a/ext/sndfile/gstsf.h
+++ b/ext/sndfile/gstsf.h
@@ -66,8 +66,8 @@ typedef struct _GstSF GstSF;
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 ef8077a7..b9e12d71 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -375,7 +375,7 @@ gst_swfdec_init (GstSwfdec * swfdec)
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 07ec652c..a7066f3e 100644
--- a/ext/tarkin/gsttarkindec.c
+++ b/ext/tarkin/gsttarkindec.c
@@ -171,7 +171,7 @@ gst_tarkindec_init (TarkinDec * tarkindec)
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
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-28 11:21:43 +0000