NOTE: The caller of ges_timeline_object_create_track_object now needs to add it to
the timeline_object after calling the function.
Fix the testsuite to support that accordingly
ovrl.set_priority(2)
ovrl.set_layer(lyr)
tck_obj = ovrl.create_track_object(tck)
+ ovrl.add_track_object(tck_obj)
self.failIf (ovrl.release_track_object(tck_obj) != True)
self.failIf (ovrl.add_track_object(tck_obj) != True)
self.failIf (len(ovrl.get_track_objects()) != 1)
}
res = class->create_track_object (object, track);
- ges_timeline_object_add_track_object (object, res);
return res;
}
GESTrack * track)
{
GESTrackObject *result;
+ gboolean ret;
result = ges_timeline_object_create_track_object (object, track);
if (!result) {
GST_WARNING ("couldn't create track object");
return FALSE;
}
- return ges_track_add_object (track, result);
+ ges_track_object_set_timeline_object (result, object);
+ ret = ges_track_add_object (track, result);
+ ges_timeline_object_add_track_object (object, result);
+ return ret;
}
/**
return FALSE;
ges_track_object_set_timeline_object (trobj, object);
+
g_object_ref (trobj);
mapping = g_slice_new0 (ObjectMapping);
assert_equals_uint64 (GES_TIMELINE_OBJECT_INPOINT (object), 12);
trackobject = ges_timeline_object_create_track_object (object, track);
+ ges_timeline_object_add_track_object (object, trackobject);
fail_unless (trackobject != NULL);
fail_unless (ges_track_object_set_track (trackobject, track));
assert_equals_float (volume, 0);
- freq = ges_track_audio_test_source_get_freq (
- GES_TRACK_AUDIO_TEST_SOURCE (trobj));
- volume = ges_track_audio_test_source_get_volume (
- GES_TRACK_AUDIO_TEST_SOURCE (trobj));
+ freq =
+ ges_track_audio_test_source_get_freq (GES_TRACK_AUDIO_TEST_SOURCE
+ (trobj));
+ volume =
+ ges_track_audio_test_source_get_volume (GES_TRACK_AUDIO_TEST_SOURCE
+ (trobj));
g_assert (freq == 440);
g_assert (volume == 0);
assert_equals_float (freq, 2000);
assert_equals_float (volume, 0.5);
- freq = ges_track_audio_test_source_get_freq (
- GES_TRACK_AUDIO_TEST_SOURCE (trobj));
- volume = ges_track_audio_test_source_get_volume (
- GES_TRACK_AUDIO_TEST_SOURCE (trobj));
+ freq =
+ ges_track_audio_test_source_get_freq (GES_TRACK_AUDIO_TEST_SOURCE
+ (trobj));
+ volume =
+ ges_track_audio_test_source_get_volume (GES_TRACK_AUDIO_TEST_SOURCE
+ (trobj));
g_assert (freq == 2000);
g_assert (volume == 0.5);
trackobject =
ges_timeline_object_create_track_object (GES_TIMELINE_OBJECT (source),
track);
+ ges_timeline_object_add_track_object (GES_TIMELINE_OBJECT (source),
+ trackobject);
fail_unless (trackobject != NULL);
/* The track holds a reference to the object
assert_equals_uint64 (GES_TIMELINE_OBJECT_INPOINT (object), 12);
trackobject = ges_timeline_object_create_track_object (object, track);
+ ges_timeline_object_add_track_object (object, trackobject);
fail_unless (trackobject != NULL);
fail_unless (ges_track_object_set_track (trackobject, track));
/* the returned track object should be an image source */
trobj = ges_timeline_object_create_track_object (tlobj, v);
+ ges_timeline_object_add_track_object (tlobj, trobj);
fail_unless (GES_IS_TRACK_IMAGE_SOURCE (trobj));
/* The track holds a reference to the object
* property is set true */
trobj = ges_timeline_object_create_track_object (tlobj, a);
+ ges_timeline_object_add_track_object (tlobj, trobj);
fail_unless (GES_IS_TRACK_AUDIO_TEST_SOURCE (trobj));
/* The track holds a reference to the object
assert_equals_uint64 (GES_TIMELINE_OBJECT_INPOINT (object), 12);
trackobject = ges_timeline_object_create_track_object (object, track);
+ ges_timeline_object_add_track_object (object, trackobject);
fail_unless (trackobject != NULL);
fail_unless (ges_track_object_set_track (trackobject, track));
assert_equals_uint64 (GES_TIMELINE_OBJECT_INPOINT (object), 12);
trackobject = ges_timeline_object_create_track_object (object, track);
+ ges_timeline_object_add_track_object (object, trackobject);
fail_unless (trackobject != NULL);
fail_unless (ges_track_object_set_track (trackobject, track));
assert_equals_uint64 (GES_TIMELINE_OBJECT_INPOINT (object), 12);
trackobject = ges_timeline_object_create_track_object (object, track);
+ ges_timeline_object_add_track_object (object, trackobject);
fail_unless (trackobject != NULL);
fail_unless (ges_track_object_set_track (trackobject, track));
assert_equals_uint64 (GES_TIMELINE_OBJECT_INPOINT (object), 12);
trackobject = ges_timeline_object_create_track_object (object, track);
+ ges_timeline_object_add_track_object (object, trackobject);
fail_unless (trackobject != NULL);
fail_unless (ges_track_object_set_track (trackobject, track));
trackobject =
ges_timeline_object_create_track_object (GES_TIMELINE_OBJECT (tr2),
track);
+ ges_timeline_object_add_track_object (GES_TIMELINE_OBJECT (tr2), trackobject);
fail_unless (trackobject != NULL);
fail_unless (ges_track_video_transition_get_transition_type
assert_equals_uint64 (GES_TIMELINE_OBJECT_INPOINT (object), 12);
trackobject = ges_timeline_object_create_track_object (object, track);
+ ges_timeline_object_add_track_object (object, trackobject);
fail_unless (trackobject != NULL);
fail_unless (ges_track_object_set_track (trackobject, track));
GST_DEBUG ("creating track object");
trackobject = ges_timeline_object_create_track_object (object, track);
+ ges_timeline_object_add_track_object (object, trackobject);
fail_unless (trackobject != NULL);
fail_unless (ges_track_object_set_track (trackobject, track));