mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstbin.*: 'private' is a c++ keyword, let's not use that in header files, otherwise c++ compilers will throw a ta...

Browse source 
Original commit message from CVS:
* gst/gstbin.c: (gst_bin_init), (gst_bin_dispose),
(gst_bin_set_property), (gst_bin_get_property),
(gst_bin_remove_func), (gst_bin_handle_message_func):
* gst/gstbin.h:
'private' is a c++ keyword, let's not use that in header files,
otherwise c++ compilers will throw a tantrum.
This commit is contained in:
Tim-Philipp Müller 2007-05-22 17:10:04 +00:00
parent e4ab657d95
commit 93230e96fe
3 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2007-05-22 Tim-Philipp Müller <tim at centricular dot net>
* gst/gstbin.c: (gst_bin_init), (gst_bin_dispose),
(gst_bin_set_property), (gst_bin_get_property),
(gst_bin_remove_func), (gst_bin_handle_message_func):
* gst/gstbin.h:
'private' is a c++ keyword, let's not use that in header files,
otherwise c++ compilers will throw a tantrum.
2007-05-22 Tim-Philipp Müller <tim at centricular dot net> 2007-05-22 Tim-Philipp Müller <tim at centricular dot net>
* plugins/elements/gstelements.c: * plugins/elements/gstelements.c:

20
gst/gstbin.c
View file

@ -474,8 +474,8 @@ gst_bin_init (GstBin * bin)
bus); bus);
gst_bus_set_sync_handler (bus, (GstBusSyncHandler) bin_bus_handler, bin); gst_bus_set_sync_handler (bus, (GstBusSyncHandler) bin_bus_handler, bin);
bin->private = g_new0 (GstBinPrivate, 1); bin->priv = g_new0 (GstBinPrivate, 1);
bin->private->asynchandling = FALSE; bin->priv->asynchandling = FALSE;
} }
static void static void
@ -502,9 +502,9 @@ gst_bin_dispose (GObject * object)
GST_STR_NULL (GST_OBJECT_NAME (object))); GST_STR_NULL (GST_OBJECT_NAME (object)));
} }
if (bin->private) { if (bin->priv) {
g_free (bin->private); g_free (bin->priv);
bin->private = NULL; bin->priv = NULL;
} }
G_OBJECT_CLASS (parent_class)->dispose (object); G_OBJECT_CLASS (parent_class)->dispose (object);
@ -535,7 +535,7 @@ gst_bin_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_ASYNC_HANDLING: case PROP_ASYNC_HANDLING:
GST_OBJECT_LOCK (gstbin); GST_OBJECT_LOCK (gstbin);
gstbin->private->asynchandling = g_value_get_boolean (value); gstbin->priv->asynchandling = g_value_get_boolean (value);
GST_OBJECT_UNLOCK (gstbin); GST_OBJECT_UNLOCK (gstbin);
break; break;
default: default:
@ -555,7 +555,7 @@ gst_bin_get_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_ASYNC_HANDLING: case PROP_ASYNC_HANDLING:
GST_OBJECT_LOCK (gstbin); GST_OBJECT_LOCK (gstbin);
g_value_set_boolean (value, gstbin->private->asynchandling); g_value_set_boolean (value, gstbin->priv->asynchandling);
GST_OBJECT_UNLOCK (gstbin); GST_OBJECT_UNLOCK (gstbin);
break; break;
default: default:
@ -1091,7 +1091,7 @@ gst_bin_remove_func (GstBin * bin, GstElement * element)
if (!other_async && this_async) { if (!other_async && this_async) {
GST_DEBUG_OBJECT (bin, "we removed the last async element"); GST_DEBUG_OBJECT (bin, "we removed the last async element");
cont = ((GST_OBJECT_PARENT (bin) == NULL) || bin->private->asynchandling); cont = ((GST_OBJECT_PARENT (bin) == NULL) || bin->priv->asynchandling);
if (!cont) { if (!cont) {
bin_handle_async_done (bin, &smessage); bin_handle_async_done (bin, &smessage);
async_message = gst_message_new_async_done (GST_OBJECT_CAST (bin)); async_message = gst_message_new_async_done (GST_OBJECT_CAST (bin));
@ -2764,7 +2764,7 @@ gst_bin_handle_message_func (GstBin * bin, GstMessage * message)
bin_handle_async_start (bin, &smessage); bin_handle_async_start (bin, &smessage);
/* prepare an ASYNC_START message */ /* prepare an ASYNC_START message */
if (GST_OBJECT_PARENT (bin) && (!bin->private->asynchandling)) { if (GST_OBJECT_PARENT (bin) && (!bin->priv->asynchandling)) {
forward = TRUE; forward = TRUE;
message = message =
gst_message_new_async_start (GST_OBJECT_CAST (bin), new_base_time); gst_message_new_async_start (GST_OBJECT_CAST (bin), new_base_time);
@ -2819,7 +2819,7 @@ gst_bin_handle_message_func (GstBin * bin, GstMessage * message)
/* nothing found, remove all old ASYNC_DONE messages */ /* nothing found, remove all old ASYNC_DONE messages */
bin_remove_messages (bin, NULL, GST_MESSAGE_ASYNC_DONE); bin_remove_messages (bin, NULL, GST_MESSAGE_ASYNC_DONE);
done = TRUE; done = TRUE;
toplevel = bin->private->asynchandling toplevel = bin->priv->asynchandling
|| (GST_OBJECT_PARENT (bin) == NULL); || (GST_OBJECT_PARENT (bin) == NULL);
if (!toplevel) if (!toplevel)
bin_handle_async_done (bin, &smessage); bin_handle_async_done (bin, &smessage);

2
gst/gstbin.h
View file

@ -114,7 +114,7 @@ struct _GstBin {
GstClock *provided_clock; GstClock *provided_clock;
GstElement *clock_provider; GstElement *clock_provider;
GstBinPrivate *private; GstBinPrivate *priv;
/*< private >*/ /*< private >*/
gpointer _gst_reserved[GST_PADDING - 1]; gpointer _gst_reserved[GST_PADDING - 1];