mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-07 23:25:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

renamed GST_FLAGS macros to GST_OBJECT_FLAGS moved bitshift from macro to enum definition

Browse source 
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
This commit is contained in:
Stefan Kost 2005-10-12 14:29:55 +00:00
parent e9cfa88c70
commit 36c2fc253b
51 changed files with 251 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
ChangeLog
View file

@ -1,3 +1,79 @@
2005-10-12 Stefan Kost <ensonic@users.sf.net>
* 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
2005-10-12 Josef Zlomek <josef dot zlomek at xeris dot cz> 2005-10-12 Josef Zlomek <josef dot zlomek at xeris dot cz>
Reviewed by: Tim-Philipp Müller <tim at centricular dot net> Reviewed by: Tim-Philipp Müller <tim at centricular dot net>

2
examples/indexing/indexmpeg.c
View file

@ -272,7 +272,7 @@ main (gint argc, gchar * argv[])
gst_element_set_state (pipeline, GST_STATE_PAUSED); gst_element_set_state (pipeline, GST_STATE_PAUSED);
if (index) 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"); src = gst_bin_get_by_name (GST_BIN (pipeline), "video_decoder");

8
ext/artsd/gstartsdsink.c
View file

@ -304,7 +304,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
/* FIXME: check connection */ /* FIXME: check connection */
/* GST_DEBUG ("artsdsink: can't open connection to aRtsd server"); */ /* GST_DEBUG ("artsdsink: can't open connection to aRtsd server"); */
GST_FLAG_SET (sink, GST_ARTSDSINK_OPEN); GST_OBJECT_FLAG_SET (sink, GST_ARTSDSINK_OPEN);
sink->connected = TRUE; sink->connected = TRUE;
return TRUE; return TRUE;
@ -318,7 +318,7 @@ gst_artsdsink_close_audio (GstArtsdsink * sink)
arts_close_stream (sink->stream); arts_close_stream (sink->stream);
arts_free (); arts_free ();
GST_FLAG_UNSET (sink, GST_ARTSDSINK_OPEN); GST_OBJECT_FLAG_UNSET (sink, GST_ARTSDSINK_OPEN);
sink->connected = FALSE; sink->connected = FALSE;
g_print ("artsdsink: closed connection\n"); g_print ("artsdsink: closed connection\n");
@ -331,11 +331,11 @@ gst_artsdsink_change_state (GstElement * element, GstStateChange transition)
/* if going down into NULL state, close the stream if it's open */ /* if going down into NULL state, close the stream if it's open */
if (GST_STATE_PENDING (element) == GST_STATE_NULL) { if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
if (GST_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN)) if (GST_OBJECT_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN))
gst_artsdsink_close_audio (GST_ARTSDSINK (element)); gst_artsdsink_close_audio (GST_ARTSDSINK (element));
/* otherwise (READY or higher) we need to open the stream */ /* otherwise (READY or higher) we need to open the stream */
} else { } else {
if (!GST_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN)) {
if (!gst_artsdsink_open_audio (GST_ARTSDSINK (element))) if (!gst_artsdsink_open_audio (GST_ARTSDSINK (element)))
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }

4
ext/artsd/gstartsdsink.h
View file

@ -41,8 +41,8 @@ extern "C" {
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ARTSDSINK)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ARTSDSINK))
typedef enum { typedef enum {
GST_ARTSDSINK_OPEN = GST_ELEMENT_FLAG_LAST, GST_ARTSDSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0)
GST_ARTSDSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2, GST_ARTSDSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstArtsdSinkFlags; } GstArtsdSinkFlags;
typedef struct _GstArtsdsink GstArtsdsink; typedef struct _GstArtsdsink GstArtsdsink;

9
ext/audiofile/gstafparse.c
View file

@ -342,7 +342,8 @@ gst_afparse_plugin_init (GstPlugin * plugin)
static gboolean static gboolean
gst_afparse_open_file (GstAFParse * afparse) gst_afparse_open_file (GstAFParse * afparse)
{ {
g_return_val_if_fail (!GST_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN), FALSE); g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN),
FALSE);
/* open the file */ /* open the file */
@ -391,7 +392,7 @@ gst_afparse_open_file (GstAFParse * afparse)
"rate", G_TYPE_INT, afparse->rate, "rate", G_TYPE_INT, afparse->rate,
"channels", G_TYPE_INT, afparse->channels, NULL)); "channels", G_TYPE_INT, afparse->channels, NULL));
GST_FLAG_SET (afparse, GST_AFPARSE_OPEN); GST_OBJECT_FLAG_SET (afparse, GST_AFPARSE_OPEN);
return TRUE; return TRUE;
} }
@ -399,11 +400,11 @@ gst_afparse_open_file (GstAFParse * afparse)
static void static void
gst_afparse_close_file (GstAFParse * afparse) gst_afparse_close_file (GstAFParse * afparse)
{ {
g_return_if_fail (GST_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN)); g_return_if_fail (GST_OBJECT_FLAG_IS_SET (afparse, GST_AFPARSE_OPEN));
if (afCloseFile (afparse->file) != 0) { if (afCloseFile (afparse->file) != 0) {
g_warning ("afparse: oops, error closing !\n"); g_warning ("afparse: oops, error closing !\n");
} else { } else {
GST_FLAG_UNSET (afparse, GST_AFPARSE_OPEN); GST_OBJECT_FLAG_UNSET (afparse, GST_AFPARSE_OPEN);
} }
} }

4
ext/audiofile/gstafparse.h
View file

