mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 08:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

clip: Remove the ges_clip_fill_track method

Browse source 
Its was only use by the old custom source which is dead now.

API:
    Remove ges_clip_fill_track

https://bugzilla.gnome.org/show_bug.cgi?id=706855
This commit is contained in:
Thibault Saunier 2013-08-26 19:26:08 -04:00
parent 13aeda606a
commit ef8c4b4b6b
10 changed files with 27 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/libs/ges-sections.txt
View file

@ -439,7 +439,6 @@ ges_clip_get_supported_formats
ges_clip_split
ges_clip_edit
GES_CLIP_HEIGHT
ges_clip_fill_track_element
<SUBSECTION Standard>
GESClipPrivate
GES_IS_CLIP

41
ges/ges-clip.c
View file

@ -37,10 +37,6 @@
#include <string.h>
gboolean
ges_clip_fill_track_element_func (GESClip * clip,
GESTrackElement * trackelement, GstElement * gnlobj);
GList *ges_clip_create_track_elements_func (GESClip * clip, GESTrackType type);
static gboolean _ripple (GESTimelineElement * element, GstClockTime start);
static gboolean _ripple_end (GESTimelineElement * element, GstClockTime end);
@ -719,8 +715,6 @@ ges_clip_class_init (GESClipClass * klass)
container_class->group = _group;
container_class->grouping_priority = G_MAXUINT;
container_class->edit = _edit;
klass->need_fill_track = TRUE;
}
static void
@ -872,41 +866,6 @@ ges_clip_get_layer_priority (GESClip * clip)
return ges_layer_get_priority (clip->priv->layer);
}
gboolean
ges_clip_fill_track_element (GESClip * clip,
GESTrackElement * trackelement, GstElement * gnlobj)
{
GESClipClass *class;
gboolean res = TRUE;
GST_DEBUG ("clip:%p, trackelement:%p, gnlobject:%p",
clip, trackelement, gnlobj);
class = GES_CLIP_GET_CLASS (clip);
if (class->need_fill_track) {
if (G_UNLIKELY (class->fill_track_element == NULL)) {
GST_WARNING ("No 'fill_track_element' implementation available");
return FALSE;
}
res = class->fill_track_element (clip, trackelement, gnlobj);
}
GST_DEBUG ("Returning res:%d", res);
return res;
}
gboolean
ges_clip_fill_track_element_func (GESClip * clip,
GESTrackElement * trackelement, GstElement * gnlobj)
{
GST_WARNING ("No 'fill_track_element' implementation !");
return FALSE;
}
/**
* ges_clip_set_moving_from_layer:
* @clip: a #GESClip

8
ges/ges-clip.h
View file

@ -117,10 +117,8 @@ struct _GESClip
* @create_track_element: method to create a single #GESTrackElement for a given #GESTrack.
* @create_track_elements: method to create multiple #GESTrackElements for a
* #GESTrack.
* @fill_track_element: method to fill an associated #GESTrackElement.
* @need_fill_track: Set to TRUE if @fill_track_element needs to be called.
*
* Subclasses can override the @create_track_element and @fill_track_element methods.
* Subclasses can override the @create_track_element.
*/
struct _GESClipClass
{
@ -130,8 +128,6 @@ struct _GESClipClass
/*< public > */
GESCreateTrackElementFunc create_track_element;
GESCreateTrackElementsFunc create_track_elements;
GESFillTrackElementFunc fill_track_element;
gboolean need_fill_track;
/*< private >*/
/* Padding for API extension */
@ -149,8 +145,6 @@ GType ges_clip_get_type (void);
GESTrackType ges_clip_get_supported_formats (GESClip *clip);
void ges_clip_set_supported_formats (GESClip *clip, GESTrackType supportedformats);
gboolean ges_clip_add_asset (GESClip *clip, GESAsset *asset);
gboolean ges_clip_fill_track_element (GESClip *clip, GESTrackElement *trackelement,
GstElement *gnlobj);
GESTrackElement* ges_clip_find_track_element (GESClip *clip, GESTrack *track,
GType type);

1
ges/ges-effect-clip.c
View file

@ -141,7 +141,6 @@ ges_effect_clip_class_init (GESEffectClipClass * klass)
NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
timobj_class->create_track_element = _create_track_element;
timobj_class->need_fill_track = FALSE;
}
static void

1
ges/ges-test-clip.c
View file

@ -163,7 +163,6 @@ ges_test_clip_class_init (GESTestClipClass * klass)
FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
timobj_class->create_track_element = ges_test_clip_create_track_element;
timobj_class->need_fill_track = FALSE;
}
static void

