From 542e8afb75ea43ed7225afcf0910b5d5d5b1a74b Mon Sep 17 00:00:00 2001 From: Brandon Lewis Date: Fri, 28 May 2010 11:42:29 +0200 Subject: [PATCH] fix bugs --- ges/ges-simple-timeline-layer.c | 2 +- tests/check/ges/simplelayer.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ges/ges-simple-timeline-layer.c b/ges/ges-simple-timeline-layer.c index c68d525..4e4131e 100644 --- a/ges/ges-simple-timeline-layer.c +++ b/ges/ges-simple-timeline-layer.c @@ -140,7 +140,7 @@ gstl_recalculate (GESSimpleTimelineLayer * self) ges_timeline_object_set_priority (obj, priority - 1); } - if (GES_TIMELINE_OBJECT_DURATION (prev_object) < dur) { + if (prev_object && (GES_TIMELINE_OBJECT_DURATION (prev_object) < dur)) { GST_ERROR ("transition duration exceeds that of previous neighbor!"); } diff --git a/tests/check/ges/simplelayer.c b/tests/check/ges/simplelayer.c index 299e220..51387df 100644 --- a/tests/check/ges/simplelayer.c +++ b/tests/check/ges/simplelayer.c @@ -201,12 +201,12 @@ GST_START_TEST (test_gsl_with_transitions) fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source2), GST_SECOND); source3 = ges_custom_timeline_source_new (arbitrary_fill_track_func, ELEMENT); - g_object_set (source2, "duration", GST_SECOND, "start", (guint64) 42, NULL); - fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source2), + g_object_set (source3, "duration", GST_SECOND, "start", (guint64) 42, NULL); + fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source3), GST_SECOND); source4 = ges_custom_timeline_source_new (arbitrary_fill_track_func, ELEMENT); - g_object_set (source2, "duration", GST_SECOND, "start", (guint64) 42, NULL); - fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source2), + g_object_set (source4, "duration", GST_SECOND, "start", (guint64) 42, NULL); + fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (source4), GST_SECOND); /* create half-second transitions */ @@ -220,19 +220,19 @@ GST_START_TEST (test_gsl_with_transitions) tr2 = ges_timeline_transition_new (NULL); g_object_set (tr2, "duration", HALF_SECOND, "start", (guint64) 42, NULL); - fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr1), HALF_SECOND); + fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr2), HALF_SECOND); tr3 = ges_timeline_transition_new (NULL); g_object_set (tr3, "duration", HALF_SECOND, "start", (guint64) 42, NULL); - fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr1), HALF_SECOND); + fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr3), HALF_SECOND); tr4 = ges_timeline_transition_new (NULL); g_object_set (tr4, "duration", HALF_SECOND, "start", (guint64) 42, NULL); - fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr1), HALF_SECOND); + fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr4), HALF_SECOND); tr5 = ges_timeline_transition_new (NULL); g_object_set (tr5, "duration", HALF_SECOND, "start", (guint64) 42, NULL); - fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr1), HALF_SECOND); + fail_unless_equals_uint64 (GES_TIMELINE_OBJECT_DURATION (tr5), HALF_SECOND); /* simple test scenario with several sources in layer */ /* 0 [0 0.5 1 1.5 2 2.5 3] */ -- 2.7.4