@ -54,9 +54,9 @@ typedef struct _GstAFParse GstAFParse;
typedef struct _GstAFParseClass GstAFParseClass; typedef struct _GstAFParseClass GstAFParseClass;
typedef enum { typedef enum {
GST_AFPARSE_OPEN = GST_ELEMENT_FLAG_LAST, GST_AFPARSE_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_AFPARSE_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_AFPARSE_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstAFParseFlags; } GstAFParseFlags;
struct _GstAFParse { struct _GstAFParse {

18
ext/audiofile/gstafsink.c
View file

@ -292,7 +292,7 @@ gst_afsink_open_file (GstAFSink * sink)
int sample_format; /* audiofile's sample format, look in audiofile.h */ int sample_format; /* audiofile's sample format, look in audiofile.h */
int byte_order = 0; /* audiofile's byte order defines */ int byte_order = 0; /* audiofile's byte order defines */
g_return_val_if_fail (!GST_FLAG_IS_SET (sink, GST_AFSINK_OPEN), FALSE); g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, GST_AFSINK_OPEN), FALSE);
/* get the audio parameters */ /* get the audio parameters */
g_return_val_if_fail (GST_IS_PAD (sink->sinkpad), FALSE); g_return_val_if_fail (GST_IS_PAD (sink->sinkpad), FALSE);
@ -348,7 +348,7 @@ gst_afsink_open_file (GstAFSink * sink)
afFreeFileSetup (outfilesetup); afFreeFileSetup (outfilesetup);
/* afSetVirtualByteOrder (sink->file, AF_DEFAULT_TRACK, byte_order); */ /* afSetVirtualByteOrder (sink->file, AF_DEFAULT_TRACK, byte_order); */
GST_FLAG_SET (sink, GST_AFSINK_OPEN); GST_OBJECT_FLAG_SET (sink, GST_AFSINK_OPEN);
return TRUE; return TRUE;
} }
@ -357,14 +357,14 @@ static void
gst_afsink_close_file (GstAFSink * sink) gst_afsink_close_file (GstAFSink * sink)
{ {
/* g_print ("DEBUG: closing sinkfile...\n"); */ /* g_print ("DEBUG: closing sinkfile...\n"); */
g_return_if_fail (GST_FLAG_IS_SET (sink, GST_AFSINK_OPEN)); g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, GST_AFSINK_OPEN));
/* g_print ("DEBUG: past flag test\n"); */ /* g_print ("DEBUG: past flag test\n"); */
/* if (fclose (sink->file) != 0) */ /* if (fclose (sink->file) != 0) */
if (afCloseFile (sink->file) != 0) { if (afCloseFile (sink->file) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
(_("Error closing file \"%s\"."), sink->filename), GST_ERROR_SYSTEM); (_("Error closing file \"%s\"."), sink->filename), GST_ERROR_SYSTEM);
} else { } else {
GST_FLAG_UNSET (sink, GST_AFSINK_OPEN); GST_OBJECT_FLAG_UNSET (sink, GST_AFSINK_OPEN);
} }
} }
@ -393,7 +393,7 @@ gst_afsink_chain (GstPad * pad, GstData * _data)
buf = GST_BUFFER (_data); buf = GST_BUFFER (_data);
afsink = GST_AFSINK (gst_pad_get_parent (pad)); afsink = GST_AFSINK (gst_pad_get_parent (pad));
/* we use audiofile now /* we use audiofile now
if (GST_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) if (GST_OBJECT_FLAG_IS_SET (afsink, GST_AFSINK_OPEN))
{ {
bytes_written = fwrite (GST_BUFFER_DATA (buf), 1, GST_BUFFER_SIZE (buf), afsink->file); bytes_written = fwrite (GST_BUFFER_DATA (buf), 1, GST_BUFFER_SIZE (buf), afsink->file);
if (bytes_written < GST_BUFFER_SIZE (buf)) if (bytes_written < GST_BUFFER_SIZE (buf))
@ -404,14 +404,14 @@ gst_afsink_chain (GstPad * pad, GstData * _data)
} }
*/ */
if (!GST_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) {
/* it's not open yet, open it */ /* it's not open yet, open it */
if (!gst_afsink_open_file (afsink)) if (!gst_afsink_open_file (afsink))
g_print ("WARNING: gstafsink: can't open file !\n"); g_print ("WARNING: gstafsink: can't open file !\n");
/* return FALSE; Can't return value */ /* return FALSE; Can't return value */
} }
if (GST_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (afsink, GST_AFSINK_OPEN)) {
int frameCount = 0; int frameCount = 0;
frameCount = frameCount =
@ -437,7 +437,7 @@ gst_afsink_change_state (GstElement * element, GstStateChange transition)
/* if going to NULL? then close the file */ /* if going to NULL? then close the file */
if (GST_STATE_PENDING (element) == GST_STATE_NULL) { if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
/* printf ("DEBUG: afsink state change: null pending\n"); */ /* printf ("DEBUG: afsink state change: null pending\n"); */
if (GST_FLAG_IS_SET (element, GST_AFSINK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (element, GST_AFSINK_OPEN)) {
/* g_print ("DEBUG: trying to close the sink file\n"); */ /* g_print ("DEBUG: trying to close the sink file\n"); */
gst_afsink_close_file (GST_AFSINK (element)); gst_afsink_close_file (GST_AFSINK (element));
} }
@ -449,7 +449,7 @@ gst_afsink_change_state (GstElement * element, GstStateChange transition)
the caps are set and can be known the caps are set and can be known
{ {
g_print ("DEBUG: it's not going to null\n"); g_print ("DEBUG: it's not going to null\n");
if (!GST_FLAG_IS_SET (element, GST_AFSINK_OPEN)) if (!GST_OBJECT_FLAG_IS_SET (element, GST_AFSINK_OPEN))
{ {
g_print ("DEBUG: GST_AFSINK_OPEN not set\n"); g_print ("DEBUG: GST_AFSINK_OPEN not set\n");
if (!gst_afsink_open_file (GST_AFSINK (element))) if (!gst_afsink_open_file (GST_AFSINK (element)))

4
ext/audiofile/gstafsink.h
View file

@ -52,9 +52,9 @@ typedef struct _GstAFSink GstAFSink;
typedef struct _GstAFSinkClass GstAFSinkClass; typedef struct _GstAFSinkClass GstAFSinkClass;
typedef enum { typedef enum {
GST_AFSINK_OPEN = GST_ELEMENT_FLAG_LAST, GST_AFSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_AFSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_AFSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstAFSinkFlags; } GstAFSinkFlags;
struct _GstAFSink { struct _GstAFSink {

12
ext/audiofile/gstafsrc.c
View file

@ -308,7 +308,7 @@ gst_afsrc_plugin_init (GstPlugin * plugin)
static gboolean static gboolean
gst_afsrc_open_file (GstAFSrc * src) gst_afsrc_open_file (GstAFSrc * src)
{ {
g_return_val_if_fail (!GST_FLAG_IS_SET (src, GST_AFSRC_OPEN), FALSE); g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (src, GST_AFSRC_OPEN), FALSE);
/* open the file */ /* open the file */
src->file = afOpenFile (src->filename, "r", AF_NULL_FILESETUP); src->file = afOpenFile (src->filename, "r", AF_NULL_FILESETUP);
@ -353,7 +353,7 @@ gst_afsrc_open_file (GstAFSrc * src)
"rate", G_TYPE_INT, src->rate, "rate", G_TYPE_INT, src->rate,
"channels", G_TYPE_INT, src->channels, NULL)); "channels", G_TYPE_INT, src->channels, NULL));
GST_FLAG_SET (src, GST_AFSRC_OPEN); GST_OBJECT_FLAG_SET (src, GST_AFSRC_OPEN);
return TRUE; return TRUE;
} }
@ -362,14 +362,14 @@ static void
gst_afsrc_close_file (GstAFSrc * src) gst_afsrc_close_file (GstAFSrc * src)
{ {
/* g_print ("DEBUG: closing srcfile...\n"); */ /* g_print ("DEBUG: closing srcfile...\n"); */
g_return_if_fail (GST_FLAG_IS_SET (src, GST_AFSRC_OPEN)); g_return_if_fail (GST_OBJECT_FLAG_IS_SET (src, GST_AFSRC_OPEN));
/* g_print ("DEBUG: past flag test\n"); */ /* g_print ("DEBUG: past flag test\n"); */
/* if (fclose (src->file) != 0) */ /* if (fclose (src->file) != 0) */
if (afCloseFile (src->file) != 0) { if (afCloseFile (src->file) != 0) {
GST_ELEMENT_ERROR (src, RESOURCE, CLOSE, GST_ELEMENT_ERROR (src, RESOURCE, CLOSE,
(_("Error closing file \"%s\"."), src->filename), GST_ERROR_SYSTEM); (_("Error closing file \"%s\"."), src->filename), GST_ERROR_SYSTEM);
} else { } else {
GST_FLAG_UNSET (src, GST_AFSRC_OPEN); GST_OBJECT_FLAG_UNSET (src, GST_AFSRC_OPEN);
} }
} }
@ -381,13 +381,13 @@ gst_afsrc_change_state (GstElement * element, GstStateChange transition)
/* if going to NULL then close the file */ /* if going to NULL then close the file */
if (GST_STATE_PENDING (element) == GST_STATE_NULL) { if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
/* printf ("DEBUG: afsrc state change: null pending\n"); */ /* printf ("DEBUG: afsrc state change: null pending\n"); */
if (GST_FLAG_IS_SET (element, GST_AFSRC_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (element, GST_AFSRC_OPEN)) {
/* g_print ("DEBUG: trying to close the src file\n"); */ /* g_print ("DEBUG: trying to close the src file\n"); */
gst_afsrc_close_file (GST_AFSRC (element)); gst_afsrc_close_file (GST_AFSRC (element));
} }
} else if (GST_STATE_PENDING (element) == GST_STATE_READY) { } else if (GST_STATE_PENDING (element) == GST_STATE_READY) {
/* g_print ("DEBUG: afsrc: ready state pending. This shouldn't happen at the *end* of a stream\n"); */ /* g_print ("DEBUG: afsrc: ready state pending. This shouldn't happen at the *end* of a stream\n"); */
if (!GST_FLAG_IS_SET (element, GST_AFSRC_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (element, GST_AFSRC_OPEN)) {
/* g_print ("DEBUG: GST_AFSRC_OPEN not set\n"); */ /* g_print ("DEBUG: GST_AFSRC_OPEN not set\n"); */
if (!gst_afsrc_open_file (GST_AFSRC (element))) { if (!gst_afsrc_open_file (GST_AFSRC (element))) {
/* g_print ("DEBUG: element tries to open file\n"); */ /* g_print ("DEBUG: element tries to open file\n"); */

4
ext/audiofile/gstafsrc.h
View file

@ -52,9 +52,9 @@ typedef struct _GstAFSrc GstAFSrc;
typedef struct _GstAFSrcClass GstAFSrcClass; typedef struct _GstAFSrcClass GstAFSrcClass;
typedef enum { typedef enum {
GST_AFSRC_OPEN = GST_ELEMENT_FLAG_LAST, GST_AFSRC_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_AFSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_AFSRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstAFSrcFlags; } GstAFSrcFlags;
struct _GstAFSrc { struct _GstAFSrc {

4
ext/cdaudio/gstcdaudio.c
View file

@ -206,8 +206,8 @@ gst_cdaudio_init (GstCDAudio * cdaudio, GstCDAudioClass * g_class)
cdaudio->was_playing = FALSE; cdaudio->was_playing = FALSE;
cdaudio->timer = g_timer_new (); cdaudio->timer = g_timer_new ();
GST_FLAG_SET (cdaudio, GST_BIN_FLAG_MANAGER); GST_OBJECT_FLAG_SET (cdaudio, GST_BIN_FLAG_MANAGER);
GST_FLAG_SET (cdaudio, GST_BIN_SELF_SCHEDULABLE); GST_OBJECT_FLAG_SET (cdaudio, GST_BIN_SELF_SCHEDULABLE);
} }
static void static void

4
ext/directfb/directfbvideosink.c
View file

@ -682,8 +682,8 @@ gst_directfbvideosink_init (GstDirectFBVideoSink * directfbvideosink)
directfbvideosink->internal_surface = FALSE; directfbvideosink->internal_surface = FALSE;
directfbvideosink->surface_locked = FALSE; directfbvideosink->surface_locked = FALSE;
GST_FLAG_SET (directfbvideosink, GST_ELEMENT_THREAD_SUGGESTED); GST_OBJECT_FLAG_SET (directfbvideosink, GST_ELEMENT_THREAD_SUGGESTED);
GST_FLAG_SET (directfbvideosink, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (directfbvideosink, GST_ELEMENT_EVENT_AWARE);
} }
static void static void

2
ext/dts/gstdtsdec.c
View file

@ -178,7 +178,7 @@ gst_dtsdec_init (GstDtsDec * dtsdec)
gst_pad_use_explicit_caps (dtsdec->srcpad); gst_pad_use_explicit_caps (dtsdec->srcpad);
gst_element_add_pad (element, dtsdec->srcpad); gst_element_add_pad (element, dtsdec->srcpad);
GST_FLAG_SET (element, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (element, GST_ELEMENT_EVENT_AWARE);
dtsdec->dynamic_range_compression = FALSE; dtsdec->dynamic_range_compression = FALSE;
} }

6
ext/jack/gstjack.h
View file

@ -65,9 +65,9 @@ typedef GstJackClass GstJackSrcClass;
enum { enum {
GST_JACK_OPEN = GST_BIN_FLAG_LAST, GST_JACK_OPEN = (GST_BIN_FLAG_LAST << 0),
GST_JACK_ACTIVE, GST_JACK_ACTIVE = (GST_BIN_FLAG_LAST << 1),
GST_JACK_FLAG_LAST = GST_BIN_FLAG_LAST + 3 GST_JACK_FLAG_LAST = (GST_BIN_FLAG_LAST << 3)
}; };

20
ext/jack/gstjackbin.c
View file

@ -92,8 +92,8 @@ gst_jack_bin_init (GstJackBin * this)
GST_DEBUG ("initializing jack bin"); GST_DEBUG ("initializing jack bin");
/* jack bins are managing bins and iterate themselves */ /* jack bins are managing bins and iterate themselves */
GST_FLAG_SET (this, GST_BIN_FLAG_MANAGER); GST_OBJECT_FLAG_SET (this, GST_BIN_FLAG_MANAGER);
GST_FLAG_SET (this, GST_BIN_SELF_SCHEDULABLE); GST_OBJECT_FLAG_SET (this, GST_BIN_SELF_SCHEDULABLE);
/* make a new scheduler and associate it with the bin */ /* make a new scheduler and associate it with the bin */
gst_scheduler_factory_make (NULL, GST_ELEMENT (this)); gst_scheduler_factory_make (NULL, GST_ELEMENT (this));
@ -148,7 +148,7 @@ gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
jack_on_shutdown (this->client, shutdown, this); jack_on_shutdown (this->client, shutdown, this);
} }
if (GST_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_OPEN)) {
l = this->src_pads; l = this->src_pads;
while (l) { while (l) {
JACK_DEBUG ("jackbin: unregistering pad %s:%s", JACK_DEBUG ("jackbin: unregistering pad %s:%s",
@ -163,12 +163,12 @@ gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
jack_port_unregister (this->client, GST_JACK_PAD (l)->port); jack_port_unregister (this->client, GST_JACK_PAD (l)->port);
l = g_list_next (l); l = g_list_next (l);
} }
GST_FLAG_UNSET (GST_OBJECT (this), GST_JACK_OPEN); GST_OBJECT_FLAG_UNSET (GST_OBJECT (this), GST_JACK_OPEN);
if (GST_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_ACTIVE)) { if (GST_OBJECT_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_ACTIVE)) {
JACK_DEBUG ("jackbin: deactivating client"); JACK_DEBUG ("jackbin: deactivating client");
jack_deactivate (this->client); jack_deactivate (this->client);
GST_FLAG_UNSET (GST_OBJECT (this), GST_JACK_ACTIVE); GST_OBJECT_FLAG_UNSET (GST_OBJECT (this), GST_JACK_ACTIVE);
} }
} }
@ -180,7 +180,7 @@ gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_PAUSED: case GST_STATE_PAUSED:
JACK_DEBUG ("jackbin: PAUSED"); JACK_DEBUG ("jackbin: PAUSED");
if (!GST_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_OPEN)) {
l = this->src_pads; l = this->src_pads;
while (l) { while (l) {
pad = GST_JACK_PAD (l); pad = GST_JACK_PAD (l);
@ -204,10 +204,10 @@ gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
} }
/* must activate before connecting */ /* must activate before connecting */
if (!GST_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_ACTIVE)) { if (!GST_OBJECT_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_ACTIVE)) {
JACK_DEBUG ("jackbin: activating client"); JACK_DEBUG ("jackbin: activating client");
jack_activate (this->client); jack_activate (this->client);
GST_FLAG_SET (GST_OBJECT (this), GST_JACK_ACTIVE); GST_OBJECT_FLAG_SET (GST_OBJECT (this), GST_JACK_ACTIVE);
} }
l = this->src_pads; l = this->src_pads;
@ -238,7 +238,7 @@ gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
} }
JACK_DEBUG ("jackbin: setting OPEN flag"); JACK_DEBUG ("jackbin: setting OPEN flag");
GST_FLAG_SET (GST_OBJECT (this), GST_JACK_OPEN); GST_OBJECT_FLAG_SET (GST_OBJECT (this), GST_JACK_OPEN);
if (GST_ELEMENT_CLASS (parent_class)->change_state) if (GST_ELEMENT_CLASS (parent_class)->change_state)
return GST_ELEMENT_CLASS (parent_class)->change_state (element, return GST_ELEMENT_CLASS (parent_class)->change_state (element,

2
ext/musepack/gstmusepackdec.c
View file

@ -129,7 +129,7 @@ gst_musepackdec_class_init (GstMusepackDecClass * klass)
static void static void
gst_musepackdec_init (GstMusepackDec * musepackdec) gst_musepackdec_init (GstMusepackDec * musepackdec)
{ {
GST_FLAG_SET (musepackdec, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (musepackdec, GST_ELEMENT_EVENT_AWARE);
musepackdec->r = g_new (mpc_reader, 1); musepackdec->r = g_new (mpc_reader, 1);
musepackdec->d = g_new (mpc_decoder, 1); musepackdec->d = g_new (mpc_decoder, 1);

4
ext/musicbrainz/gsttrm.c
View file

@ -229,8 +229,8 @@ gst_musicbrainz_init (GstMusicBrainz * musicbrainz)
musicbrainz->total_time = 0; musicbrainz->total_time = 0;
musicbrainz->signature_available = FALSE; musicbrainz->signature_available = FALSE;
GST_FLAG_SET (musicbrainz, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (musicbrainz, GST_ELEMENT_EVENT_AWARE);
/*GST_FLAG_SET(musicbrainz, GST_ELEMENT_THREAD_SUGGESTED); */ /*GST_OBJECT_FLAG_SET(musicbrainz, GST_ELEMENT_THREAD_SUGGESTED); */
} }
static void static void

8
ext/nas/nassink.c
View file

@ -425,7 +425,7 @@ gst_nassink_open_audio (GstNassink * sink)
/* Start a flow */ /* Start a flow */
GST_FLAG_SET (sink, GST_NASSINK_OPEN); GST_OBJECT_FLAG_SET (sink, GST_NASSINK_OPEN);
GST_CAT_DEBUG (NAS, "opened audio device"); GST_CAT_DEBUG (NAS, "opened audio device");
return TRUE; return TRUE;
@ -455,7 +455,7 @@ gst_nassink_close_audio (GstNassink * sink)
AuCloseServer (sink->audio); AuCloseServer (sink->audio);
sink->audio = NULL; sink->audio = NULL;
GST_FLAG_UNSET (sink, GST_NASSINK_OPEN); GST_OBJECT_FLAG_UNSET (sink, GST_NASSINK_OPEN);
GST_CAT_DEBUG (NAS, "closed audio device"); GST_CAT_DEBUG (NAS, "closed audio device");
} }
@ -471,12 +471,12 @@ gst_nassink_change_state (GstElement * element, GstStateChange transition)
switch (GST_STATE_PENDING (element)) { switch (GST_STATE_PENDING (element)) {
case GST_STATE_NULL: case GST_STATE_NULL:
if (GST_FLAG_IS_SET (element, GST_NASSINK_OPEN)) if (GST_OBJECT_FLAG_IS_SET (element, GST_NASSINK_OPEN))
gst_nassink_close_audio (nassink); gst_nassink_close_audio (nassink);
break; break;
case GST_STATE_READY: case GST_STATE_READY:
if (!GST_FLAG_IS_SET (element, GST_NASSINK_OPEN)) if (!GST_OBJECT_FLAG_IS_SET (element, GST_NASSINK_OPEN))
gst_nassink_open_audio (nassink); gst_nassink_open_audio (nassink);
break; break;

4
ext/nas/nassink.h
View file

@ -40,8 +40,8 @@ extern "C" {
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NASSINK)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NASSINK))
typedef enum { typedef enum {
GST_NASSINK_OPEN = GST_ELEMENT_FLAG_LAST, GST_NASSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_NASSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2 GST_NASSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2)
} GstNasSinkFlags; } GstNasSinkFlags;
typedef struct _GstNassink GstNassink; typedef struct _GstNassink GstNassink;

4
ext/polyp/polypsink.c
View file

@ -599,8 +599,8 @@ gst_polypsink_init (GTypeInstance * instance, gpointer g_class)
gst_pad_set_link_function (polypsink->sinkpad, gst_polypsink_link); gst_pad_set_link_function (polypsink->sinkpad, gst_polypsink_link);
gst_pad_set_fixate_function (polypsink->sinkpad, gst_polypsink_sink_fixate); gst_pad_set_fixate_function (polypsink->sinkpad, gst_polypsink_sink_fixate);
/* GST_FLAG_SET(polypsink, GST_ELEMENT_THREAD_SUGGESTED); */ /* GST_OBJECT_FLAG_SET(polypsink, GST_ELEMENT_THREAD_SUGGESTED); */
GST_FLAG_SET (polypsink, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (polypsink, GST_ELEMENT_EVENT_AWARE);
polypsink->context = NULL; polypsink->context = NULL;
polypsink->stream = NULL; polypsink->stream = NULL;

4
ext/sdl/sdlvideosink.c
View file

@ -661,14 +661,14 @@ gst_sdlvideosink_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!gst_sdlvideosink_initsdl (sdlvideosink)) if (!gst_sdlvideosink_initsdl (sdlvideosink))
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
GST_FLAG_SET (sdlvideosink, GST_SDLVIDEOSINK_OPEN); GST_OBJECT_FLAG_SET (sdlvideosink, GST_SDLVIDEOSINK_OPEN);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_sdlvideosink_destroy (sdlvideosink); gst_sdlvideosink_destroy (sdlvideosink);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
gst_sdlvideosink_deinitsdl (sdlvideosink); gst_sdlvideosink_deinitsdl (sdlvideosink);
GST_FLAG_UNSET (sdlvideosink, GST_SDLVIDEOSINK_OPEN); GST_OBJECT_FLAG_UNSET (sdlvideosink, GST_SDLVIDEOSINK_OPEN);
break; break;
default: /* do nothing */ default: /* do nothing */
break; break;

4
ext/sdl/sdlvideosink.h
View file

@ -38,9 +38,9 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SDLVIDEOSINK)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SDLVIDEOSINK))
typedef enum { typedef enum {
GST_SDLVIDEOSINK_OPEN = GST_ELEMENT_FLAG_LAST, GST_SDLVIDEOSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_SDLVIDEOSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_SDLVIDEOSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstSDLVideoSinkFlags; } GstSDLVideoSinkFlags;
typedef struct _GstSDLVideoSink GstSDLVideoSink; typedef struct _GstSDLVideoSink GstSDLVideoSink;

2
ext/smoothwave/gstsmoothwave.c
View file

@ -167,7 +167,7 @@ gst_smoothwave_init (GstSmoothWave * smoothwave)
gst_element_add_pad (GST_ELEMENT (smoothwave), smoothwave->srcpad); gst_element_add_pad (GST_ELEMENT (smoothwave), smoothwave->srcpad);
gst_pad_set_link_function (smoothwave->srcpad, gst_sw_srclink); 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 (); smoothwave->adapter = gst_adapter_new ();

18
ext/sndfile/gstsf.c
View file

@ -344,7 +344,7 @@ gst_sf_set_property (GObject * object, guint prop_id, const GValue * value,
switch (prop_id) { switch (prop_id) {
case ARG_LOCATION: case ARG_LOCATION:
if (GST_FLAG_IS_SET (object, GST_SF_OPEN)) if (GST_OBJECT_FLAG_IS_SET (object, GST_SF_OPEN))
gst_sf_close_file (this); gst_sf_close_file (this);
if (this->filename) if (this->filename)
g_free (this->filename); g_free (this->filename);
@ -462,7 +462,7 @@ gst_sf_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (GST_FLAG_IS_SET (this, GST_SF_OPEN)) if (GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN))
gst_sf_close_file (this); gst_sf_close_file (this);
break; break;
} }
@ -536,7 +536,7 @@ gst_sf_release_request_pad (GstElement * element, GstPad * pad)
INFO_OBJ (element, "Releasing request pad %s", GST_PAD_NAME (channel->pad)); INFO_OBJ (element, "Releasing request pad %s", GST_PAD_NAME (channel->pad));
if (GST_FLAG_IS_SET (element, GST_SF_OPEN)) if (GST_OBJECT_FLAG_IS_SET (element, GST_SF_OPEN))
gst_sf_close_file (this); gst_sf_close_file (this);
gst_element_remove_pad (element, channel->pad); gst_element_remove_pad (element, channel->pad);
@ -577,7 +577,7 @@ gst_sf_open_file (GstSF * this)
int mode; int mode;
SF_INFO info; SF_INFO info;
g_return_val_if_fail (!GST_FLAG_IS_SET (this, GST_SF_OPEN), FALSE); g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN), FALSE);
this->time = 0; this->time = 0;
@ -647,7 +647,7 @@ gst_sf_open_file (GstSF * this)
GST_SF_CHANNEL (l)->caps_set = FALSE; GST_SF_CHANNEL (l)->caps_set = FALSE;
} }
GST_FLAG_SET (this, GST_SF_OPEN); GST_OBJECT_FLAG_SET (this, GST_SF_OPEN);
return TRUE; return TRUE;
} }
@ -657,7 +657,7 @@ gst_sf_close_file (GstSF * this)
{ {
int err = 0; int err = 0;
g_return_if_fail (GST_FLAG_IS_SET (this, GST_SF_OPEN)); g_return_if_fail (GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN));
INFO_OBJ (this, "Closing file %s", this->filename); INFO_OBJ (this, "Closing file %s", this->filename);
@ -666,7 +666,7 @@ gst_sf_close_file (GstSF * this)
("Could not close file file \"%s\".", this->filename), ("Could not close file file \"%s\".", this->filename),
("soundfile error: %s", strerror (err))); ("soundfile error: %s", strerror (err)));
else else
GST_FLAG_UNSET (this, GST_SF_OPEN); GST_OBJECT_FLAG_UNSET (this, GST_SF_OPEN);
this->file = NULL; this->file = NULL;
if (this->buffer) if (this->buffer)
@ -699,7 +699,7 @@ gst_sf_loop (GstElement * element)
gfloat *buf = this->buffer; gfloat *buf = this->buffer;
GstBuffer *out; GstBuffer *out;
if (!GST_FLAG_IS_SET (this, GST_SF_OPEN)) if (!GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN))
if (!gst_sf_open_file (this)) if (!gst_sf_open_file (this))
return; /* we've already set gst_element_error */ return; /* we've already set gst_element_error */
@ -805,7 +805,7 @@ gst_sf_loop (GstElement * element)
num_to_write = buffer_frames; num_to_write = buffer_frames;
} }
if (!GST_FLAG_IS_SET (this, GST_SF_OPEN)) if (!GST_OBJECT_FLAG_IS_SET (this, GST_SF_OPEN))
if (!gst_sf_open_file (this)) if (!gst_sf_open_file (this))
return; /* we've already set gst_element_error */ return; /* we've already set gst_element_error */

