mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "timeline: Return FALSE when commiting an empty timeline"

Browse source 
This commit means that we do not get ASYNC_DONE anymore when commiting
an empty timeline, which means that we need to special case that.

This actually broke some code and does not bring in much.

Fixes https://phabricator.freedesktop.org/T7802
Fixes https://phabricator.freedesktop.org/T7797

This reverts commit e570d1e080.

Thanks @stefanzzz for investigating!
This commit is contained in:
Thibault Saunier 2017-08-29 22:23:57 -03:00
parent 6b67ff61ad
commit 4db3800f98
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ges/ges-timeline.c
View file

@ -3393,9 +3393,6 @@ ges_timeline_commit_unlocked (GESTimeline * timeline)
GST_DEBUG_OBJECT (timeline, "commiting changes");
if (ges_timeline_is_empty (timeline))
return FALSE;
for (tmp = timeline->layers; tmp; tmp = tmp->next) {
GESLayer *layer = tmp->data;
@ -3453,9 +3450,7 @@ ges_timeline_commit_unlocked (GESTimeline * timeline)
* for the signal.
*
* Returns: %TRUE if pending changes were commited or %FALSE if nothing needed
* to be commited. This means that if %FALSE is returned then no "commited" signal
* will be emited.
*
* to be commited
*/
gboolean
ges_timeline_commit (GESTimeline * timeline)

2
tests/check/ges/backgroundsource.c
View file

@ -100,7 +100,7 @@ GST_START_TEST (test_test_source_properties)
/* Test mute support */
g_object_set (clip, "mute", TRUE, NULL);
fail_if (ges_timeline_commit (timeline));
fail_unless (ges_timeline_commit (timeline));
nle_object_check (ges_track_element_get_nleobject (trackelement), 420, 510,
120, 510, MIN_NLE_PRIO + TRANSITIONS_HEIGHT, FALSE);
g_object_set (clip, "mute", FALSE, NULL);