From 36c2fc253b99cd06f027e9359bf984430892f57c Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 12 Oct 2005 14:29:55 +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/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 --- sys/vcd/vcdsrc.c | 18 +++++++++--------- sys/vcd/vcdsrc.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sys/vcd') diff --git a/sys/vcd/vcdsrc.c b/sys/vcd/vcdsrc.c index a6f06b88..107dbb51 100644 --- a/sys/vcd/vcdsrc.c +++ b/sys/vcd/vcdsrc.c @@ -219,7 +219,7 @@ gst_vcdsrc_set_property (GObject * object, guint prop_id, const GValue * value, case ARG_DEVICE: case ARG_LOCATION: /* the element must be stopped in order to do this */ -/* g_return_if_fail(!GST_FLAG_IS_SET(src,GST_STATE_RUNNING)); */ +/* g_return_if_fail(!GST_OBJECT_FLAG_IS_SET(src,GST_STATE_RUNNING)); */ g_free (src->device); /* clear the filename if we get a NULL (is that possible?) */ @@ -411,7 +411,7 @@ gst_vcdsrc_get (GstPad * pad) g_return_val_if_fail (GST_IS_PAD (pad), NULL); vcdsrc = GST_VCDSRC (GST_OBJECT_PARENT (pad)); - g_return_val_if_fail (GST_FLAG_IS_SET (vcdsrc, VCDSRC_OPEN), NULL); + g_return_val_if_fail (GST_OBJECT_FLAG_IS_SET (vcdsrc, VCDSRC_OPEN), NULL); offset = vcdsrc->trackoffset + vcdsrc->curoffset; if (offset >= gst_vcdsrc_msf (vcdsrc, vcdsrc->track + 1)) { @@ -484,7 +484,7 @@ gst_vcdsrc_open_file (GstVCDSrc * src) { int i; - g_return_val_if_fail (!GST_FLAG_IS_SET (src, VCDSRC_OPEN), FALSE); + g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (src, VCDSRC_OPEN), FALSE); /* open the device */ src->fd = open (src->device, O_RDONLY); @@ -520,7 +520,7 @@ gst_vcdsrc_open_file (GstVCDSrc * src) src->tracks[i].cdte_addr.msf.frame); } - GST_FLAG_SET (src, VCDSRC_OPEN); + GST_OBJECT_FLAG_SET (src, VCDSRC_OPEN); gst_vcdsrc_recalculate (src); return TRUE; @@ -530,7 +530,7 @@ gst_vcdsrc_open_file (GstVCDSrc * src) static void gst_vcdsrc_close_file (GstVCDSrc * src) { - g_return_if_fail (GST_FLAG_IS_SET (src, VCDSRC_OPEN)); + g_return_if_fail (GST_OBJECT_FLAG_IS_SET (src, VCDSRC_OPEN)); /* close the file */ close (src->fd); @@ -542,7 +542,7 @@ gst_vcdsrc_close_file (GstVCDSrc * src) g_free (src->tracks); - GST_FLAG_UNSET (src, VCDSRC_OPEN); + GST_OBJECT_FLAG_UNSET (src, VCDSRC_OPEN); } static GstStateChangeReturn @@ -552,7 +552,7 @@ gst_vcdsrc_change_state (GstElement * element, GstStateChange transition) switch (transition) { case GST_STATE_CHANGE_READY_TO_NULL: - if (GST_FLAG_IS_SET (element, VCDSRC_OPEN)) + if (GST_OBJECT_FLAG_IS_SET (element, VCDSRC_OPEN)) gst_vcdsrc_close_file (vcdsrc); break; case GST_STATE_CHANGE_PAUSED_TO_READY: @@ -560,7 +560,7 @@ gst_vcdsrc_change_state (GstElement * element, GstStateChange transition) vcdsrc->discont = vcdsrc->flush = FALSE; break; case GST_STATE_CHANGE_NULL_TO_READY: - if (!GST_FLAG_IS_SET (element, VCDSRC_OPEN)) + if (!GST_OBJECT_FLAG_IS_SET (element, VCDSRC_OPEN)) if (!gst_vcdsrc_open_file (vcdsrc)) return GST_STATE_CHANGE_FAILURE; break; @@ -585,7 +585,7 @@ gst_vcdsrc_msf (GstVCDSrc * vcdsrc, gint track) static void gst_vcdsrc_recalculate (GstVCDSrc * vcdsrc) { - if (GST_FLAG_IS_SET (vcdsrc, VCDSRC_OPEN)) { + if (GST_OBJECT_FLAG_IS_SET (vcdsrc, VCDSRC_OPEN)) { /* calculate track offset (beginning of track) */ vcdsrc->trackoffset = gst_vcdsrc_msf (vcdsrc, vcdsrc->track); GST_DEBUG ("track offset is %ld", vcdsrc->trackoffset); diff --git a/sys/vcd/vcdsrc.h b/sys/vcd/vcdsrc.h index 2ab0e49b..0c349846 100644 --- a/sys/vcd/vcdsrc.h +++ b/sys/vcd/vcdsrc.h @@ -41,9 +41,9 @@ G_BEGIN_DECLS /* NOTE: per-element flags start with 16 for now */ typedef enum { - VCDSRC_OPEN = GST_ELEMENT_FLAG_LAST, + VCDSRC_OPEN = (GST_ELEMENT_FLAG_LAST << 0), - VCDSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2, + VCDSRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2), } GstVCDSrcFlags; typedef struct _GstVCDSrc GstVCDSrc; -- cgit v1.2.1