Commit 93230e96 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠

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

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

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.
parent e4ab657d
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>
* plugins/elements/gstelements.c:
......
......@@ -474,8 +474,8 @@ gst_bin_init (GstBin * bin)
bus);
gst_bus_set_sync_handler (bus, (GstBusSyncHandler) bin_bus_handler, bin);
bin->private = g_new0 (GstBinPrivate, 1);
bin->private->asynchandling = FALSE;
bin->priv = g_new0 (GstBinPrivate, 1);
bin->priv->asynchandling = FALSE;
}
static void
......@@ -502,9 +502,9 @@ gst_bin_dispose (GObject * object)
GST_STR_NULL (GST_OBJECT_NAME (object)));
}
if (bin->private) {
g_free (bin->private);
bin->private = NULL;
if (bin->priv) {
g_free (bin->priv);
bin->priv = NULL;
}
G_OBJECT_CLASS (parent_class)->dispose (object);
......@@ -535,7 +535,7 @@ gst_bin_set_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_ASYNC_HANDLING:
GST_OBJECT_LOCK (gstbin);
gstbin->private->asynchandling = g_value_get_boolean (value);
gstbin->priv->asynchandling = g_value_get_boolean (value);
GST_OBJECT_UNLOCK (gstbin);
break;
default:
......@@ -555,7 +555,7 @@ gst_bin_get_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_ASYNC_HANDLING:
GST_OBJECT_LOCK (gstbin);
g_value_set_boolean (value, gstbin->private->asynchandling);
g_value_set_boolean (value, gstbin->priv->asynchandling);
GST_OBJECT_UNLOCK (gstbin);
break;
default:
......@@ -1091,7 +1091,7 @@ gst_bin_remove_func (GstBin * bin, GstElement * element)
if (!other_async && this_async) {
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) {
bin_handle_async_done (bin, &smessage);
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);
/* prepare an ASYNC_START message */
if (GST_OBJECT_PARENT (bin) && (!bin->private->asynchandling)) {
if (GST_OBJECT_PARENT (bin) && (!bin->priv->asynchandling)) {
forward = TRUE;
message =
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 */
bin_remove_messages (bin, NULL, GST_MESSAGE_ASYNC_DONE);
done = TRUE;
toplevel = bin->private->asynchandling
toplevel = bin->priv->asynchandling
|| (GST_OBJECT_PARENT (bin) == NULL);
if (!toplevel)
bin_handle_async_done (bin, &smessage);
......
......@@ -114,7 +114,7 @@ struct _GstBin {
GstClock *provided_clock;
GstElement *clock_provider;
GstBinPrivate *private;
GstBinPrivate *priv;
/*< private >*/
gpointer _gst_reserved[GST_PADDING - 1];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment