mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +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/cdparanoia/gstcdparanoia.c: (cdparanoia_get),
(cdparanoia_open), (cdparanoia_close), (cdparanoia_event),
(cdparanoia_convert), (cdparanoia_query):
* ext/cdparanoia/gstcdparanoia.h:
* ext/gnomevfs/gstgnomevfssink.c: (gst_gnomevfssink_init),
(gst_gnomevfssink_open_file), (gst_gnomevfssink_close_file),
(gst_gnomevfssink_chain), (gst_gnomevfssink_change_state):
* ext/ogg/gstoggmux.c: (gst_ogg_mux_init):
* gst/audioscale/gstaudioscale.c: (gst_audioscale_init):
* gst/playback/gststreamselector.c: (gst_stream_selector_init):
* gst/tcp/gstmultifdsink.c: (gst_multifdsink_init),
(gst_multifdsink_render), (gst_multifdsink_start),
(gst_multifdsink_stop):
* gst/tcp/gstmultifdsink.h:
* gst/tcp/gsttcpclientsink.c: (gst_tcpclientsink_init),
(gst_tcpclientsink_render), (gst_tcpclientsink_start),
(gst_tcpclientsink_stop):
* gst/tcp/gsttcpclientsink.h:
* gst/tcp/gsttcpclientsrc.c: (gst_tcpclientsrc_init),
(gst_tcpclientsrc_getcaps), (gst_tcpclientsrc_create),
(gst_tcpclientsrc_start), (gst_tcpclientsrc_stop):
* gst/tcp/gsttcpclientsrc.h:
* gst/tcp/gsttcpserversink.h:
* gst/tcp/gsttcpserversrc.c: (gst_tcpserversrc_init),
(gst_tcpserversrc_create), (gst_tcpserversrc_start),
(gst_tcpserversrc_stop):
* gst/tcp/gsttcpserversrc.h:
* sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_init):
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_init):
* sys/ximage/ximagesink.c: (gst_ximagesink_init):
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:32:29 +00:00
parent e28f0d9eac
commit 43bc15fa94
21 changed files with 95 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ChangeLog
View file

@ -1,3 +1,39 @@
2005-10-12 Stefan Kost <ensonic@users.sf.net>
* examples/indexing/indexmpeg.c: (main):
* ext/cdparanoia/gstcdparanoia.c: (cdparanoia_get),
(cdparanoia_open), (cdparanoia_close), (cdparanoia_event),
(cdparanoia_convert), (cdparanoia_query):
* ext/cdparanoia/gstcdparanoia.h:
* ext/gnomevfs/gstgnomevfssink.c: (gst_gnomevfssink_init),
(gst_gnomevfssink_open_file), (gst_gnomevfssink_close_file),
(gst_gnomevfssink_chain), (gst_gnomevfssink_change_state):
* ext/ogg/gstoggmux.c: (gst_ogg_mux_init):
* gst/audioscale/gstaudioscale.c: (gst_audioscale_init):
* gst/playback/gststreamselector.c: (gst_stream_selector_init):
* gst/tcp/gstmultifdsink.c: (gst_multifdsink_init),
(gst_multifdsink_render), (gst_multifdsink_start),
(gst_multifdsink_stop):
* gst/tcp/gstmultifdsink.h:
* gst/tcp/gsttcpclientsink.c: (gst_tcpclientsink_init),
(gst_tcpclientsink_render), (gst_tcpclientsink_start),
(gst_tcpclientsink_stop):
* gst/tcp/gsttcpclientsink.h:
* gst/tcp/gsttcpclientsrc.c: (gst_tcpclientsrc_init),
(gst_tcpclientsrc_getcaps), (gst_tcpclientsrc_create),
(gst_tcpclientsrc_start), (gst_tcpclientsrc_stop):
* gst/tcp/gsttcpclientsrc.h:
* gst/tcp/gsttcpserversink.h:
* gst/tcp/gsttcpserversrc.c: (gst_tcpserversrc_init),
(gst_tcpserversrc_create), (gst_tcpserversrc_start),
(gst_tcpserversrc_stop):
* gst/tcp/gsttcpserversrc.h:
* sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_init):
* sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_init):
* sys/ximage/ximagesink.c: (gst_ximagesink_init):
renamed GST_FLAGS macros to GST_OBJECT_FLAGS
moved bitshift from macro to enum definition
2005-10-12 Wim Taymans <wim@fluendo.com> 2005-10-12 Wim Taymans <wim@fluendo.com>
* examples/seeking/Makefile.am: * examples/seeking/Makefile.am:

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");

16
ext/cdparanoia/gstcdparanoia.c
View file

@ -477,7 +477,7 @@ cdparanoia_get (GstPad * pad)
src = CDPARANOIA (gst_pad_get_parent (pad)); src = CDPARANOIA (gst_pad_get_parent (pad));
g_return_val_if_fail (GST_FLAG_IS_SET (src, CDPARANOIA_OPEN), NULL); g_return_val_if_fail (GST_OBJECT_FLAG_IS_SET (src, CDPARANOIA_OPEN), NULL);
if (src->seek_request != -1) { if (src->seek_request != -1) {
gst_pad_send_event (src->srcpad, gst_pad_send_event (src->srcpad,
@ -662,7 +662,7 @@ cdparanoia_open (CDParanoia * src)
gint i; gint i;
gint paranoia_mode; gint paranoia_mode;
g_return_val_if_fail (!GST_FLAG_IS_SET (src, CDPARANOIA_OPEN), FALSE); g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (src, CDPARANOIA_OPEN), FALSE);
GST_DEBUG_OBJECT (src, "trying to open device..."); GST_DEBUG_OBJECT (src, "trying to open device...");
@ -759,7 +759,7 @@ cdparanoia_open (CDParanoia * src)
paranoia_seek (src->p, src->cur_sector, SEEK_SET); paranoia_seek (src->p, src->cur_sector, SEEK_SET);
GST_DEBUG ("successfully seek'd to beginning of disk"); GST_DEBUG ("successfully seek'd to beginning of disk");
GST_FLAG_SET (src, CDPARANOIA_OPEN); GST_OBJECT_FLAG_SET (src, CDPARANOIA_OPEN);
if (src->index && GST_INDEX_IS_WRITABLE (src->index)) { if (src->index && GST_INDEX_IS_WRITABLE (src->index)) {
add_index_associations (src); add_index_associations (src);
@ -774,7 +774,7 @@ cdparanoia_open (CDParanoia * src)
static void static void
cdparanoia_close (CDParanoia * src) cdparanoia_close (CDParanoia * src)
{ {
g_return_if_fail (GST_FLAG_IS_SET (src, CDPARANOIA_OPEN)); g_return_if_fail (GST_OBJECT_FLAG_IS_SET (src, CDPARANOIA_OPEN));
/* kill the paranoia state */ /* kill the paranoia state */
paranoia_free (src->p); paranoia_free (src->p);
@ -785,7 +785,7 @@ cdparanoia_close (CDParanoia * src)
cdda_close (src->d); cdda_close (src->d);
src->d = NULL; src->d = NULL;
GST_FLAG_UNSET (src, CDPARANOIA_OPEN); GST_OBJECT_FLAG_UNSET (src, CDPARANOIA_OPEN);
} }
static GstStateChangeReturn static GstStateChangeReturn
@ -853,7 +853,7 @@ cdparanoia_event (GstPad * pad, GstEvent * event)
src = CDPARANOIA (gst_pad_get_parent (pad)); src = CDPARANOIA (gst_pad_get_parent (pad));
if (!GST_FLAG_IS_SET (src, CDPARANOIA_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (src, CDPARANOIA_OPEN)) {
GST_DEBUG ("device not open, cannot handle event"); GST_DEBUG ("device not open, cannot handle event");
goto error; goto error;
} }
@ -974,7 +974,7 @@ cdparanoia_convert (GstPad * pad,
src = CDPARANOIA (gst_pad_get_parent (pad)); src = CDPARANOIA (gst_pad_get_parent (pad));
if (!GST_FLAG_IS_SET (src, CDPARANOIA_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (src, CDPARANOIA_OPEN)) {
return FALSE; return FALSE;
} }
@ -1095,7 +1095,7 @@ cdparanoia_query (GstPad * pad, GstQueryType type,
src = CDPARANOIA (gst_pad_get_parent (pad)); src = CDPARANOIA (gst_pad_get_parent (pad));
if (!GST_FLAG_IS_SET (src, CDPARANOIA_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (src, CDPARANOIA_OPEN)) {
return FALSE; return FALSE;
} }

4
ext/cdparanoia/gstcdparanoia.h
View file

@ -58,9 +58,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 {
CDPARANOIA_OPEN = GST_ELEMENT_FLAG_LAST, CDPARANOIA_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
CDPARANOIA_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2, CDPARANOIA_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} CDParanoiaFlags; } CDParanoiaFlags;
typedef struct _CDParanoia CDParanoia; typedef struct _CDParanoia CDParanoia;

17
ext/gnomevfs/gstgnomevfssink.c
View file

@ -244,7 +244,7 @@ gst_gnomevfssink_init (GstGnomeVFSSink * gnomevfssink)
{ {
GstPad *pad; GstPad *pad;
GST_FLAG_SET (gnomevfssink, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (gnomevfssink, GST_ELEMENT_EVENT_AWARE);
pad = gst_pad_new ("sink", GST_PAD_SINK); pad = gst_pad_new ("sink", GST_PAD_SINK);
gst_element_add_pad (GST_ELEMENT (gnomevfssink), pad); gst_element_add_pad (GST_ELEMENT (gnomevfssink), pad);
@ -399,7 +399,8 @@ gst_gnomevfssink_open_file (GstGnomeVFSSink * sink)
{ {
GnomeVFSResult result; GnomeVFSResult result;
g_return_val_if_fail (!GST_FLAG_IS_SET (sink, GST_GNOMEVFSSINK_OPEN), FALSE); g_return_val_if_fail (!GST_OBJECT_FLAG_IS_SET (sink, GST_GNOMEVFSSINK_OPEN),
FALSE);
if (sink->uri) { if (sink->uri) {
/* open the file */ /* open the file */
@ -441,7 +442,7 @@ gst_gnomevfssink_open_file (GstGnomeVFSSink * sink)
sink->own_handle = FALSE; sink->own_handle = FALSE;
} }
GST_FLAG_SET (sink, GST_GNOMEVFSSINK_OPEN); GST_OBJECT_FLAG_SET (sink, GST_GNOMEVFSSINK_OPEN);
return TRUE; return TRUE;
} }
@ -451,7 +452,7 @@ gst_gnomevfssink_close_file (GstGnomeVFSSink * sink)
{ {
GnomeVFSResult result; GnomeVFSResult result;
g_return_if_fail (GST_FLAG_IS_SET (sink, GST_GNOMEVFSSINK_OPEN)); g_return_if_fail (GST_OBJECT_FLAG_IS_SET (sink, GST_GNOMEVFSSINK_OPEN));
if (sink->own_handle) { if (sink->own_handle) {
/* close the file */ /* close the file */
@ -470,7 +471,7 @@ gst_gnomevfssink_close_file (GstGnomeVFSSink * sink)
sink->handle = NULL; sink->handle = NULL;
} }
GST_FLAG_UNSET (sink, GST_GNOMEVFSSINK_OPEN); GST_OBJECT_FLAG_UNSET (sink, GST_GNOMEVFSSINK_OPEN);
} }
/** /**
@ -594,7 +595,7 @@ gst_gnomevfssink_chain (GstPad * pad, GstData * _data)
sink = GST_GNOMEVFSSINK (gst_pad_get_parent (pad)); sink = GST_GNOMEVFSSINK (gst_pad_get_parent (pad));
if (GST_FLAG_IS_SET (sink, GST_GNOMEVFSSINK_OPEN)) { if (GST_OBJECT_FLAG_IS_SET (sink, GST_GNOMEVFSSINK_OPEN)) {
if (GST_IS_EVENT (_data)) { if (GST_IS_EVENT (_data)) {
gst_gnomevfssink_handle_event (sink, GST_EVENT (_data)); gst_gnomevfssink_handle_event (sink, GST_EVENT (_data));
return; return;
@ -624,13 +625,13 @@ gst_gnomevfssink_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
if (!GST_FLAG_IS_SET (element, GST_GNOMEVFSSINK_OPEN)) { if (!GST_OBJECT_FLAG_IS_SET (element, GST_GNOMEVFSSINK_OPEN)) {
if (!gst_gnomevfssink_open_file (GST_GNOMEVFSSINK (element))) if (!gst_gnomevfssink_open_file (GST_GNOMEVFSSINK (element)))
return GST_STATE_CHANGE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
if (GST_FLAG_IS_SET (element, GST_GNOMEVFSSINK_OPEN)) if (GST_OBJECT_FLAG_IS_SET (element, GST_GNOMEVFSSINK_OPEN))
gst_gnomevfssink_close_file (GST_GNOMEVFSSINK (element)); gst_gnomevfssink_close_file (GST_GNOMEVFSSINK (element));
break; break;
default: default:

2
ext/ogg/gstoggmux.c
View file

@ -266,7 +266,7 @@ gst_ogg_mux_init (GstOggMux * ogg_mux)
gst_pad_set_event_function (ogg_mux->srcpad, gst_ogg_mux_handle_src_event); gst_pad_set_event_function (ogg_mux->srcpad, gst_ogg_mux_handle_src_event);
gst_element_add_pad (GST_ELEMENT (ogg_mux), ogg_mux->srcpad); gst_element_add_pad (GST_ELEMENT (ogg_mux), ogg_mux->srcpad);
GST_FLAG_SET (GST_ELEMENT (ogg_mux), GST_OGG_FLAG_BOS); GST_OBJECT_FLAG_SET (GST_ELEMENT (ogg_mux), GST_OGG_FLAG_BOS);
/* seed random number generator for creation of serial numbers */ /* seed random number generator for creation of serial numbers */
srand (time (NULL)); srand (time (NULL));

2
gst/audioscale/gstaudioscale.c
View file

@ -519,7 +519,7 @@ gst_audioscale_init (Audioscale * audioscale)
audioscale->gst_resample_offset = 0; audioscale->gst_resample_offset = 0;
audioscale->increase = FALSE; audioscale->increase = FALSE;
GST_FLAG_SET (audioscale, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (audioscale, GST_ELEMENT_EVENT_AWARE);
} }
static void static void

2
gst/playback/gststreamselector.c
View file

@ -140,7 +140,7 @@ gst_stream_selector_init (GstStreamSelector * sel)
sel->last_active_sinkpad = NULL; sel->last_active_sinkpad = NULL;
sel->nb_sinkpads = 0; sel->nb_sinkpads = 0;
//GST_FLAG_SET (sel, GST_ELEMENT_WORK_IN_PLACE); //GST_OBJECT_FLAG_SET (sel, GST_ELEMENT_WORK_IN_PLACE);
} }
static void static void

12
gst/tcp/gstmultifdsink.c
View file

@ -446,7 +446,7 @@ gst_multifdsink_class_init (GstMultiFdSinkClass * klass)
static void static void
gst_multifdsink_init (GstMultiFdSink * this) gst_multifdsink_init (GstMultiFdSink * this)
{ {
GST_FLAG_UNSET (this, GST_MULTIFDSINK_OPEN); GST_OBJECT_FLAG_UNSET (this, GST_MULTIFDSINK_OPEN);
this->protocol = DEFAULT_PROTOCOL; this->protocol = DEFAULT_PROTOCOL;
this->mode = DEFAULT_MODE; this->mode = DEFAULT_MODE;
@ -1523,7 +1523,7 @@ gst_multifdsink_render (GstBaseSink * bsink, GstBuffer * buf)
/* since we keep this buffer out of the scope of this method */ /* since we keep this buffer out of the scope of this method */
gst_buffer_ref (buf); gst_buffer_ref (buf);
g_return_val_if_fail (GST_FLAG_IS_SET (sink, GST_MULTIFDSINK_OPEN), g_return_val_if_fail (GST_OBJECT_FLAG_IS_SET (sink, GST_MULTIFDSINK_OPEN),
GST_FLOW_ERROR); GST_FLOW_ERROR);
GST_LOG_OBJECT (sink, "received buffer %p", buf); GST_LOG_OBJECT (sink, "received buffer %p", buf);
@ -1691,7 +1691,7 @@ gst_multifdsink_start (GstBaseSink * bsink)
int control_socket[2]; int control_socket[2];
GstMultiFdSink *this; GstMultiFdSink *this;
if (GST_FLAG_IS_SET (bsink, GST_MULTIFDSINK_OPEN)) if (GST_OBJECT_FLAG_IS_SET (bsink, GST_MULTIFDSINK_OPEN))
return TRUE; return TRUE;
this = GST_MULTIFDSINK (bsink); this = GST_MULTIFDSINK (bsink);
@ -1724,7 +1724,7 @@ gst_multifdsink_start (GstBaseSink * bsink)
this->thread = g_thread_create ((GThreadFunc) gst_multifdsink_thread, this->thread = g_thread_create ((GThreadFunc) gst_multifdsink_thread,
this, TRUE, NULL); this, TRUE, NULL);
GST_FLAG_SET (this, GST_MULTIFDSINK_OPEN); GST_OBJECT_FLAG_SET (this, GST_MULTIFDSINK_OPEN);
return TRUE; return TRUE;
@ -1752,7 +1752,7 @@ gst_multifdsink_stop (GstBaseSink * bsink)
this = GST_MULTIFDSINK (bsink); this = GST_MULTIFDSINK (bsink);
fclass = GST_MULTIFDSINK_GET_CLASS (this); fclass = GST_MULTIFDSINK_GET_CLASS (this);
if (!GST_FLAG_IS_SET (bsink, GST_MULTIFDSINK_OPEN)) if (!GST_OBJECT_FLAG_IS_SET (bsink, GST_MULTIFDSINK_OPEN))
return TRUE; return TRUE;
this->running = FALSE; this->running = FALSE;
@ -1784,7 +1784,7 @@ gst_multifdsink_stop (GstBaseSink * bsink)
this->fdset = NULL; this->fdset = NULL;
} }
g_hash_table_foreach_remove (this->fd_hash, multifdsink_hash_remove, this); g_hash_table_foreach_remove (this->fd_hash, multifdsink_hash_remove, this);
GST_FLAG_UNSET (this, GST_MULTIFDSINK_OPEN); GST_OBJECT_FLAG_UNSET (this, GST_MULTIFDSINK_OPEN);
return TRUE; return TRUE;
} }

4
gst/tcp/gstmultifdsink.h
View file

@ -48,9 +48,9 @@ typedef struct _GstMultiFdSink GstMultiFdSink;
typedef struct _GstMultiFdSinkClass GstMultiFdSinkClass; typedef struct _GstMultiFdSinkClass GstMultiFdSinkClass;
typedef enum { typedef enum {
GST_MULTIFDSINK_OPEN = GST_ELEMENT_FLAG_LAST, GST_MULTIFDSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_MULTIFDSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_MULTIFDSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstMultiFdSinkFlags; } GstMultiFdSinkFlags;
typedef enum typedef enum

12
gst/tcp/gsttcpclientsink.c
View file

@ -160,7 +160,7 @@ gst_tcpclientsink_init (GstTCPClientSink * this)
this->sock_fd = -1; this->sock_fd = -1;
this->protocol = GST_TCP_PROTOCOL_NONE; this->protocol = GST_TCP_PROTOCOL_NONE;
GST_FLAG_UNSET (this, GST_TCPCLIENTSINK_OPEN); GST_OBJECT_FLAG_UNSET (this, GST_TCPCLIENTSINK_OPEN);
} }
static void static void
@ -224,7 +224,7 @@ gst_tcpclientsink_render (GstBaseSink * bsink, GstBuffer * buf)
sink = GST_TCPCLIENTSINK (bsink); sink = GST_TCPCLIENTSINK (bsink);
g_return_val_if_fail (GST_FLAG_IS_SET (sink, GST_TCPCLIENTSINK_OPEN), g_return_val_if_fail (GST_OBJECT_FLAG_IS_SET (sink, GST_TCPCLIENTSINK_OPEN),
GST_FLOW_WRONG_STATE); GST_FLOW_WRONG_STATE);
size = GST_BUFFER_SIZE (buf); size = GST_BUFFER_SIZE (buf);
@ -335,7 +335,7 @@ gst_tcpclientsink_start (GstTCPClientSink * this)
int ret; int ret;
gchar *ip; gchar *ip;
if (GST_FLAG_IS_SET (this, GST_TCPCLIENTSINK_OPEN)) if (GST_OBJECT_FLAG_IS_SET (this, GST_TCPCLIENTSINK_OPEN))
return TRUE; return TRUE;
/* reset caps_sent flag */ /* reset caps_sent flag */
@ -388,7 +388,7 @@ gst_tcpclientsink_start (GstTCPClientSink * this)
} }
} }
GST_FLAG_SET (this, GST_TCPCLIENTSINK_OPEN); GST_OBJECT_FLAG_SET (this, GST_TCPCLIENTSINK_OPEN);
this->data_written = 0; this->data_written = 0;
@ -398,7 +398,7 @@ gst_tcpclientsink_start (GstTCPClientSink * this)
static gboolean static gboolean
gst_tcpclientsink_stop (GstTCPClientSink * this) gst_tcpclientsink_stop (GstTCPClientSink * this)
{ {
if (!GST_FLAG_IS_SET (this, GST_TCPCLIENTSINK_OPEN)) if (!GST_OBJECT_FLAG_IS_SET (this, GST_TCPCLIENTSINK_OPEN))
return TRUE; return TRUE;
if (this->sock_fd != -1) { if (this->sock_fd != -1) {
@ -406,7 +406,7 @@ gst_tcpclientsink_stop (GstTCPClientSink * this)
this->sock_fd = -1; this->sock_fd = -1;
} }
GST_FLAG_UNSET (this, GST_TCPCLIENTSINK_OPEN); GST_OBJECT_FLAG_UNSET (this, GST_TCPCLIENTSINK_OPEN);
return TRUE; return TRUE;
} }

