From: Simon Corsin Date: Tue, 2 Jul 2013 09:12:00 +0000 (+0200) Subject: source: Make a ges_source_create_topbin internal helper method X-Git-Tag: 1.19.3~493^2~1731 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e50a86d0d900ee5a573e2208a8b24b64d47ef583;p=platform%2Fupstream%2Fgstreamer.git source: Make a ges_source_create_topbin internal helper method --- diff --git a/ges/ges-internal.h b/ges/ges-internal.h index c12e00e..afaa659 100644 --- a/ges/ges-internal.h +++ b/ges/ges-internal.h @@ -288,4 +288,7 @@ G_GNUC_INTERNAL void ges_track_element_copy_properties (GESTimelineElem G_GNUC_INTERNAL void ges_track_element_split_bindings (GESTrackElement *element, GESTrackElement *new_element, guint64 position); + +G_GNUC_INTERNAL GstElement *ges_source_create_topbin (const gchar * bin_name, GstElement * sub_element, ...); + #endif /* __GES_INTERNAL_H__ */ diff --git a/ges/ges-source.c b/ges/ges-source.c index f1373e9..4e6b119 100644 --- a/ges/ges-source.c +++ b/ges/ges-source.c @@ -23,6 +23,7 @@ * @short_description: Base Class for single-media sources */ +#include "ges-internal.h" #include "ges/ges-meta-container.h" #include "ges-track-element.h" #include "ges-source.h" @@ -37,6 +38,9 @@ struct _GESSourcePrivate GstFramePositionner *positionner; }; +/****************************** + * Internal helper methods * + ******************************/ static void _pad_added_cb (GstElement * element, GstPad * srcpad, GstPad * sinkpad) { @@ -55,8 +59,8 @@ _ghost_pad_added_cb (GstElement * element, GstPad * srcpad, GstElement * bin) gst_element_no_more_pads (element); } -static GstElement * -_create_bin (const gchar * bin_name, GstElement * sub_element, ...) +GstElement * +ges_source_create_topbin (const gchar * bin_name, GstElement * sub_element, ...) { va_list argp; @@ -187,7 +191,8 @@ ges_source_create_element (GESTrackElement * trksrc) volume = gst_element_factory_make ("volume", NULL); - topbin = _create_bin ("audio-src-bin", sub_element, volume, NULL); + topbin = + ges_source_create_topbin ("audiosrcbin", sub_element, volume, NULL); _sync_element_to_layer_property_float (trksrc, volume, GES_META_VOLUME, "volume"); @@ -207,7 +212,9 @@ ges_source_create_element (GESTrackElement * trksrc) ges_track_element_add_children_props (trksrc, positionner, NULL, NULL, props); - topbin = _create_bin ("video-src-bin", sub_element, positionner, NULL); + topbin = + ges_source_create_topbin ("videosrcbin", sub_element, positionner, + NULL); parent = ges_timeline_element_get_parent (GES_TIMELINE_ELEMENT (trksrc)); if (parent) { self->priv->positionner = GST_FRAME_POSITIONNER (positionner); @@ -221,7 +228,8 @@ ges_source_create_element (GESTrackElement * trksrc) break; } default: - topbin = _create_bin ("a-questionable-name", sub_element, NULL); + topbin = + ges_source_create_topbin ("a-questionable-name", sub_element, NULL); break; }