X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgstpipeline.c;h=ca9091b359d99b397fb84e2913ad3824069c6b0b;hb=0c6f5b3e4c3dc55e684bca1e3fc9a2a9b74407b9;hp=07b4cced1d40e7d9e7ef6acde2772c68e99215d9;hpb=39664da1f07bda3032ea867fc695450b689b9d8f;p=platform%2Fupstream%2Fgstreamer.git diff --git a/gst/gstpipeline.c b/gst/gstpipeline.c index 07b4cce..ca9091b 100644 --- a/gst/gstpipeline.c +++ b/gst/gstpipeline.c @@ -105,9 +105,6 @@ enum PROP_LATENCY }; -#define GST_PIPELINE_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_PIPELINE, GstPipelinePrivate)) - struct _GstPipelinePrivate { /* with LOCK */ @@ -144,7 +141,8 @@ static gboolean gst_pipeline_do_latency (GstBin * bin); } #define gst_pipeline_parent_class parent_class -G_DEFINE_TYPE_WITH_CODE (GstPipeline, gst_pipeline, GST_TYPE_BIN, _do_init); +G_DEFINE_TYPE_WITH_CODE (GstPipeline, gst_pipeline, GST_TYPE_BIN, + G_ADD_PRIVATE (GstPipeline) _do_init); static void gst_pipeline_class_init (GstPipelineClass * klass) @@ -153,8 +151,6 @@ gst_pipeline_class_init (GstPipelineClass * klass) GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); GstBinClass *gstbin_class = GST_BIN_CLASS (klass); - g_type_class_add_private (klass, sizeof (GstPipelinePrivate)); - gobject_class->set_property = gst_pipeline_set_property; gobject_class->get_property = gst_pipeline_get_property; @@ -217,7 +213,7 @@ gst_pipeline_init (GstPipeline * pipeline) { GstBus *bus; - pipeline->priv = GST_PIPELINE_GET_PRIVATE (pipeline); + pipeline->priv = gst_pipeline_get_instance_private (pipeline); /* set default property values */ pipeline->priv->auto_flush_bus = DEFAULT_AUTO_FLUSH_BUS;