From 987ab4dd81113c7a181eafaeb47ffaad3636210b Mon Sep 17 00:00:00 2001 From: Stefan Kost 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 --- sys/osxaudio/gstosxaudiosink.c | 4 ++-- sys/osxaudio/gstosxaudiosink.h | 4 ++-- sys/osxaudio/gstosxaudiosrc.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/osxaudio') 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; -- cgit