4
ext/sndfile/gstsf.h
View file

@ -66,8 +66,8 @@ typedef struct _GstSF GstSF;
typedef struct _GstSFClass GstSFClass; typedef struct _GstSFClass GstSFClass;
typedef enum { typedef enum {
GST_SF_OPEN = GST_ELEMENT_FLAG_LAST, GST_SF_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_SF_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_SF_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstSFlags; } GstSFlags;
typedef struct { typedef struct {

2
ext/swfdec/gstswfdec.c
View file

@ -375,7 +375,7 @@ gst_swfdec_init (GstSwfdec * swfdec)
swfdec_decoder_set_colorspace (swfdec->decoder, SWF_COLORSPACE_RGB888); swfdec_decoder_set_colorspace (swfdec->decoder, SWF_COLORSPACE_RGB888);
GST_FLAG_SET (GST_ELEMENT (swfdec), GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (GST_ELEMENT (swfdec), GST_ELEMENT_EVENT_AWARE);
swfdec->frame_rate = 0.; swfdec->frame_rate = 0.;
} }

2
ext/tarkin/gsttarkindec.c
View file

@ -171,7 +171,7 @@ gst_tarkindec_init (TarkinDec * tarkindec)
tarkindec->nheader = 0; tarkindec->nheader = 0;
/* we're chained and we can deal with events */ /* we're chained and we can deal with events */
GST_FLAG_SET (tarkindec, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (tarkindec, GST_ELEMENT_EVENT_AWARE);
} }
static void static void

2
gst/apetag/apedemux.c
View file

@ -118,7 +118,7 @@ gst_ape_demux_class_init (GstApeDemuxClass * klass)
static void static void
gst_ape_demux_init (GstApeDemux * ape) gst_ape_demux_init (GstApeDemux * ape)
{ {
GST_FLAG_SET (ape, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (ape, GST_ELEMENT_EVENT_AWARE);
ape->sinkpad = ape->sinkpad =
gst_pad_new_from_template (gst_static_pad_template_get (&sink_templ), gst_pad_new_from_template (gst_static_pad_template_get (&sink_templ),

2
gst/cdxaparse/gstcdxaparse.c
View file

@ -131,7 +131,7 @@ gst_cdxaparse_init (GstCDXAParse * cdxaparse)
cdxaparse->seek_pending = FALSE; cdxaparse->seek_pending = FALSE;
cdxaparse->seek_offset = 0; cdxaparse->seek_offset = 0;
GST_FLAG_SET (cdxaparse, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (cdxaparse, GST_ELEMENT_EVENT_AWARE);
} }
static gboolean static gboolean

2
gst/cdxaparse/gstcdxastrip.c
View file

@ -113,7 +113,7 @@ gst_cdxastrip_class_init (GstCDXAStripClass * klass)
static void static void
gst_cdxastrip_init (GstCDXAStrip * cdxastrip) gst_cdxastrip_init (GstCDXAStrip * cdxastrip)
{ {
GST_FLAG_SET (cdxastrip, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (cdxastrip, GST_ELEMENT_EVENT_AWARE);
cdxastrip->sinkpad = cdxastrip->sinkpad =
gst_pad_new_from_template (gst_static_pad_template_get gst_pad_new_from_template (gst_static_pad_template_get

2
gst/cdxaparse/gstvcdparse.c
View file

@ -113,7 +113,7 @@ gst_cdxastrip_class_init (GstCDXAStripClass * klass)
static void static void
gst_cdxastrip_init (GstCDXAStrip * cdxastrip) gst_cdxastrip_init (GstCDXAStrip * cdxastrip)
{ {
GST_FLAG_SET (cdxastrip, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (cdxastrip, GST_ELEMENT_EVENT_AWARE);
cdxastrip->sinkpad = cdxastrip->sinkpad =
gst_pad_new_from_template (gst_static_pad_template_get gst_pad_new_from_template (gst_static_pad_template_get

4
gst/festival/gstfestival.c
View file

@ -417,10 +417,10 @@ gst_festival_change_state (GstElement * element, GstStateChange transition)
g_return_val_if_fail (GST_IS_FESTIVAL (element), GST_STATE_CHANGE_FAILURE); g_return_val_if_fail (GST_IS_FESTIVAL (element), GST_STATE_CHANGE_FAILURE);
if (GST_STATE_PENDING (element) == GST_STATE_NULL) { if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
if (GST_FLAG_IS_SET (element, GST_FESTIVAL_OPEN)) if (GST_OBJECT_FLAG_IS_SET (element, GST_FESTIVAL_OPEN))
gst_festival_close (GST_FESTIVAL (element)); gst_festival_close (GST_FESTIVAL (element));
} else { } else {
if (!GST_FLAG_IS_SET (element, GST_FESTIVAL_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (element, GST_FESTIVAL_OPEN)) {
if (!gst_festival_open (GST_FESTIVAL (element))) if (!gst_festival_open (GST_FESTIVAL (element)))
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }

4
gst/festival/gstfestival.h
View file

@ -94,9 +94,9 @@ typedef struct FT_Info
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FESTIVAL)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FESTIVAL))
typedef enum { typedef enum {
GST_FESTIVAL_OPEN = GST_ELEMENT_FLAG_LAST, GST_FESTIVAL_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_FESTIVAL_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_FESTIVAL_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstFestivalFlags; } GstFestivalFlags;
typedef struct _GstFestival GstFestival; typedef struct _GstFestival GstFestival;

2
gst/mpeg2sub/gstmpeg2subt.c
View file

@ -231,7 +231,7 @@ gst_mpeg2subt_init (GstMpeg2Subt * mpeg2subt)
GST_DEBUG_FUNCPTR (gst_mpeg2subt_src_event)); GST_DEBUG_FUNCPTR (gst_mpeg2subt_src_event));
gst_element_set_loop_function (GST_ELEMENT (mpeg2subt), gst_mpeg2subt_loop); gst_element_set_loop_function (GST_ELEMENT (mpeg2subt), gst_mpeg2subt_loop);
GST_FLAG_SET (GST_ELEMENT (mpeg2subt), GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (GST_ELEMENT (mpeg2subt), GST_ELEMENT_EVENT_AWARE);
mpeg2subt->partialbuf = NULL; mpeg2subt->partialbuf = NULL;
mpeg2subt->hold_frame = NULL; mpeg2subt->hold_frame = NULL;

47
gst/multifilesink/gstmultifilesink.c
View file

@ -170,7 +170,7 @@ gst_multifilesink_init (GstMultiFileSink * filesink,
gst_element_add_pad (GST_ELEMENT (filesink), pad); gst_element_add_pad (GST_ELEMENT (filesink), pad);
gst_pad_set_chain_function (pad, gst_multifilesink_chain); 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_function (pad, gst_multifilesink_pad_query);
gst_pad_set_query_type_function (pad, gst_multifilesink_get_query_types); 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 /* the element must be stopped or paused in order to do this or in newfile
signal */ signal */
if (GST_STATE (sink) > GST_STATE_PAUSED && 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; return FALSE;
if (GST_STATE (sink) == GST_STATE_PAUSED && if (GST_STATE (sink) == GST_STATE_PAUSED &&
(GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN) || (GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_OPEN) ||
!GST_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE))) !GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFILESINK_NEWFILE)))
return FALSE; return FALSE;
@ -228,7 +228,7 @@ gst_multifilesink_set_location (GstMultiFileSink * sink, const gchar * location)
} }
if (GST_STATE (sink) == GST_STATE_PAUSED && 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); gst_multifilesink_open_file (sink);
return TRUE; return TRUE;
@ -275,7 +275,8 @@ gst_multifilesink_get_property (GObject * object, guint prop_id, GValue * value,
static gboolean static gboolean
gst_multifilesink_open_file (GstMultiFileSink * sink) 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 */ /* open the file */
if (sink->curfilename == NULL || sink->curfilename[0] == '\0') { if (sink->curfilename == NULL || sink->curfilename[0] == '\0') {
@ -292,7 +293,7 @@ gst_multifilesink_open_file (GstMultiFileSink * sink)
return FALSE; return FALSE;
} }
GST_FLAG_SET (sink, GST_MULTIFILESINK_OPEN); GST_OBJECT_FLAG_SET (sink, GST_MULTIFILESINK_OPEN);
sink->data_written = 0; sink->data_written = 0;
sink->curfileindex++; sink->curfileindex++;
@ -303,13 +304,13 @@ gst_multifilesink_open_file (GstMultiFileSink * sink)
static void static void
gst_multifilesink_close_file (GstMultiFileSink * sink) 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) { if (fclose (sink->file) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
(_("Error closing file \"%s\"."), sink->curfilename), GST_ERROR_SYSTEM); (_("Error closing file \"%s\"."), sink->curfilename), GST_ERROR_SYSTEM);
} else { } 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_multifilesink_next_file (GstMultiFileSink * sink)
{ {
GST_DEBUG ("next file"); 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) { if (fclose (sink->file) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
(_("Error closing file \"%s\"."), sink->curfilename), GST_ERROR_SYSTEM); (_("Error closing file \"%s\"."), sink->curfilename), GST_ERROR_SYSTEM);
} else { } 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) if (sink->curfilename)
g_free (sink->curfilename); g_free (sink->curfilename);
if (sink->uri) if (sink->uri)
@ -349,7 +352,7 @@ gst_multifilesink_next_file (GstMultiFileSink * sink)
return FALSE; return FALSE;
} }
GST_FLAG_SET (sink, GST_MULTIFILESINK_OPEN); GST_OBJECT_FLAG_SET (sink, GST_MULTIFILESINK_OPEN);
sink->data_written = 0; sink->data_written = 0;
if (sink->streamheader) { if (sink->streamheader) {
GSList *l; GSList *l;
@ -394,7 +397,8 @@ gst_multifilesink_pad_query (GstPad * pad, GstQueryType type,
case GST_QUERY_TOTAL: case GST_QUERY_TOTAL:
switch (*format) { switch (*format) {
case GST_FORMAT_BYTES: 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 *value = sink->data_written; /* FIXME - doesn't the kernel provide
such a function? */ such a function? */
break; break;
@ -406,7 +410,8 @@ gst_multifilesink_pad_query (GstPad * pad, GstQueryType type,
case GST_QUERY_POSITION: case GST_QUERY_POSITION:
switch (*format) { switch (*format) {
case GST_FORMAT_BYTES: 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); *value = ftell (sink->file);
break; break;
} }
@ -431,7 +436,7 @@ gst_multifilesink_handle_event (GstPad * pad, GstEvent * event)
filesink = GST_MULTIFILESINK (gst_pad_get_parent (pad)); 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); gst_event_unref (event);
return FALSE; return FALSE;
} }
@ -478,10 +483,10 @@ gst_multifilesink_handle_event (GstPad * pad, GstEvent * event)
if (GST_EVENT_DISCONT_NEW_MEDIA (event)) { if (GST_EVENT_DISCONT_NEW_MEDIA (event)) {
/* do not create a new file on the first new media discont */ /* do not create a new file on the first new media discont */
if (filesink->numfiles > 0) { 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), g_signal_emit (G_OBJECT (filesink),
gst_multifilesink_signals[SIGNAL_NEWFILE], 0); 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)) if (!gst_multifilesink_next_file (filesink))
GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE, GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE,
(_("Error switching files to \"%s\"."), (_("Error switching files to \"%s\"."),
@ -557,7 +562,7 @@ gst_multifilesink_chain (GstPad * pad, GstData * _data)
gst_buffer_ref (buf); gst_buffer_ref (buf);
filesink->streamheader = g_slist_append (filesink->streamheader, 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; guint bytes_written = 0, back_pending = 0;
@ -595,12 +600,12 @@ gst_multifilesink_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: 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)); gst_multifilesink_close_file (GST_MULTIFILESINK (element));
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: 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))) if (!gst_multifilesink_open_file (GST_MULTIFILESINK (element)))
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }

6
gst/multifilesink/gstmultifilesink.h
View file

@ -44,10 +44,10 @@ typedef struct _GstMultiFileSink GstMultiFileSink;
typedef struct _GstMultiFileSinkClass GstMultiFileSinkClass; typedef struct _GstMultiFileSinkClass GstMultiFileSinkClass;
typedef enum { typedef enum {
GST_MULTIFILESINK_OPEN = GST_ELEMENT_FLAG_LAST, GST_MULTIFILESINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_MULTIFILESINK_NEWFILE = GST_ELEMENT_FLAG_LAST +2, 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; } GstMultiFileSinkFlags;
struct _GstMultiFileSink { struct _GstMultiFileSink {

2
gst/smoothwave/gstsmoothwave.c
View file

@ -167,7 +167,7 @@ gst_smoothwave_init (GstSmoothWave * smoothwave)
gst_element_add_pad (GST_ELEMENT (smoothwave), smoothwave->srcpad); gst_element_add_pad (GST_ELEMENT (smoothwave), smoothwave->srcpad);
gst_pad_set_link_function (smoothwave->srcpad, gst_sw_srclink); 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 (); smoothwave->adapter = gst_adapter_new ();

2
gst/videodrop/gstvideodrop.c
View file

@ -228,7 +228,7 @@ gst_videodrop_link (GstPad * pad, const GstCaps * caps)
static void static void
gst_videodrop_init (GstVideodrop * videodrop) gst_videodrop_init (GstVideodrop * videodrop)
{ {
GST_FLAG_SET (videodrop, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (videodrop, GST_ELEMENT_EVENT_AWARE);
GST_DEBUG ("gst_videodrop_init"); GST_DEBUG ("gst_videodrop_init");
videodrop->sinkpad = videodrop->sinkpad =

2
sys/cdrom/gstcdplayer.c
View file

@ -160,7 +160,7 @@ cdplayer_init (CDPlayer * cdp)
cdp->paused = FALSE; cdp->paused = FALSE;
GST_FLAG_SET (cdp, GST_BIN_FLAG_MANAGER); GST_OBJECT_FLAG_SET (cdp, GST_BIN_FLAG_MANAGER);
return; return;
} }

19
sys/dxr3/dxr3audiosink.c
View file

@ -214,7 +214,7 @@ dxr3audiosink_init (Dxr3AudioSink * sink)
gst_pad_set_chain_function (sink->ac3_sinkpad, dxr3audiosink_chain_ac3); gst_pad_set_chain_function (sink->ac3_sinkpad, dxr3audiosink_chain_ac3);
gst_element_add_pad (GST_ELEMENT (sink), sink->ac3_sinkpad); gst_element_add_pad (GST_ELEMENT (sink), sink->ac3_sinkpad);
GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
sink->card_number = 0; sink->card_number = 0;
@ -285,7 +285,8 @@ dxr3audiosink_get_property (GObject * object, guint prop_id,
static gboolean static gboolean
dxr3audiosink_open (Dxr3AudioSink * sink) dxr3audiosink_open (Dxr3AudioSink * sink)
{ {
g_return_val_if_fail (!GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN), FALSE); g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN),
FALSE);
/* Compute the name of the audio device file. */ /* Compute the name of the audio device file. */
sink->audio_filename = g_strdup_printf ("/dev/em8300_ma-%d", sink->audio_filename = g_strdup_printf ("/dev/em8300_ma-%d",
@ -311,7 +312,7 @@ dxr3audiosink_open (Dxr3AudioSink * sink)
return FALSE; return FALSE;
} }
GST_FLAG_SET (sink, DXR3AUDIOSINK_OPEN); GST_OBJECT_FLAG_SET (sink, DXR3AUDIOSINK_OPEN);
dxr3audiosink_set_mode_pcm (sink); dxr3audiosink_set_mode_pcm (sink);
@ -414,7 +415,7 @@ dxr3audiosink_set_mode_ac3 (Dxr3AudioSink * sink)
static void static void
dxr3audiosink_close (Dxr3AudioSink * sink) dxr3audiosink_close (Dxr3AudioSink * sink)
{ {
g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)); g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN));
if (close (sink->audio_fd) != 0) { if (close (sink->audio_fd) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
@ -430,7 +431,7 @@ dxr3audiosink_close (Dxr3AudioSink * sink)
return; return;
} }
GST_FLAG_UNSET (sink, DXR3AUDIOSINK_OPEN); GST_OBJECT_FLAG_UNSET (sink, DXR3AUDIOSINK_OPEN);
g_free (sink->audio_filename); g_free (sink->audio_filename);
sink->audio_filename = NULL; sink->audio_filename = NULL;
@ -543,7 +544,7 @@ dxr3audiosink_chain_pcm (GstPad * pad, GstData * _data)
dxr3audiosink_set_mode_pcm (sink); dxr3audiosink_set_mode_pcm (sink);
} }
if (GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) {
if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) { if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) {
/* We have a new scr value. */ /* We have a new scr value. */
sink->scr = GSTTIME_TO_MPEGTIME (GST_BUFFER_TIMESTAMP (buf)); sink->scr = GSTTIME_TO_MPEGTIME (GST_BUFFER_TIMESTAMP (buf));
@ -608,7 +609,7 @@ dxr3audiosink_chain_ac3 (GstPad * pad, GstData * _data)
dxr3audiosink_set_mode_ac3 (sink); dxr3audiosink_set_mode_ac3 (sink);
} }
if (GST_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (sink, DXR3AUDIOSINK_OPEN)) {
int event; int event;
if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) { if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) {
@ -709,11 +710,11 @@ dxr3audiosink_change_state (GstElement * element, GstStateChange transition)
GST_STATE_CHANGE_FAILURE); GST_STATE_CHANGE_FAILURE);
if (GST_STATE_PENDING (element) == GST_STATE_NULL) { if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
if (GST_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
dxr3audiosink_close (DXR3AUDIOSINK (element)); dxr3audiosink_close (DXR3AUDIOSINK (element));
} }
} else { } else {
if (!GST_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
if (!dxr3audiosink_open (DXR3AUDIOSINK (element))) { if (!dxr3audiosink_open (DXR3AUDIOSINK (element))) {
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }

4
sys/dxr3/dxr3audiosink.h
View file

@ -46,8 +46,8 @@ typedef struct _Dxr3AudioSinkClass Dxr3AudioSinkClass;
typedef enum { typedef enum {
DXR3AUDIOSINK_OPEN = GST_ELEMENT_FLAG_LAST, DXR3AUDIOSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
DXR3AUDIOSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, DXR3AUDIOSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} Dxr3AudioSinkFlags; } Dxr3AudioSinkFlags;

17
sys/dxr3/dxr3spusink.c
View file

@ -207,7 +207,7 @@ dxr3spusink_init (Dxr3SpuSink * sink)
gst_element_add_pad (GST_ELEMENT (sink), pad); gst_element_add_pad (GST_ELEMENT (sink), pad);
gst_pad_set_chain_function (pad, dxr3spusink_chain); gst_pad_set_chain_function (pad, dxr3spusink_chain);
GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
sink->card_number = 0; sink->card_number = 0;
@ -256,7 +256,8 @@ dxr3spusink_get_property (GObject * object, guint prop_id,
static gboolean static gboolean
dxr3spusink_open (Dxr3SpuSink * sink) dxr3spusink_open (Dxr3SpuSink * sink)
{ {
g_return_val_if_fail (!GST_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN), FALSE); g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN),
FALSE);
/* Compute the name of the spu device file. */ /* Compute the name of the spu device file. */
sink->spu_filename = g_strdup_printf ("/dev/em8300_sp-%d", sink->card_number); sink->spu_filename = g_strdup_printf ("/dev/em8300_sp-%d", sink->card_number);
@ -281,7 +282,7 @@ dxr3spusink_open (Dxr3SpuSink * sink)
return FALSE; return FALSE;
} }
GST_FLAG_SET (sink, DXR3SPUSINK_OPEN); GST_OBJECT_FLAG_SET (sink, DXR3SPUSINK_OPEN);
return TRUE; return TRUE;
} }
@ -290,7 +291,7 @@ dxr3spusink_open (Dxr3SpuSink * sink)
static void static void
dxr3spusink_close (Dxr3SpuSink * sink) dxr3spusink_close (Dxr3SpuSink * sink)
{ {
g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN)); g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN));
if (close (sink->spu_fd) != 0) { if (close (sink->spu_fd) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
@ -306,7 +307,7 @@ dxr3spusink_close (Dxr3SpuSink * sink)
return; return;
} }
GST_FLAG_UNSET (sink, DXR3SPUSINK_OPEN); GST_OBJECT_FLAG_UNSET (sink, DXR3SPUSINK_OPEN);
free (sink->spu_filename); free (sink->spu_filename);
sink->spu_filename = NULL; sink->spu_filename = NULL;
@ -377,7 +378,7 @@ dxr3spusink_chain (GstPad * pad, GstData * _data)
return; return;
} }
if (GST_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (sink, DXR3SPUSINK_OPEN)) {
/* If we have PTS information for the SPU unit, register it now. /* If we have PTS information for the SPU unit, register it now.
The card needs the PTS to be written *before* the actual data. */ The card needs the PTS to be written *before* the actual data. */
if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) { if (GST_BUFFER_TIMESTAMP (buf) != GST_CLOCK_TIME_NONE) {
@ -405,7 +406,7 @@ dxr3spusink_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!GST_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
if (!dxr3spusink_open (DXR3SPUSINK (element))) { if (!dxr3spusink_open (DXR3SPUSINK (element))) {
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
@ -420,7 +421,7 @@ dxr3spusink_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (GST_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
dxr3spusink_close (DXR3SPUSINK (element)); dxr3spusink_close (DXR3SPUSINK (element));
} }
break; break;

4
sys/dxr3/dxr3spusink.h
View file

@ -44,8 +44,8 @@ typedef struct _Dxr3SpuSinkClass Dxr3SpuSinkClass;
typedef enum { typedef enum {
DXR3SPUSINK_OPEN = GST_ELEMENT_FLAG_LAST, DXR3SPUSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
DXR3SPUSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, DXR3SPUSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} Dxr3SpuSinkFlags; } Dxr3SpuSinkFlags;

17
sys/dxr3/dxr3videosink.c
View file

@ -204,7 +204,7 @@ dxr3videosink_init (Dxr3VideoSink * sink)
gst_element_add_pad (GST_ELEMENT (sink), pad); gst_element_add_pad (GST_ELEMENT (sink), pad);
gst_pad_set_chain_function (pad, dxr3videosink_chain); gst_pad_set_chain_function (pad, dxr3videosink_chain);
GST_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (GST_ELEMENT (sink), GST_ELEMENT_EVENT_AWARE);
sink->card_number = 0; sink->card_number = 0;
@ -258,7 +258,8 @@ dxr3videosink_get_property (GObject * object, guint prop_id,
static gboolean static gboolean
dxr3videosink_open (Dxr3VideoSink * sink) dxr3videosink_open (Dxr3VideoSink * sink)
{ {
g_return_val_if_fail (!GST_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN), FALSE); g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN),
FALSE);
/* Compute the name of the video device file. */ /* Compute the name of the video device file. */
sink->video_filename = g_strdup_printf ("/dev/em8300_mv-%d", sink->video_filename = g_strdup_printf ("/dev/em8300_mv-%d",
@ -284,7 +285,7 @@ dxr3videosink_open (Dxr3VideoSink * sink)
return FALSE; return FALSE;
} }
GST_FLAG_SET (sink, DXR3VIDEOSINK_OPEN); GST_OBJECT_FLAG_SET (sink, DXR3VIDEOSINK_OPEN);
return TRUE; return TRUE;
} }
@ -293,7 +294,7 @@ dxr3videosink_open (Dxr3VideoSink * sink)
static void static void
dxr3videosink_close (Dxr3VideoSink * sink) dxr3videosink_close (Dxr3VideoSink * sink)
{ {
g_return_if_fail (GST_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN)); g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN));
if (close (sink->video_fd) != 0) { if (close (sink->video_fd) != 0) {
GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE, GST_ELEMENT_ERROR (sink, RESOURCE, CLOSE,
@ -309,7 +310,7 @@ dxr3videosink_close (Dxr3VideoSink * sink)
return; return;
} }
GST_FLAG_UNSET (sink, DXR3VIDEOSINK_OPEN); GST_OBJECT_FLAG_UNSET (sink, DXR3VIDEOSINK_OPEN);
free (sink->video_filename); free (sink->video_filename);
sink->video_filename = NULL; sink->video_filename = NULL;
@ -423,7 +424,7 @@ dxr3videosink_write_data (Dxr3VideoSink * sink, guint cut)
g_return_if_fail (sink->cur_buf != NULL); g_return_if_fail (sink->cur_buf != NULL);
if (GST_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (sink, DXR3VIDEOSINK_OPEN)) {
if (sink->cur_ts != GST_CLOCK_TIME_NONE) { if (sink->cur_ts != GST_CLOCK_TIME_NONE) {
guint pts; guint pts;
@ -642,7 +643,7 @@ dxr3videosink_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!GST_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
if (!dxr3videosink_open (DXR3VIDEOSINK (element))) { if (!dxr3videosink_open (DXR3VIDEOSINK (element))) {
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
@ -661,7 +662,7 @@ dxr3videosink_change_state (GstElement * element, GstStateChange transition)
dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_STOP); dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_STOP);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (GST_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
dxr3videosink_close (DXR3VIDEOSINK (element)); dxr3videosink_close (DXR3VIDEOSINK (element));
} }
break; break;

4
sys/dxr3/dxr3videosink.h
View file

@ -44,8 +44,8 @@ typedef struct _Dxr3VideoSinkClass Dxr3VideoSinkClass;
typedef enum { typedef enum {
DXR3VIDEOSINK_OPEN = GST_ELEMENT_FLAG_LAST, DXR3VIDEOSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
DXR3VIDEOSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, DXR3VIDEOSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} Dxr3VideoSinkFlags; } Dxr3VideoSinkFlags;

4
sys/glsink/glimagesink.c
View file

@ -1466,8 +1466,8 @@ gst_glimagesink_init (GstGLImageSink * glimagesink)
glimagesink->synchronous = FALSE; glimagesink->synchronous = FALSE;
glimagesink->signal_handoffs = FALSE; glimagesink->signal_handoffs = FALSE;
GST_FLAG_SET (glimagesink, GST_ELEMENT_THREAD_SUGGESTED); GST_OBJECT_FLAG_SET (glimagesink, GST_ELEMENT_THREAD_SUGGESTED);
GST_FLAG_SET (glimagesink, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (glimagesink, GST_ELEMENT_EVENT_AWARE);
} }
static void static void

8
sys/qcam/gstqcamsrc.c
View file

@ -389,11 +389,11 @@ gst_qcamsrc_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (GST_FLAG_IS_SET (element, GST_QCAMSRC_OPEN)) if (GST_OBJECT_FLAG_IS_SET (element, GST_QCAMSRC_OPEN))
gst_qcamsrc_close (GST_QCAMSRC (element)); gst_qcamsrc_close (GST_QCAMSRC (element));
break; break;
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!GST_FLAG_IS_SET (element, GST_QCAMSRC_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (element, GST_QCAMSRC_OPEN)) {
GST_DEBUG ("opening"); GST_DEBUG ("opening");
if (!gst_qcamsrc_open (GST_QCAMSRC (element))) { if (!gst_qcamsrc_open (GST_QCAMSRC (element))) {
GST_DEBUG ("open failed"); GST_DEBUG ("open failed");
@ -420,7 +420,7 @@ gst_qcamsrc_open (GstQCamSrc * qcamsrc)
return FALSE; return FALSE;
} }
GST_FLAG_SET (qcamsrc, GST_QCAMSRC_OPEN); GST_OBJECT_FLAG_SET (qcamsrc, GST_QCAMSRC_OPEN);
return TRUE; return TRUE;
} }
@ -429,7 +429,7 @@ static void
gst_qcamsrc_close (GstQCamSrc * src) gst_qcamsrc_close (GstQCamSrc * src)
{ {
qc_close (src->qcam); qc_close (src->qcam);
GST_FLAG_UNSET (src, GST_QCAMSRC_OPEN); GST_OBJECT_FLAG_UNSET (src, GST_QCAMSRC_OPEN);
} }
static gboolean static gboolean

4
sys/qcam/gstqcamsrc.h
View file

@ -45,9 +45,9 @@ extern "C" {
/* NOTE: per-element flags start with 16 for now */ /* NOTE: per-element flags start with 16 for now */
typedef enum { typedef enum {
GST_QCAMSRC_OPEN = GST_ELEMENT_FLAG_LAST, GST_QCAMSRC_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_QCAMSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2, GST_QCAMSRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstQCamSrcFlags; } GstQCamSrcFlags;
typedef struct _GstQCamSrc GstQCamSrc; typedef struct _GstQCamSrc GstQCamSrc;

2
sys/v4l2/gstv4l2src.c
View file

@ -230,7 +230,7 @@ gst_v4l2src_init (GTypeInstance * instance, gpointer g_class)
{ {
GstV4l2Src *v4l2src = GST_V4L2SRC (instance); GstV4l2Src *v4l2src = GST_V4L2SRC (instance);
GST_FLAG_SET (GST_ELEMENT (v4l2src), GST_ELEMENT_THREAD_SUGGESTED); GST_OBJECT_FLAG_SET (GST_ELEMENT (v4l2src), GST_ELEMENT_THREAD_SUGGESTED);
v4l2src->srcpad = v4l2src->srcpad =
gst_pad_new_from_template (gst_element_class_get_pad_template gst_pad_new_from_template (gst_element_class_get_pad_template

18
sys/vcd/vcdsrc.c
View file

@ -219,7 +219,7 @@ gst_vcdsrc_set_property (GObject * object, guint prop_id, const GValue * value,
case ARG_DEVICE: case ARG_DEVICE:
case ARG_LOCATION: case ARG_LOCATION:
/* the element must be stopped in order to do this */ /* 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); g_free (src->device);
/* clear the filename if we get a NULL (is that possible?) */ /* 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); g_return_val_if_fail (GST_IS_PAD (pad), NULL);
vcdsrc = GST_VCDSRC (GST_OBJECT_PARENT (pad)); 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; offset = vcdsrc->trackoffset + vcdsrc->curoffset;
if (offset >= gst_vcdsrc_msf (vcdsrc, vcdsrc->track + 1)) { if (offset >= gst_vcdsrc_msf (vcdsrc, vcdsrc->track + 1)) {
@ -484,7 +484,7 @@ gst_vcdsrc_open_file (GstVCDSrc * src)
{ {
int i; 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 */ /* open the device */
src->fd = open (src->device, O_RDONLY); src->fd = open (src->device, O_RDONLY);
@ -520,7 +520,7 @@ gst_vcdsrc_open_file (GstVCDSrc * src)
src->tracks[i].cdte_addr.msf.frame); src->tracks[i].cdte_addr.msf.frame);
} }
GST_FLAG_SET (src, VCDSRC_OPEN); GST_OBJECT_FLAG_SET (src, VCDSRC_OPEN);
gst_vcdsrc_recalculate (src); gst_vcdsrc_recalculate (src);
return TRUE; return TRUE;
@ -530,7 +530,7 @@ gst_vcdsrc_open_file (GstVCDSrc * src)
static void static void
gst_vcdsrc_close_file (GstVCDSrc * src) 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 the file */
close (src->fd); close (src->fd);
@ -542,7 +542,7 @@ gst_vcdsrc_close_file (GstVCDSrc * src)
g_free (src->tracks); g_free (src->tracks);
GST_FLAG_UNSET (src, VCDSRC_OPEN); GST_OBJECT_FLAG_UNSET (src, VCDSRC_OPEN);
} }
static GstStateChangeReturn static GstStateChangeReturn
@ -552,7 +552,7 @@ gst_vcdsrc_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL: 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); gst_vcdsrc_close_file (vcdsrc);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
@ -560,7 +560,7 @@ gst_vcdsrc_change_state (GstElement * element, GstStateChange transition)
vcdsrc->discont = vcdsrc->flush = FALSE; vcdsrc->discont = vcdsrc->flush = FALSE;
break; break;
case GST_STATE_CHANGE_NULL_TO_READY: 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)) if (!gst_vcdsrc_open_file (vcdsrc))
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
break; break;
@ -585,7 +585,7 @@ gst_vcdsrc_msf (GstVCDSrc * vcdsrc, gint track)
static void static void
gst_vcdsrc_recalculate (GstVCDSrc * vcdsrc) 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) */ /* calculate track offset (beginning of track) */
vcdsrc->trackoffset = gst_vcdsrc_msf (vcdsrc, vcdsrc->track); vcdsrc->trackoffset = gst_vcdsrc_msf (vcdsrc, vcdsrc->track);
GST_DEBUG ("track offset is %ld", vcdsrc->trackoffset); GST_DEBUG ("track offset is %ld", vcdsrc->trackoffset);

4
sys/vcd/vcdsrc.h
View file

@ -41,9 +41,9 @@ G_BEGIN_DECLS
/* NOTE: per-element flags start with 16 for now */ /* NOTE: per-element flags start with 16 for now */
typedef enum { 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; } GstVCDSrcFlags;
typedef struct _GstVCDSrc GstVCDSrc; typedef struct _GstVCDSrc GstVCDSrc;