4
gst/tcp/gsttcpclientsink.h
View file

@ -59,9 +59,9 @@ typedef struct _GstTCPClientSink GstTCPClientSink;
typedef struct _GstTCPClientSinkClass GstTCPClientSinkClass; typedef struct _GstTCPClientSinkClass GstTCPClientSinkClass;
typedef enum { typedef enum {
GST_TCPCLIENTSINK_OPEN = GST_ELEMENT_FLAG_LAST, GST_TCPCLIENTSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_TCPCLIENTSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_TCPCLIENTSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2),
} GstTCPClientSinkFlags; } GstTCPClientSinkFlags;
struct _GstTCPClientSink { struct _GstTCPClientSink {

10
gst/tcp/gsttcpclientsrc.c
View file

@ -160,7 +160,7 @@ gst_tcpclientsrc_init (GstTCPClientSrc * this, GstTCPClientSrcClass * g_class)
gst_base_src_set_live (GST_BASE_SRC (this), TRUE); gst_base_src_set_live (GST_BASE_SRC (this), TRUE);
GST_FLAG_UNSET (this, GST_TCPCLIENTSRC_OPEN); GST_OBJECT_FLAG_UNSET (this, GST_TCPCLIENTSRC_OPEN);
} }
static void static void
@ -179,7 +179,7 @@ gst_tcpclientsrc_getcaps (GstBaseSrc * bsrc)
src = GST_TCPCLIENTSRC (bsrc); src = GST_TCPCLIENTSRC (bsrc);
if (!GST_FLAG_IS_SET (src, GST_TCPCLIENTSRC_OPEN)) if (!GST_OBJECT_FLAG_IS_SET (src, GST_TCPCLIENTSRC_OPEN))
caps = gst_caps_new_any (); caps = gst_caps_new_any ();
else if (src->caps) else if (src->caps)
caps = gst_caps_copy (src->caps); caps = gst_caps_copy (src->caps);
@ -198,7 +198,7 @@ gst_tcpclientsrc_create (GstPushSrc * psrc, GstBuffer ** outbuf)
src = GST_TCPCLIENTSRC (psrc); src = GST_TCPCLIENTSRC (psrc);
if (!GST_FLAG_IS_SET (src, GST_TCPCLIENTSRC_OPEN)) if (!GST_OBJECT_FLAG_IS_SET (src, GST_TCPCLIENTSRC_OPEN))
goto wrong_state; goto wrong_state;
GST_LOG_OBJECT (src, "asked for a buffer"); GST_LOG_OBJECT (src, "asked for a buffer");
@ -338,7 +338,7 @@ gst_tcpclientsrc_start (GstBaseSrc * bsrc)
GST_DEBUG_OBJECT (src, "opened receiving client socket with fd %d", GST_DEBUG_OBJECT (src, "opened receiving client socket with fd %d",
src->sock_fd); src->sock_fd);
GST_FLAG_SET (src, GST_TCPCLIENTSRC_OPEN); GST_OBJECT_FLAG_SET (src, GST_TCPCLIENTSRC_OPEN);
/* look up name if we need to */ /* look up name if we need to */
if (!(ip = gst_tcp_host_to_ip (GST_ELEMENT (src), src->host))) if (!(ip = gst_tcp_host_to_ip (GST_ELEMENT (src), src->host)))
@ -414,7 +414,7 @@ gst_tcpclientsrc_stop (GstBaseSrc * bsrc)
gst_caps_unref (src->caps); gst_caps_unref (src->caps);
src->caps = NULL; src->caps = NULL;
} }
GST_FLAG_UNSET (src, GST_TCPCLIENTSRC_OPEN); GST_OBJECT_FLAG_UNSET (src, GST_TCPCLIENTSRC_OPEN);
close (READ_SOCKET (src)); close (READ_SOCKET (src));
close (WRITE_SOCKET (src)); close (WRITE_SOCKET (src));

