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

2 files changed, 11 insertions, 11 deletions

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 {