Commit 36c2fc25 authored by Stefan Kost's avatar Stefan Kost
Browse files

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
parent e9cfa88c
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>
......
......@@ -272,7 +272,7 @@ main (gint argc, gchar * argv[])
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");
......
......@@ -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;
}
......
......@@ -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;
......
......@@ -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);
}
}
......
......@@ -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 {
......
......@@ -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)))
......
......@@ -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 {
......
......@@ -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"); */
......
......@@ -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 {
......
......@@ -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
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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)
};
......
......@@ -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,
......
......@@ -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);
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment