mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 08:46:40 +00:00
ges: Unbreeak API after renaming of GNL to NLE
This commit is contained in:
parent
f5a8c24077
commit
2994650f9e
5 changed files with 37 additions and 15 deletions
|
@ -135,6 +135,7 @@ GESTrackElementClass
|
|||
ges_track_element_set_active
|
||||
ges_track_element_get_track
|
||||
ges_track_element_get_nleobject
|
||||
ges_track_element_get_gnlobject
|
||||
ges_track_element_get_element
|
||||
ges_track_element_is_active
|
||||
ges_track_element_lookup_child
|
||||
|
|
|
@ -12,7 +12,7 @@ ges_timeline_layer_add_object(layer, tlobj)
|
|||
trobj = GESTimelineObject::create_track_objects
|
||||
ges_track_add_object(TRACK, trobj)
|
||||
ges_track_object_set_track(troj, TRACK)
|
||||
nleobj = GESTrackObject::create_nle_object
|
||||
nleobj = GESTrackObject::create_gnl_object
|
||||
ges_timeline_object_fill_track_object(tlobj, trobj, nleobj)
|
||||
GESTimelineObject::fill_track_object
|
||||
|
||||
|
|
|
@ -131,10 +131,10 @@ Methods
|
|||
|
||||
* Set the track field of the TrackObject
|
||||
* if no NleObject is available yet:
|
||||
* Call the 'create_nle_object' virtual method
|
||||
* Call the 'create_gnl_object' virtual method
|
||||
|
||||
|
||||
* Virtual-method for GESTrackObject::create_nle_object
|
||||
* Virtual-method for GESTrackObject::create_gnl_object
|
||||
|
||||
* Create a NleObject of the proper type
|
||||
Ex : nleobject = gst_element_factory_make("nlesource", NULL);
|
||||
|
|
|
@ -91,7 +91,7 @@ enum
|
|||
|
||||
static guint ges_track_element_signals[LAST_SIGNAL] = { 0 };
|
||||
|
||||
static GstElement *ges_track_element_create_nle_object_func (GESTrackElement *
|
||||
static GstElement *ges_track_element_create_gnl_object_func (GESTrackElement *
|
||||
object);
|
||||
|
||||
static gboolean _set_start (GESTimelineElement * element, GstClockTime start);
|
||||
|
@ -267,7 +267,7 @@ ges_track_element_class_init (GESTrackElementClass * klass)
|
|||
element_class->set_priority = _set_priority;
|
||||
element_class->deep_copy = ges_track_element_copy_properties;
|
||||
|
||||
klass->create_nle_object = ges_track_element_create_nle_object_func;
|
||||
klass->create_gnl_object = ges_track_element_create_gnl_object_func;
|
||||
klass->list_children_properties = default_list_children_properties;
|
||||
klass->lookup_child = _lookup_child;
|
||||
}
|
||||
|
@ -537,9 +537,9 @@ ges_track_element_get_track_type (GESTrackElement * object)
|
|||
return object->priv->track_type;
|
||||
}
|
||||
|
||||
/* default 'create_nle_object' virtual method implementation */
|
||||
/* default 'create_gnl_object' virtual method implementation */
|
||||
static GstElement *
|
||||
ges_track_element_create_nle_object_func (GESTrackElement * self)
|
||||
ges_track_element_create_gnl_object_func (GESTrackElement * self)
|
||||
{
|
||||
GESTrackElementClass *klass = NULL;
|
||||
GstElement *child = NULL;
|
||||
|
@ -632,8 +632,8 @@ ensure_nle_object (GESTrackElement * object)
|
|||
|
||||
class = GES_TRACK_ELEMENT_GET_CLASS (object);
|
||||
|
||||
if (G_UNLIKELY (class->create_nle_object == NULL)) {
|
||||
GST_ERROR ("No 'create_nle_object' implementation !");
|
||||
if (G_UNLIKELY (class->create_gnl_object == NULL)) {
|
||||
GST_ERROR ("No 'create_gnl_object' implementation !");
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
@ -642,12 +642,12 @@ ensure_nle_object (GESTrackElement * object)
|
|||
/* 2. Fill in the NleObject */
|
||||
if (object->priv->nleobject == NULL) {
|
||||
|
||||
/* call the create_nle_object virtual method */
|
||||
nleobject = class->create_nle_object (object);
|
||||
/* call the create_gnl_object virtual method */
|
||||
nleobject = class->create_gnl_object (object);
|
||||
|
||||
if (G_UNLIKELY (nleobject == NULL)) {
|
||||
GST_ERROR
|
||||
("'create_nle_object' implementation returned TRUE but no NleObject is available");
|
||||
("'create_gnl_object' implementation returned TRUE but no NleObject is available");
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
@ -906,6 +906,24 @@ ges_track_element_get_track (GESTrackElement * object)
|
|||
return object->priv->track;
|
||||
}
|
||||
|
||||
/**
|
||||
* ges_track_element_get_gnlobject:
|
||||
* @object: a #GESTrackElement
|
||||
*
|
||||
* Get the NleObject object this object is controlling.
|
||||
*
|
||||
* Returns: (transfer none): the NleObject object this object is controlling.
|
||||
*
|
||||
* Deprecated: use #ges_track_element_get_nleobject instead.
|
||||
*/
|
||||
GstElement *
|
||||
ges_track_element_get_gnlobject (GESTrackElement * object)
|
||||
{
|
||||
g_return_val_if_fail (GES_IS_TRACK_ELEMENT (object), NULL);
|
||||
|
||||
return object->priv->nleobject;
|
||||
}
|
||||
|
||||
/**
|
||||
* ges_track_element_get_nleobject:
|
||||
* @object: a #GESTrackElement
|
||||
|
@ -913,6 +931,8 @@ ges_track_element_get_track (GESTrackElement * object)
|
|||
* Get the GNonLin object this object is controlling.
|
||||
*
|
||||
* Returns: (transfer none): the GNonLin object this object is controlling.
|
||||
*
|
||||
* Since: 1.6
|
||||
*/
|
||||
GstElement *
|
||||
ges_track_element_get_nleobject (GESTrackElement * object)
|
||||
|
|
|
@ -72,7 +72,7 @@ struct _GESTrackElement {
|
|||
/**
|
||||
* GESTrackElementClass:
|
||||
* @nleobject_factorytype: name of the GNonLin GStElementFactory type to use.
|
||||
* @create_nle_object: method to create the GNonLin container object.
|
||||
* @create_gnl_object: method to create the GNonLin container object.
|
||||
* @create_element: method to return the GstElement to put in the nleobject.
|
||||
* @active_changed: active property of nleobject has changed
|
||||
* @list_children_properties: method to get children properties that user could
|
||||
|
@ -93,7 +93,7 @@ struct _GESTrackElement {
|
|||
* understandable.
|
||||
* Deprecated: use GESTimelineElement.lookup_child instead
|
||||
*
|
||||
* Subclasses can override the @create_nle_object method to override what type
|
||||
* Subclasses can override the @create_gnl_object method to override what type
|
||||
* of GNonLin object will be created.
|
||||
*/
|
||||
struct _GESTrackElementClass {
|
||||
|
@ -103,7 +103,7 @@ struct _GESTrackElementClass {
|
|||
/*< public >*/
|
||||
/* virtual methods for subclasses */
|
||||
const gchar *nleobject_factorytype;
|
||||
GstElement* (*create_nle_object) (GESTrackElement * object);
|
||||
GstElement* (*create_gnl_object) (GESTrackElement * object);
|
||||
GstElement* (*create_element) (GESTrackElement * object);
|
||||
|
||||
void (*active_changed) (GESTrackElement *object, gboolean active);
|
||||
|
@ -134,6 +134,7 @@ void ges_track_element_set_track_type (GESTrackElement * object,
|
|||
GESTrackType type);
|
||||
|
||||
GstElement * ges_track_element_get_nleobject (GESTrackElement * object);
|
||||
GstElement * ges_track_element_get_gnlobject (GESTrackElement * object);
|
||||
|
||||
GstElement * ges_track_element_get_element (GESTrackElement * object);
|
||||
|
||||
|
|
Loading…
Reference in a new issue