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/esd/esdmon.c: (gst_esdmon_open_audio),
(gst_esdmon_close_audio), (gst_esdmon_change_state):
* ext/esd/esdmon.h:
* ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_init):
* ext/pango/gsttextoverlay.c: (gst_textoverlay_init):
* gst/autodetect/gstautoaudiosink.c: (gst_auto_audio_sink_init):
* gst/autodetect/gstautovideosink.c: (gst_auto_video_sink_init):
* gst/avi/gstavimux.c: (gst_avimux_init):
* gst/matroska/matroska-demux.c: (gst_matroska_demux_init):
* gst/multipart/multipartdemux.c: (gst_multipart_demux_init):
* gst/multipart/multipartmux.c: (gst_multipart_mux_init):
* gst/oldcore/gstmultifilesrc.c: (gst_multifilesrc_init),
(gst_multifilesrc_get), (gst_multifilesrc_open_file),
(gst_multifilesrc_close_file), (gst_multifilesrc_change_state):
* gst/oldcore/gstmultifilesrc.h:
* gst/oldcore/gstpipefilter.c: (gst_pipefilter_init),
(gst_pipefilter_open_file), (gst_pipefilter_close_file),
(gst_pipefilter_change_state):
* gst/oldcore/gstpipefilter.h:
* gst/smoothwave/gstsmoothwave.c: (gst_smoothwave_init):
* gst/videomixer/videomixer.c: (gst_videomixer_init):
* sys/osxaudio/gstosxaudiosink.c: (gst_osxaudiosink_init):
* sys/osxaudio/gstosxaudiosink.h:
* sys/osxaudio/gstosxaudiosrc.h:
renamed GST_FLAGS macros to GST_OBJECT_FLAGS
moved bitshift from macro to enum definition

22 files changed, 80 insertions, 47 deletions

diff --git a/ChangeLog b/ChangeLog
index e5324692..02f2edd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2005-10-12  Stefan Kost  <ensonic@users.sf.net>
+
+	* examples/indexing/indexmpeg.c: (main):
+	* ext/esd/esdmon.c: (gst_esdmon_open_audio),
+	(gst_esdmon_close_audio), (gst_esdmon_change_state):
+	* ext/esd/esdmon.h:
+	* ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_init):
+	* ext/pango/gsttextoverlay.c: (gst_textoverlay_init):
+	* gst/autodetect/gstautoaudiosink.c: (gst_auto_audio_sink_init):
+	* gst/autodetect/gstautovideosink.c: (gst_auto_video_sink_init):
+	* gst/avi/gstavimux.c: (gst_avimux_init):
+	* gst/matroska/matroska-demux.c: (gst_matroska_demux_init):
+	* gst/multipart/multipartdemux.c: (gst_multipart_demux_init):
+	* gst/multipart/multipartmux.c: (gst_multipart_mux_init):
+	* gst/oldcore/gstmultifilesrc.c: (gst_multifilesrc_init),
+	(gst_multifilesrc_get), (gst_multifilesrc_open_file),
+	(gst_multifilesrc_close_file), (gst_multifilesrc_change_state):
+	* gst/oldcore/gstmultifilesrc.h:
+	* gst/oldcore/gstpipefilter.c: (gst_pipefilter_init),
+	(gst_pipefilter_open_file), (gst_pipefilter_close_file),
+	(gst_pipefilter_change_state):
+	* gst/oldcore/gstpipefilter.h:
+	* gst/smoothwave/gstsmoothwave.c: (gst_smoothwave_init):
+	* gst/videomixer/videomixer.c: (gst_videomixer_init):
+	* sys/osxaudio/gstosxaudiosink.c: (gst_osxaudiosink_init):
+	* sys/osxaudio/gstosxaudiosink.h:
+	* sys/osxaudio/gstosxaudiosrc.h:
+	renamed GST_FLAGS macros to GST_OBJECT_FLAGS
+        moved bitshift from macro to enum definition
+
 2005-10-12  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* ext/Makefile.am:
diff --git a/common b/common
-Subproject 37ed26e33bae9a6ab256c62ebbb9d711374a0ab
+Subproject 2485a65b662de25fb7b71857e34411426c6f530
diff --git a/examples/indexing/indexmpeg.c b/examples/indexing/indexmpeg.c
index 3b690af9..a670ad8a 100644
--- a/examples/indexing/indexmpeg.c
+++ b/examples/indexing/indexmpeg.c
@@ -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");
 
diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c
index 4b1097b0..5b0f714a 100644
--- a/ext/esd/esdmon.c
+++ b/ext/esd/esdmon.c
@@ -404,7 +404,7 @@ gst_esdmon_open_audio (GstEsdmon * src)
     return FALSE;
   }
 
-  GST_FLAG_SET (src, GST_ESDMON_OPEN);
+  GST_OBJECT_FLAG_SET (src, GST_ESDMON_OPEN);
 
   return TRUE;
 }
@@ -418,7 +418,7 @@ gst_esdmon_close_audio (GstEsdmon * src)
   close (src->fd);
   src->fd = -1;
 
-  GST_FLAG_UNSET (src, GST_ESDMON_OPEN);
+  GST_OBJECT_FLAG_UNSET (src, GST_ESDMON_OPEN);
 
   GST_DEBUG ("esdmon: closed sound device");
 }
@@ -430,11 +430,11 @@ gst_esdmon_change_state (GstElement * element, GstStateChange transition)
 
   /* if going down into NULL state, close the fd if it's open */
   if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
-    if (GST_FLAG_IS_SET (element, GST_ESDMON_OPEN))
+    if (GST_OBJECT_FLAG_IS_SET (element, GST_ESDMON_OPEN))
       gst_esdmon_close_audio (GST_ESDMON (element));
     /* otherwise (READY or higher) we need to open the fd */
   } else {
-    if (!GST_FLAG_IS_SET (element, GST_ESDMON_OPEN)) {
+    if (!GST_OBJECT_FLAG_IS_SET (element, GST_ESDMON_OPEN)) {
       if (!gst_esdmon_open_audio (GST_ESDMON (element)))
         return GST_STATE_CHANGE_FAILURE;
     }
diff --git a/ext/esd/esdmon.h b/ext/esd/esdmon.h
index f50e6544..06cb4fbf 100644
--- a/ext/esd/esdmon.h
+++ b/ext/esd/esdmon.h
@@ -39,8 +39,8 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ESDMON))
 
 typedef enum {
-  GST_ESDMON_OPEN            = GST_ELEMENT_FLAG_LAST,
-  GST_ESDMON_FLAG_LAST       = GST_ELEMENT_FLAG_LAST+2,
+  GST_ESDMON_OPEN            = (GST_ELEMENT_FLAG_LAST << 0),
+  GST_ESDMON_FLAG_LAST       = (GST_ELEMENT_FLAG_LAST << 2)
 } GstEsdSrcFlags;
 
 typedef struct _GstEsdmon GstEsdmon;
diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c
index 361f08cd..b144827c 100644
--- a/ext/gdk_pixbuf/gstgdkpixbuf.c
+++ b/ext/gdk_pixbuf/gstgdkpixbuf.c
@@ -249,7 +249,7 @@ gst_gdk_pixbuf_init (GstGdkPixbuf * filter)
   gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad);
   gst_pad_set_chain_function (filter->sinkpad, gst_gdk_pixbuf_chain);
 
-  GST_FLAG_SET (GST_ELEMENT (filter), GST_ELEMENT_EVENT_AWARE);
+  GST_OBJECT_FLAG_SET (GST_ELEMENT (filter), GST_ELEMENT_EVENT_AWARE);
 }
 
 static void
diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c
index f3e3ea21..807dac27 100644
--- a/ext/pango/gsttextoverlay.c
+++ b/ext/pango/gsttextoverlay.c
@@ -694,7 +694,7 @@ gst_textoverlay_init (GstTextOverlay * overlay)
 
   gst_element_set_loop_function (GST_ELEMENT (overlay), gst_textoverlay_loop);
 
-  GST_FLAG_SET (overlay, GST_ELEMENT_EVENT_AWARE);
+  GST_OBJECT_FLAG_SET (overlay, GST_ELEMENT_EVENT_AWARE);
 }
 
 
diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c
index 0bbf63a1..334ae451 100644
--- a/gst/autodetect/gstautoaudiosink.c
+++ b/gst/autodetect/gstautoaudiosink.c
@@ -93,7 +93,7 @@ gst_auto_audio_sink_init (GstAutoAudioSink * sink,
 
   gst_auto_audio_sink_reset (sink);
 
-  GST_FLAG_SET (sink, GST_ELEMENT_IS_SINK);
+  GST_OBJECT_FLAG_SET (sink, GST_ELEMENT_IS_SINK);
 }
 
 static gboolean