1
ges/ges-text-overlay-clip.c
View file

@ -204,7 +204,6 @@ ges_text_overlay_clip_class_init (GESTextOverlayClipClass * klass)
timobj_class->create_track_element =
ges_text_overlay_clip_create_track_element;
timobj_class->need_fill_track = FALSE;
/**
* GESTextOverlayClip:color:

1
ges/ges-title-clip.c
View file

@ -215,7 +215,6 @@ ges_title_clip_class_init (GESTitleClipClass * klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
timobj_class->create_track_element = ges_title_clip_create_track_element;
timobj_class->need_fill_track = FALSE;
container_class->child_added = _child_added;
container_class->child_removed = _child_removed;

61
ges/ges-track-element.c
View file

@ -59,7 +59,6 @@ struct _GESTrackElementPrivate
* {GParamaSpec ---> element,}*/
GHashTable *properties_hashtable;
GESClip *timelineobj;
GESTrack *track;
gboolean valid;
@ -686,44 +685,36 @@ ensure_gnl_object (GESTrackElement * object)
g_object_set_qdata (G_OBJECT (gnlobject), GNL_OBJECT_TRACK_ELEMENT_QUARK,
object);
if (object->priv->timelineobj)
res = ges_clip_fill_track_element (object->priv->timelineobj,
object, object->priv->gnlobject);
else
res = TRUE;
/* Set some properties on the GnlObject */
g_object_set (object->priv->gnlobject,
"duration", object->priv->pending_duration,
"start", object->priv->pending_start,
"inpoint", object->priv->pending_inpoint,
"priority", object->priv->pending_priority,
"active", object->priv->pending_active, NULL);
if (res) {
/* Set some properties on the GnlObject */
/* Pendings values are not pending anymore */
GES_TIMELINE_ELEMENT_START (object) = object->priv->pending_start;
GES_TIMELINE_ELEMENT_INPOINT (object) = object->priv->pending_inpoint;
GES_TIMELINE_ELEMENT_DURATION (object) = object->priv->pending_duration;
GES_TIMELINE_ELEMENT_PRIORITY (object) = object->priv->pending_priority;
object->active = object->priv->pending_active;
if (object->priv->track != NULL)
g_object_set (object->priv->gnlobject,
"duration", object->priv->pending_duration,
"start", object->priv->pending_start,
"inpoint", object->priv->pending_inpoint,
"priority", object->priv->pending_priority,
"active", object->priv->pending_active, NULL);
"caps", ges_track_get_caps (object->priv->track), NULL);
/* Pendings values are not pending anymore */
GES_TIMELINE_ELEMENT_START (object) = object->priv->pending_start;
GES_TIMELINE_ELEMENT_INPOINT (object) = object->priv->pending_inpoint;
GES_TIMELINE_ELEMENT_DURATION (object) = object->priv->pending_duration;
GES_TIMELINE_ELEMENT_PRIORITY (object) = object->priv->pending_priority;
object->active = object->priv->pending_active;
/* We feed up the props_hashtable if possible */
if (class->get_props_hastable) {
props_hash = class->get_props_hastable (object);
if (object->priv->track != NULL)
g_object_set (object->priv->gnlobject,
"caps", ges_track_get_caps (object->priv->track), NULL);
/* We feed up the props_hashtable if possible */
if (class->get_props_hastable) {
props_hash = class->get_props_hastable (object);
if (props_hash == NULL) {
GST_DEBUG ("'get_props_hastable' implementation returned TRUE but no"
"properties_hashtable is available");
} else {
object->priv->properties_hashtable = props_hash;
connect_properties_signals (object);
}
if (props_hash == NULL) {
GST_DEBUG ("'get_props_hastable' implementation returned TRUE but no"
"properties_hashtable is available");
} else {
object->priv->properties_hashtable = props_hash;
connect_properties_signals (object);
}
}
}

1
ges/ges-transition-clip.c
View file

@ -252,7 +252,6 @@ ges_transition_clip_class_init (GESTransitionClipClass * klass)
container_class->child_removed = _child_removed;
timobj_class->create_track_element = _create_track_element;
timobj_class->need_fill_track = FALSE;
}
static void

2
ges/ges-uri-clip.c
View file

@ -190,8 +190,6 @@ ges_uri_clip_class_init (GESUriClipClass * klass)
timobj_class->create_track_elements = ges_uri_clip_create_track_elements;
timobj_class->create_track_element = ges_uri_clip_create_track_element;
timobj_class->need_fill_track = FALSE;
}
static gchar *