4
gst/tcp/gsttcpclientsrc.h
View file

@ -50,9 +50,9 @@ typedef struct _GstTCPClientSrc GstTCPClientSrc;
typedef struct _GstTCPClientSrcClass GstTCPClientSrcClass; typedef struct _GstTCPClientSrcClass GstTCPClientSrcClass;
typedef enum { typedef enum {
GST_TCPCLIENTSRC_OPEN = GST_ELEMENT_FLAG_LAST, GST_TCPCLIENTSRC_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_TCPCLIENTSRC_FLAG_LAST, GST_TCPCLIENTSRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2)
} GstTCPClientSrcFlags; } GstTCPClientSrcFlags;
struct _GstTCPClientSrc { struct _GstTCPClientSrc {

4
gst/tcp/gsttcpserversink.h
View file

@ -57,9 +57,9 @@ typedef struct _GstTCPServerSink GstTCPServerSink;
typedef struct _GstTCPServerSinkClass GstTCPServerSinkClass; typedef struct _GstTCPServerSinkClass GstTCPServerSinkClass;
typedef enum { typedef enum {
GST_TCPSERVERSINK_OPEN = GST_ELEMENT_FLAG_LAST, GST_TCPSERVERSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_TCPSERVERSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_TCPSERVERSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2)
} GstTCPServerSinkFlags; } GstTCPServerSinkFlags;
struct _GstTCPServerSink { struct _GstTCPServerSink {

8
gst/tcp/gsttcpserversrc.c
View file

@ -154,7 +154,7 @@ gst_tcpserversrc_init (GstTCPServerSrc * src, GstTCPServerSrcClass * g_class)
READ_SOCKET (src) = -1; READ_SOCKET (src) = -1;
WRITE_SOCKET (src) = -1; WRITE_SOCKET (src) = -1;
GST_FLAG_UNSET (src, GST_TCPSERVERSRC_OPEN); GST_OBJECT_FLAG_UNSET (src, GST_TCPSERVERSRC_OPEN);
} }
static void static void
@ -175,7 +175,7 @@ gst_tcpserversrc_create (GstPushSrc * psrc, GstBuffer ** outbuf)
src = GST_TCPSERVERSRC (psrc); src = GST_TCPSERVERSRC (psrc);
if (!GST_FLAG_IS_SET (src, GST_TCPSERVERSRC_OPEN)) if (!GST_OBJECT_FLAG_IS_SET (src, GST_TCPSERVERSRC_OPEN))
goto wrong_state; goto wrong_state;
restart: restart:
@ -418,7 +418,7 @@ gst_tcpserversrc_start (GstBaseSrc * bsrc)
GST_DEBUG_OBJECT (src, "received client"); GST_DEBUG_OBJECT (src, "received client");
GST_FLAG_SET (src, GST_TCPSERVERSRC_OPEN); GST_OBJECT_FLAG_SET (src, GST_TCPSERVERSRC_OPEN);
return TRUE; return TRUE;
@ -478,7 +478,7 @@ gst_tcpserversrc_stop (GstBaseSrc * bsrc)
close (src->client_sock_fd); close (src->client_sock_fd);
src->client_sock_fd = -1; src->client_sock_fd = -1;
} }
GST_FLAG_UNSET (src, GST_TCPSERVERSRC_OPEN); GST_OBJECT_FLAG_UNSET (src, GST_TCPSERVERSRC_OPEN);
close (READ_SOCKET (src)); close (READ_SOCKET (src));
close (WRITE_SOCKET (src)); close (WRITE_SOCKET (src));