diff --git a/gst/autodetect/gstautovideosink.c b/gst/autodetect/gstautovideosink.c
index 3df90098..b4a861b9 100644
--- a/gst/autodetect/gstautovideosink.c
+++ b/gst/autodetect/gstautovideosink.c
@@ -93,7 +93,7 @@ gst_auto_video_sink_init (GstAutoVideoSink * sink,
 
   gst_auto_video_sink_reset (sink);
 
-  GST_FLAG_SET (sink, GST_ELEMENT_IS_SINK);
+  GST_OBJECT_FLAG_SET (sink, GST_ELEMENT_IS_SINK);
 }
 
 static gboolean
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 31a87adb..b621d21a 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -258,7 +258,7 @@ gst_avimux_init (GstAviMux * avimux)
           "src"), "src");
   gst_element_add_pad (GST_ELEMENT (avimux), avimux->srcpad);
 
-  GST_FLAG_SET (GST_ELEMENT (avimux), GST_ELEMENT_EVENT_AWARE);
+  GST_OBJECT_FLAG_SET (GST_ELEMENT (avimux), GST_ELEMENT_EVENT_AWARE);
 
   avimux->audiosinkpad = NULL;
   avimux->audio_pad_connected = FALSE;
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 2b96aab4..1d3eaae4 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -174,7 +174,7 @@ gst_matroska_demux_init (GstMatroskaDemux * demux)
   GstElementClass *klass = GST_ELEMENT_GET_CLASS (demux);
   gint i;
 
