From 987ab4dd81113c7a181eafaeb47ffaad3636210b Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sourceforge.net>
Date: Wed, 12 Oct 2005 14:29:43 +0000
Subject: 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
---
 ext/esd/esdmon.c | 8 ++++----
 ext/esd/esdmon.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'ext/esd')

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;
-- 
cgit