4
gst/tcp/gsttcpserversrc.h
View file

@ -53,9 +53,9 @@ typedef struct _GstTCPServerSrc GstTCPServerSrc;
typedef struct _GstTCPServerSrcClass GstTCPServerSrcClass; typedef struct _GstTCPServerSrcClass GstTCPServerSrcClass;
typedef enum { typedef enum {
GST_TCPSERVERSRC_OPEN = GST_ELEMENT_FLAG_LAST, GST_TCPSERVERSRC_OPEN = (GST_ELEMENT_FLAG_LAST << 0),
GST_TCPSERVERSRC_FLAG_LAST, GST_TCPSERVERSRC_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2)
} GstTCPServerSrcFlags; } GstTCPServerSrcFlags;
struct _GstTCPServerSrc { struct _GstTCPServerSrc {

2
sys/v4l/gstv4lmjpegsink.c
View file

@ -196,7 +196,7 @@ gst_v4lmjpegsink_init (GstV4lMjpegSink * v4lmjpegsink)
v4lmjpegsink->numbufs = 64; v4lmjpegsink->numbufs = 64;
v4lmjpegsink->bufsize = 256; v4lmjpegsink->bufsize = 256;
GST_FLAG_SET (v4lmjpegsink, GST_ELEMENT_THREAD_SUGGESTED); GST_OBJECT_FLAG_SET (v4lmjpegsink, GST_ELEMENT_THREAD_SUGGESTED);
} }