-  GST_FLAG_SET (GST_OBJECT (demux), GST_ELEMENT_EVENT_AWARE);
+  GST_OBJECT_FLAG_SET (GST_OBJECT (demux), GST_ELEMENT_EVENT_AWARE);
 
   demux->sinkpad =
       gst_pad_new_from_template (gst_element_class_get_pad_template (klass,
diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c
index 5eadf866..bbd60c83 100644
--- a/gst/multipart/multipartdemux.c
+++ b/gst/multipart/multipartdemux.c
@@ -163,7 +163,7 @@ gst_multipart_demux_init (GstMultipartDemux * multipart,
   gst_pad_set_chain_function (multipart->sinkpad,
       GST_DEBUG_FUNCPTR (gst_multipart_demux_chain));
 
-  GST_FLAG_SET (multipart, GST_ELEMENT_EVENT_AWARE);
+  GST_OBJECT_FLAG_SET (multipart, GST_ELEMENT_EVENT_AWARE);
 
   multipart->maxlen = 4096;
   multipart->parsing_mime = NULL;
diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c
index a8a6c401..5f55e628 100644
--- a/gst/multipart/multipartmux.c
+++ b/gst/multipart/multipartmux.c
@@ -213,7 +213,7 @@ gst_multipart_mux_init (GstMultipartMux * multipart_mux)
       gst_multipart_mux_handle_src_event);
   gst_element_add_pad (GST_ELEMENT (multipart_mux), multipart_mux->srcpad);
 
-  GST_FLAG_SET (GST_ELEMENT (multipart_mux), GST_ELEMENT_EVENT_AWARE);
+  GST_OBJECT_FLAG_SET (GST_ELEMENT (multipart_mux), GST_ELEMENT_EVENT_AWARE);
 
   multipart_mux->sinkpads = NULL;
   multipart_mux->boundary = g_strdup (DEFAULT_BOUNDARY);
diff --git a/gst/oldcore/gstmultifilesrc.c b/gst/oldcore/gstmultifilesrc.c
index 2d309f4f..cfc3aef7 100644
--- a/gst/oldcore/gstmultifilesrc.c
+++ b/gst/oldcore/gstmultifilesrc.c
@@ -128,7 +128,7 @@ static void
 gst_multifilesrc_init (GstMultiFileSrc * multifilesrc,
     GstMultiFileSrcClass * g_class)
 {
-/*  GST_FLAG_SET (filesrc, GST_SRC_); */
+/*  GST_OBJECT_FLAG_SET (filesrc, GST_SRC_); */
 
   multifilesrc->srcpad =
       gst_pad_new_from_template (gst_static_pad_template_get (&srctemplate),
@@ -221,11 +221,12 @@ gst_multifilesrc_get (GstPad * pad)
   src = GST_MULTIFILESRC (gst_pad_get_parent (pad));
 
   GST_DEBUG ("curfileindex = %d newmedia flag = %s", src->curfileindex,
-      GST_FLAG_IS_SET (src, GST_MULTIFILESRC_NEWFILE) ? "true" : "false");
+      GST_OBJECT_FLAG_IS_SET (src,
+          GST_MULTIFILESRC_NEWFILE) ? "true" : "false");
 
-  switch (GST_FLAG_IS_SET (src, GST_MULTIFILESRC_NEWFILE)) {
+  switch (GST_OBJECT_FLAG_IS_SET (src, GST_MULTIFILESRC_NEWFILE)) {
     case FALSE:
-      if (GST_FLAG_IS_SET (src, GST_MULTIFILESRC_OPEN))
+      if (GST_OBJECT_FLAG_IS_SET (src, GST_MULTIFILESRC_OPEN))
         gst_multifilesrc_close_file (src);
 
       if (!src->listptr) {
@@ -248,14 +249,14 @@ gst_multifilesrc_get (GstPad * pad)
         newmedia =
             gst_event_new_discontinuous (TRUE, GST_FORMAT_TIME, (gint64) 0,
             GST_FORMAT_UNDEFINED);
-        GST_FLAG_SET (src, GST_MULTIFILESRC_NEWFILE);
+        GST_OBJECT_FLAG_SET (src, GST_MULTIFILESRC_NEWFILE);
 
         GST_DEBUG ("sending new media event");
         return GST_DATA (newmedia);
       }
     default:
-      if (GST_FLAG_IS_SET (src, GST_MULTIFILESRC_NEWFILE))
-        GST_FLAG_UNSET (src, GST_MULTIFILESRC_NEWFILE);
+      if (GST_OBJECT_FLAG_IS_SET (src, GST_MULTIFILESRC_NEWFILE))
+        GST_OBJECT_FLAG_UNSET (src, GST_MULTIFILESRC_NEWFILE);
       /* create the buffer */
       /* FIXME: should eventually use a bufferpool for this */
       buf = gst_buffer_new ();
@@ -287,7 +288,8 @@ gst_multifilesrc_get (GstPad * pad)
 static gboolean
 gst_multifilesrc_open_file (GstMultiFileSrc * src, GstPad * srcpad)
 {
-  g_return_val_if_fail (!GST_FLAG_IS_SET (src, GST_MULTIFILESRC_OPEN), FALSE);
+  g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (src, GST_MULTIFILESRC_OPEN),
+      FALSE);
 
   if (src->currentfilename == NULL || src->currentfilename[0] == '\0') {
     GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
@@ -320,7 +322,7 @@ gst_multifilesrc_open_file (GstMultiFileSrc * src, GstPad * srcpad)
           ("mmap call failed."));
       return FALSE;
     }
-    GST_FLAG_SET (src, GST_MULTIFILESRC_OPEN);
+    GST_OBJECT_FLAG_SET (src, GST_MULTIFILESRC_OPEN);
     src->new_seek = TRUE;
   }
   return TRUE;
@@ -330,7 +332,7 @@ gst_multifilesrc_open_file (GstMultiFileSrc * src, GstPad * srcpad)
 static void
 gst_multifilesrc_close_file (GstMultiFileSrc * src)
 {
-  g_return_if_fail (GST_FLAG_IS_SET (src, GST_MULTIFILESRC_OPEN));
+  g_return_if_fail (GST_OBJECT_FLAG_IS_SET (src, GST_MULTIFILESRC_OPEN));
 
   /* unmap the file from memory and close the file */
   munmap (src->map, src->size);
@@ -342,7 +344,7 @@ gst_multifilesrc_close_file (GstMultiFileSrc * src)
   src->map = NULL;
   src->new_seek = FALSE;
 
-  GST_FLAG_UNSET (src, GST_MULTIFILESRC_OPEN);
+  GST_OBJECT_FLAG_UNSET (src, GST_MULTIFILESRC_OPEN);
 }
 
 static GstStateChangeReturn
@@ -352,7 +354,7 @@ gst_multifilesrc_change_state (GstElement * element, GstStateChange transition)
       GST_STATE_CHANGE_FAILURE);
 
   if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
-    if (GST_FLAG_IS_SET (element, GST_MULTIFILESRC_OPEN))
+    if (GST_OBJECT_FLAG_IS_SET (element, GST_MULTIFILESRC_OPEN))
       gst_multifilesrc_close_file (GST_MULTIFILESRC (element));
   }
 
diff --git a/gst/oldcore/gstmultifilesrc.h b/gst/oldcore/gstmultifilesrc.h
index 077d69ec..34fc5991 100644
--- a/gst/oldcore/gstmultifilesrc.h
+++ b/gst/oldcore/gstmultifilesrc.h
@@ -41,10 +41,10 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTIFILESRC))
 
 typedef enum {
-  GST_MULTIFILESRC_OPEN		= GST_ELEMENT_FLAG_LAST,
-  GST_MULTIFILESRC_NEWFILE      = GST_ELEMENT_FLAG_LAST + 2,
+  GST_MULTIFILESRC_OPEN		= (GST_ELEMENT_FLAG_LAST << 0),
+  GST_MULTIFILESRC_NEWFILE      = (GST_ELEMENT_FLAG_LAST << 1)
 
-  GST_MULTIFILESRC_FLAG_LAST	= GST_ELEMENT_FLAG_LAST + 4
+  GST_MULTIFILESRC_FLAG_LAST	= (GST_ELEMENT_FLAG_LAST << 2)
 } GstMultiFileSrcFlags;
 
 typedef struct _GstMultiFileSrc GstMultiFileSrc;
