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 --- gst/multifilesink/gstmultifilesink.c | 47 ++++++++++++++++++++---------------- gst/multifilesink/gstmultifilesink.h | 6 ++--- 2 files changed, 29 insertions(+), 24 deletions(-) (limited to 'gst/multifilesink') diff --git a/gst/multifilesink/gstmultifilesink.c b/gst/multifilesink/gstmultifilesink.c index 4f320468..1c96ef8a 100644 --- a/gst/multifilesink/gstmultifilesink.c +++ b/gst/multifilesink/gstmultifilesink.c @@ -170,7 +170,7 @@ gst_multifilesink_init (GstMultiFileSink * filesink, gst_element_add_pad (GST_ELEMENT (filesink), pad); gst_pad_set_chain_function (pad, gst_multifilesink_chain); - GST_FLAG_SET (GST_ELEMENT (filesink), GST_ELEMENT_EVENT_AWARE); + GST_OBJECT_FLAG_SET (GST_ELEMENT (filesink), GST_ELEMENT_EVENT_AWARE); gst_pad_set_query_function (pad, gst_multifilesink_pad_query); gst_pad_set_query_type_function (pad, gst_multifilesink_get_query_types); @@ -207,11 +207,11 @@ gst_multifilesink_set_location (GstMultiFileSink * sink, const gchar * location) /* the element must be stopped or paused in order to do this or in newfile signal */ if (GST_STATE (sink) > GST_STATE_PAUSED && - !GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE)) + !GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE)) return FALSE; if (GST_STATE (sink) == GST_STATE_PAUSED && - (GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN) || - !GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE))) + (GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN) || + !GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE))) return FALSE; @@ -228,7 +228,7 @@ gst_multifilesink_set_location (GstMultiFileSink * sink, const gchar * location) } if (GST_STATE (sink) == GST_STATE_PAUSED && - !GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE)) + !GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE)) gst_multifilesink_open_file (sink); return TRUE; @@ -275,7 +275,8 @@ gst_multifilesink_get_property (GObject * object, guint prop_id, GValue * value, static gboolean gst_multifilesink_open_file (GstMultiFileSink * sink) { - g_return_val_if_fail (!GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN), FALSE); + g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN), + FALSE); /* open the file */ if (sink->curfilename == NULL || sink->curfilename[0] == '\0') { @@ -292,7 +293,7 @@ gst_multifilesink_open_file (GstMultiFileSink * sink) return FALSE; } - GST_FLAG_SET (sink, GST_MULTIFILESINK_OPEN); + GST_OBJECT_FLAG_SET (sink, GST_MULTIFILESINK_OPEN); sink->data_written = 0; sink->curfileindex++; @@ -303,13 +304,13 @@ gst_multifilesink_open_file (GstMultiFileSink * sink) static void gst_multifilesink_close_file (GstMultiFileSink * sink) { - g_return_if_fail (GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN)); + g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN)); if (fclose (sink->file) != 0) { GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, (_("Error closing file \"%s\"."), sink->curfilename), GST_ERROR_SYSTEM); } else { - GST_FLAG_UNSET (sink, GST_MULTIFILESINK_OPEN); + GST_OBJECT_FLAG_UNSET (sink, GST_MULTIFILESINK_OPEN); } } @@ -317,16 +318,18 @@ static gboolean gst_multifilesink_next_file (GstMultiFileSink * sink) { GST_DEBUG ("next file"); - g_return_val_if_fail (GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN), FALSE); + g_return_val_if_fail (GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN), + FALSE); if (fclose (sink->file) != 0) { GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, (_("Error closing file \"%s\"."), sink->curfilename), GST_ERROR_SYSTEM); } else { - GST_FLAG_UNSET (sink, GST_MULTIFILESINK_OPEN); + GST_OBJECT_FLAG_UNSET (sink, GST_MULTIFILESINK_OPEN); } - g_return_val_if_fail (!GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN), FALSE); + g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN), + FALSE); if (sink->curfilename) g_free (sink->curfilename); if (sink->uri) @@ -349,7 +352,7 @@ gst_multifilesink_next_file (GstMultiFileSink * sink) return FALSE; } - GST_FLAG_SET (sink, GST_MULTIFILESINK_OPEN); + GST_OBJECT_FLAG_SET (sink, GST_MULTIFILESINK_OPEN); sink->data_written = 0; if (sink->streamheader) { GSList *l; @@ -394,7 +397,8 @@ gst_multifilesink_pad_query (GstPad * pad, GstQueryType type, case GST_QUERY_TOTAL: switch (*format) { case GST_FORMAT_BYTES: - if (GST_FLAG_IS_SET (GST_ELEMENT (sink), GST_MULTIFILESINK_OPEN)) { + if (GST_OBJECT_FLAG_IS_SET (GST_ELEMENT (sink), + GST_MULTIFILESINK_OPEN)) { *value = sink->data_written; /* FIXME - doesn't the kernel provide such a function? */ break; @@ -406,7 +410,8 @@ gst_multifilesink_pad_query (GstPad * pad, GstQueryType type, case GST_QUERY_POSITION: switch (*format) { case GST_FORMAT_BYTES: - if (GST_FLAG_IS_SET (GST_ELEMENT (sink), GST_MULTIFILESINK_OPEN)) { + if (GST_OBJECT_FLAG_IS_SET (GST_ELEMENT (sink), + GST_MULTIFILESINK_OPEN)) { *value = ftell (sink->file); break; } @@ -431,7 +436,7 @@ gst_multifilesink_handle_event (GstPad * pad, GstEvent * event) filesink = GST_MULTIFILESINK (gst_pad_get_parent (pad)); - if (!(GST_FLAG_IS_SET (filesink, GST_MULTIFILESINK_OPEN))) { + if (!(GST_OBJECT_FLAG_IS_SET (filesink, GST_MULTIFILESINK_OPEN))) { gst_event_unref (event); return FALSE; } @@ -478,10 +483,10 @@ gst_multifilesink_handle_event (GstPad * pad, GstEvent * event) if (GST_EVENT_DISCONT_NEW_MEDIA (event)) { /* do not create a new file on the first new media discont */ if (filesink->numfiles > 0) { - GST_FLAG_SET (filesink, GST_MULTIFILESINK_NEWFILE); + GST_OBJECT_FLAG_SET (filesink, GST_MULTIFILESINK_NEWFILE); g_signal_emit (G_OBJECT (filesink), gst_multifilesink_signals[SIGNAL_NEWFILE], 0); - GST_FLAG_UNSET (filesink, GST_MULTIFILESINK_NEWFILE); + GST_OBJECT_FLAG_UNSET (filesink, GST_MULTIFILESINK_NEWFILE); if (!gst_multifilesink_next_file (filesink)) GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE, (_("Error switching files to \"%s\"."), @@ -557,7 +562,7 @@ gst_multifilesink_chain (GstPad * pad, GstData * _data) gst_buffer_ref (buf); filesink->streamheader = g_slist_append (filesink->streamheader, buf); } - if (GST_FLAG_IS_SET (filesink, GST_MULTIFILESINK_OPEN)) { + if (GST_OBJECT_FLAG_IS_SET (filesink, GST_MULTIFILESINK_OPEN)) { guint bytes_written = 0, back_pending = 0; @@ -595,12 +600,12 @@ gst_multifilesink_change_state (GstElement * element, GstStateChange transition) switch (transition) { case GST_STATE_CHANGE_PAUSED_TO_READY: - if (GST_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN)) + if (GST_OBJECT_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN)) gst_multifilesink_close_file (GST_MULTIFILESINK (element)); break; case GST_STATE_CHANGE_READY_TO_PAUSED: - if (!GST_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN)) { + if (!GST_OBJECT_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN)) { if (!gst_multifilesink_open_file (GST_MULTIFILESINK (element))) return GST_STATE_CHANGE_FAILURE; } diff --git a/gst/multifilesink/gstmultifilesink.h b/gst/multifilesink/gstmultifilesink.h index 4177f60a..89a741a0 100644 --- a/gst/multifilesink/gstmultifilesink.h +++ b/gst/multifilesink/gstmultifilesink.h @@ -44,10 +44,10 @@ typedef struct _GstMultiFileSink GstMultiFileSink; typedef struct _GstMultiFileSinkClass GstMultiFileSinkClass; typedef enum { - GST_MULTIFILESINK_OPEN = GST_ELEMENT_FLAG_LAST, - GST_MULTIFILESINK_NEWFILE = GST_ELEMENT_FLAG_LAST +2, + GST_MULTIFILESINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0), + GST_MULTIFILESINK_NEWFILE = (GST_ELEMENT_FLAG_LAST << 1), - GST_MULTIFILESINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 4 + GST_MULTIFILESINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 4) } GstMultiFileSinkFlags; struct _GstMultiFileSink { -- cgit v1.2.1