mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

uriclip: Remove some filesource leftovers

Browse source 
Differential Revision: https://phabricator.freedesktop.org/D1329
This commit is contained in:
Thibault Saunier 2016-08-13 19:54:22 -04:00 committed by Thibault Saunier
parent 3a0598120e
commit e065fde526
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/libs/ges-docs.sgml
View file

@ -57,7 +57,7 @@ platform as well as Windows. It is released under the GNU Library General Public
<chapter> <chapter>
<title>Timeline objects</title> <title>Timeline objects</title>
<xi:include href="xml/gestimelinefilesource.xml"/> <xi:include href="xml/gesuriclip.xml"/>
<xi:include href="xml/gestitleclip.xml"/> <xi:include href="xml/gestitleclip.xml"/>
<xi:include href="xml/gestestclip.xml"/> <xi:include href="xml/gestestclip.xml"/>
<xi:include href="xml/gestextoverlayclip.xml"/> <xi:include href="xml/gestextoverlayclip.xml"/>

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

@ -605,7 +605,7 @@ GES_TYPE_SOURCE_CLIP
</SECTION> </SECTION>
<SECTION> <SECTION>
<FILE>gestimelinefilesource</FILE> <FILE>gesuriclip</FILE>
<TITLE>GESUriClip</TITLE> <TITLE>GESUriClip</TITLE>
GESUriClip GESUriClip
ges_uri_clip_new ges_uri_clip_new

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

@ -19,7 +19,7 @@
*/ */
/** /**
* SECTION:gestimelinefilesource * SECTION: gesuriclip
* @short_description: An object for manipulating media files in a GESTimeline * @short_description: An object for manipulating media files in a GESTimeline
* *
* Represents all the output streams from a particular uri. It is assumed that * Represents all the output streams from a particular uri. It is assumed that
@ -75,7 +75,7 @@ static GESTrackElement
void ges_uri_clip_set_uri (GESUriClip * self, gchar * uri); void ges_uri_clip_set_uri (GESUriClip * self, gchar * uri);
gboolean gboolean
filesource_set_max_duration (GESTimelineElement * element, uri_clip_set_max_duration (GESTimelineElement * element,
GstClockTime maxduration); GstClockTime maxduration);
static void static void
@ -173,7 +173,7 @@ ges_uri_clip_class_init (GESUriClipClass * klass)
/** /**
* GESUriClip:is-image: * GESUriClip:is-image:
* *
* Whether this filesource represents a still image or not. This must be set * Whether this uri clip represents a still image or not. This must be set
* before create_track_elements is called. * before create_track_elements is called.
*/ */
g_object_class_install_property (object_class, PROP_IS_IMAGE, g_object_class_install_property (object_class, PROP_IS_IMAGE,
@ -189,7 +189,7 @@ ges_uri_clip_class_init (GESUriClipClass * klass)
GES_TYPE_TRACK_TYPE, GES_TRACK_TYPE_UNKNOWN, GES_TYPE_TRACK_TYPE, GES_TRACK_TYPE_UNKNOWN,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
element_class->set_max_duration = filesource_set_max_duration; element_class->set_max_duration = uri_clip_set_max_duration;
timobj_class->create_track_elements = ges_uri_clip_create_track_elements; timobj_class->create_track_elements = ges_uri_clip_create_track_elements;
timobj_class->create_track_element = ges_uri_clip_create_track_element; timobj_class->create_track_element = ges_uri_clip_create_track_element;
@ -266,7 +266,7 @@ extractable_set_asset (GESExtractable * self, GESAsset * asset)
{ {
gboolean res = TRUE; gboolean res = TRUE;
GESUriClip *uriclip = GES_URI_CLIP (self); GESUriClip *uriclip = GES_URI_CLIP (self);
GESUriClipAsset *filesource_asset; GESUriClipAsset *uri_clip_asset;
GESClip *clip = GES_CLIP (self); GESClip *clip = GES_CLIP (self);
GESLayer *layer = ges_clip_get_layer (clip); GESLayer *layer = ges_clip_get_layer (clip);
GList *tmp; GList *tmp;
@ -274,20 +274,19 @@ extractable_set_asset (GESExtractable * self, GESAsset * asset)
g_return_val_if_fail (GES_IS_URI_CLIP_ASSET (asset), FALSE); g_return_val_if_fail (GES_IS_URI_CLIP_ASSET (asset), FALSE);
filesource_asset = GES_URI_CLIP_ASSET (asset); uri_clip_asset = GES_URI_CLIP_ASSET (asset);
if (GST_CLOCK_TIME_IS_VALID (GES_TIMELINE_ELEMENT_DURATION (clip)) == FALSE) if (GST_CLOCK_TIME_IS_VALID (GES_TIMELINE_ELEMENT_DURATION (clip)) == FALSE)
_set_duration0 (GES_TIMELINE_ELEMENT (uriclip), _set_duration0 (GES_TIMELINE_ELEMENT (uriclip),
ges_uri_clip_asset_get_duration (filesource_asset)); ges_uri_clip_asset_get_duration (uri_clip_asset));
ges_timeline_element_set_max_duration (GES_TIMELINE_ELEMENT (uriclip), ges_timeline_element_set_max_duration (GES_TIMELINE_ELEMENT (uriclip),
ges_uri_clip_asset_get_duration (filesource_asset)); ges_uri_clip_asset_get_duration (uri_clip_asset));
ges_uri_clip_set_is_image (uriclip, ges_uri_clip_set_is_image (uriclip,
ges_uri_clip_asset_is_image (filesource_asset)); ges_uri_clip_asset_is_image (uri_clip_asset));
if (ges_clip_get_supported_formats (clip) == GES_TRACK_TYPE_UNKNOWN) { if (ges_clip_get_supported_formats (clip) == GES_TRACK_TYPE_UNKNOWN) {
ges_clip_set_supported_formats (clip, ges_clip_set_supported_formats (clip,
ges_clip_asset_get_supported_formats (GES_CLIP_ASSET ges_clip_asset_get_supported_formats (GES_CLIP_ASSET (uri_clip_asset)));
(filesource_asset)));
} }
GES_TIMELINE_ELEMENT (uriclip)->asset = asset; GES_TIMELINE_ELEMENT (uriclip)->asset = asset;
@ -390,7 +389,7 @@ ges_uri_clip_set_mute (GESUriClip * self, gboolean mute)
} }
gboolean gboolean
filesource_set_max_duration (GESTimelineElement * element, uri_clip_set_max_duration (GESTimelineElement * element,
GstClockTime maxduration) GstClockTime maxduration)
{ {
if (_DURATION (element) == GST_CLOCK_TIME_NONE || _DURATION (element) == 0) if (_DURATION (element) == GST_CLOCK_TIME_NONE || _DURATION (element) == 0)