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, 6 insertions, 6 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;