2
sys/v4l/gstv4lmjpegsrc.c
View file

@ -229,7 +229,7 @@ gst_v4lmjpegsrc_init (GstV4lMjpegSrc * v4lmjpegsrc)
{ {
GstElementClass *klass = GST_ELEMENT_GET_CLASS (v4lmjpegsrc); GstElementClass *klass = GST_ELEMENT_GET_CLASS (v4lmjpegsrc);
GST_FLAG_SET (GST_ELEMENT (v4lmjpegsrc), GST_ELEMENT_THREAD_SUGGESTED); GST_OBJECT_FLAG_SET (GST_ELEMENT (v4lmjpegsrc), GST_ELEMENT_THREAD_SUGGESTED);
v4lmjpegsrc->srcpad = v4lmjpegsrc->srcpad =
gst_pad_new_from_template (gst_element_class_get_pad_template (klass, gst_pad_new_from_template (gst_element_class_get_pad_template (klass,

4
sys/ximage/ximagesink.c
View file

@ -1799,8 +1799,8 @@ gst_ximagesink_init (GstXImageSink * ximagesink)
ximagesink->pend_nav_events = NULL; ximagesink->pend_nav_events = NULL;
#if 0 #if 0
GST_FLAG_SET (ximagesink, GST_ELEMENT_THREAD_SUGGESTED); GST_OBJECT_FLAG_SET (ximagesink, GST_ELEMENT_THREAD_SUGGESTED);
GST_FLAG_SET (ximagesink, GST_ELEMENT_EVENT_AWARE); GST_OBJECT_FLAG_SET (ximagesink, GST_ELEMENT_EVENT_AWARE);
#endif #endif
} }

2
tests/old/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");