diff --git a/gst/oldcore/gstpipefilter.c b/gst/oldcore/gstpipefilter.c
index c171760f..678551b9 100644
--- a/gst/oldcore/gstpipefilter.c
+++ b/gst/oldcore/gstpipefilter.c
@@ -121,7 +121,7 @@ gst_pipefilter_class_init (GstPipefilterClass * klass)
 static void
 gst_pipefilter_init (GstPipefilter * pipefilter, GstPipefilterClass * g_class)
 {
-  GST_FLAG_SET (pipefilter, GST_ELEMENT_DECOUPLED);
+  GST_OBJECT_FLAG_SET (pipefilter, GST_ELEMENT_DECOUPLED);
 
   pipefilter->sinkpad =
       gst_pad_new_from_template (gst_static_pad_template_get (&sinktemplate),
@@ -283,7 +283,8 @@ gst_pipefilter_get_property (GObject * object, guint prop_id, GValue * value,
 static gboolean
 gst_pipefilter_open_file (GstPipefilter * src)
 {
-  g_return_val_if_fail (!GST_FLAG_IS_SET (src, GST_PIPEFILTER_OPEN), FALSE);
+  g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (src, GST_PIPEFILTER_OPEN),
+      FALSE);
 
   pipe (src->fdin);
   pipe (src->fdout);
@@ -309,7 +310,7 @@ gst_pipefilter_open_file (GstPipefilter * src)
     close (src->fdout[1]);
   }
 
-  GST_FLAG_SET (src, GST_PIPEFILTER_OPEN);
+  GST_OBJECT_FLAG_SET (src, GST_PIPEFILTER_OPEN);
   return TRUE;
 }
 
@@ -317,7 +318,7 @@ gst_pipefilter_open_file (GstPipefilter * src)
 static void
 gst_pipefilter_close_file (GstPipefilter * src)
 {
-  g_return_if_fail (GST_FLAG_IS_SET (src, GST_PIPEFILTER_OPEN));
+  g_return_if_fail (GST_OBJECT_FLAG_IS_SET (src, GST_PIPEFILTER_OPEN));
 
   /* close the file */
   close (src->fdout[0]);
@@ -329,7 +330,7 @@ gst_pipefilter_close_file (GstPipefilter * src)
   src->curoffset = 0;
   src->seq = 0;
 
-  GST_FLAG_UNSET (src, GST_PIPEFILTER_OPEN);
+  GST_OBJECT_FLAG_UNSET (src, GST_PIPEFILTER_OPEN);
 }
 
 static GstStateChangeReturn
@@ -339,11 +340,11 @@ gst_pipefilter_change_state (GstElement * element, GstStateChange transition)
 
   /* if going down into NULL state, close the file if it's open */
   if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
-    if (GST_FLAG_IS_SET (element, GST_PIPEFILTER_OPEN))
+    if (GST_OBJECT_FLAG_IS_SET (element, GST_PIPEFILTER_OPEN))
       gst_pipefilter_close_file (GST_PIPEFILTER (element));
     /* otherwise (READY or higher) we need to open the file */
   } else {
-    if (!GST_FLAG_IS_SET (element, GST_PIPEFILTER_OPEN)) {
+    if (!GST_OBJECT_FLAG_IS_SET (element, GST_PIPEFILTER_OPEN)) {
       if (!gst_pipefilter_open_file (GST_PIPEFILTER (element)))
         return GST_STATE_CHANGE_FAILURE;
     }
diff --git a/gst/oldcore/gstpipefilter.h b/gst/oldcore/gstpipefilter.h
index 08c3a471..281375d4 100644
--- a/gst/oldcore/gstpipefilter.h
+++ b/gst/oldcore/gstpipefilter.h
@@ -42,9 +42,9 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PIPEFILTER))
 
 typedef enum {
-  GST_PIPEFILTER_OPEN		= GST_ELEMENT_FLAG_LAST,
+  GST_PIPEFILTER_OPEN		= (GST_ELEMENT_FLAG_LAST << 0),
 
-  GST_PIPEFILTER_FLAG_LAST	= GST_ELEMENT_FLAG_LAST + 2
+  GST_PIPEFILTER_FLAG_LAST	= (GST_ELEMENT_FLAG_LAST << 2)
 } GstPipeFilterFlags;
 
 typedef struct _GstPipefilter GstPipefilter;
diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c
index 97d1dd5f..70634564 100644
--- a/gst/smoothwave/gstsmoothwave.c
+++ b/gst/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/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index 71e591d2..425be70b 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -490,7 +490,7 @@ gst_videomixer_init (GstVideoMixer * mix)
   gst_pad_set_event_function (mix->srcpad, gst_videomixer_handle_src_event);
   gst_element_add_pad (GST_ELEMENT (mix), mix->srcpad);
 
-  GST_FLAG_SET (GST_ELEMENT (mix), GST_ELEMENT_EVENT_AWARE);
+  GST_OBJECT_FLAG_SET (GST_ELEMENT (mix), GST_ELEMENT_EVENT_AWARE);
 
   mix->sinkpads = NULL;
   mix->background = DEFAULT_BACKGROUND;
diff --git a/sys/osxaudio/gstosxaudiosink.c b/sys/osxaudio/gstosxaudiosink.c
index 593335e3..2f4e27bc 100644
--- a/sys/osxaudio/gstosxaudiosink.c
+++ b/sys/osxaudio/gstosxaudiosink.c
@@ -146,8 +146,8 @@ gst_osxaudiosink_init (GstOsxAudioSink * osxaudiosink)
 
   GST_DEBUG ("initializing osxaudiosink");
 
-  GST_FLAG_SET (osxaudiosink, GST_ELEMENT_THREAD_SUGGESTED);
-  GST_FLAG_SET (osxaudiosink, GST_ELEMENT_EVENT_AWARE);
+  GST_OBJECT_FLAG_SET (osxaudiosink, GST_ELEMENT_THREAD_SUGGESTED);
+  GST_OBJECT_FLAG_SET (osxaudiosink, GST_ELEMENT_EVENT_AWARE);
 }
 
 static void
diff --git a/sys/osxaudio/gstosxaudiosink.h b/sys/osxaudio/gstosxaudiosink.h
index 8cffa2be..87cbf7e2 100644
--- a/sys/osxaudio/gstosxaudiosink.h
+++ b/sys/osxaudio/gstosxaudiosink.h
@@ -44,9 +44,9 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSXAUDIOSINK))
 
 typedef enum {
-  GST_OSXAUDIOSINK_OPEN		= GST_ELEMENT_FLAG_LAST,
+  GST_OSXAUDIOSINK_OPEN		= (GST_ELEMENT_FLAG_LAST << 0),
 
-  GST_OSXAUDIOSINK_FLAG_LAST	= GST_ELEMENT_FLAG_LAST+2,
+  GST_OSXAUDIOSINK_FLAG_LAST	= (GST_ELEMENT_FLAG_LAST << 2)
 } GstOsxAudioSinkFlags;
 
 typedef struct _GstOsxAudioSink GstOsxAudioSink;
diff --git a/sys/osxaudio/gstosxaudiosrc.h b/sys/osxaudio/gstosxaudiosrc.h
index bef9decf..9c70980a 100644
--- a/sys/osxaudio/gstosxaudiosrc.h
+++ b/sys/osxaudio/gstosxaudiosrc.h
@@ -42,9 +42,9 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSXAUDIOSRC))
 
 typedef enum {
-  GST_OSXAUDIOSRC_OPEN		= GST_ELEMENT_FLAG_LAST,
+  GST_OSXAUDIOSRC_OPEN		= (GST_ELEMENT_FLAG_LAST << 0),
 
-  GST_OSXAUDIOSRC_FLAG_LAST	= GST_ELEMENT_FLAG_LAST+2,
+  GST_OSXAUDIOSRC_FLAG_LAST	= (GST_ELEMENT_FLAG_LAST << 2)
 } GstOsxAudioSrcFlags;
 
 typedef struct _GstOsxAudioSrc GstOsxAudioSrc;