mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
Revert "ges: Always create a project to back a timeline"
This reverts commit 59d83f1a93
.
Conflicts:
tests/check/ges/backgroundsource.c
tests/check/ges/effects.c
tests/check/ges/overlays.c
tests/check/ges/simplelayer.c
tests/check/ges/text_properties.c
tests/check/ges/titles.c
This commit is contained in:
parent
99a36b2b69
commit
6e9e9338ae
17 changed files with 65 additions and 103 deletions
|
@ -234,7 +234,7 @@ _uri_missing_accumulator (GSignalInvocationHint * ihint, GValue * return_accu,
|
|||
static GESExtractable *
|
||||
ges_project_extract (GESAsset * project, GError ** error)
|
||||
{
|
||||
GESTimeline *timeline = g_object_new (GES_TYPE_TIMELINE, NULL);
|
||||
GESTimeline *timeline = ges_timeline_new ();
|
||||
|
||||
ges_extractable_set_asset (GES_EXTRACTABLE (timeline), GES_ASSET (project));
|
||||
if (_load_project (GES_PROJECT (project), timeline, error))
|
||||
|
@ -329,7 +329,7 @@ ges_project_class_init (GESProjectClass * klass)
|
|||
|
||||
/**
|
||||
* GESProject::asset-added:
|
||||
* @project: the #GESProject
|
||||
* @formatter: the #GESProject
|
||||
* @asset: The #GESAsset that has been added to @project
|
||||
*/
|
||||
_signals[ASSET_ADDED_SIGNAL] =
|
||||
|
@ -339,7 +339,7 @@ ges_project_class_init (GESProjectClass * klass)
|
|||
|
||||
/**
|
||||
* GESProject::asset-removed:
|
||||
* @project: the #GESProject
|
||||
* @formatter: the #GESProject
|
||||
* @asset: The #GESAsset that has been removed from @project
|
||||
*/
|
||||
_signals[ASSET_REMOVED_SIGNAL] =
|
||||
|
|
|
@ -2374,9 +2374,7 @@ pad_removed_cb (GESTrack * track, GstPad * pad, TrackPrivate * tr_priv)
|
|||
GESTimeline *
|
||||
ges_timeline_new (void)
|
||||
{
|
||||
GESProject *project = ges_project_new (NULL);
|
||||
|
||||
return GES_TIMELINE (ges_asset_extract (GES_ASSET (project), NULL));
|
||||
return g_object_new (GES_TYPE_TIMELINE, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -53,7 +53,7 @@ GST_START_TEST (test_test_source_properties)
|
|||
layer = ges_layer_new ();
|
||||
fail_unless (layer != NULL);
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
fail_unless (ges_timeline_add_track (timeline, track));
|
||||
|
@ -131,7 +131,7 @@ GST_START_TEST (test_test_source_in_layer)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = ges_layer_new ();
|
||||
a = GES_TRACK (ges_audio_track_new ());
|
||||
v = GES_TRACK (ges_video_track_new ());
|
||||
|
@ -267,7 +267,7 @@ GST_START_TEST (test_gap_filling_basic)
|
|||
layer = ges_layer_new ();
|
||||
fail_unless (layer != NULL);
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
fail_unless (ges_timeline_add_track (timeline, track));
|
||||
|
@ -365,7 +365,7 @@ GST_START_TEST (test_gap_filling_empty_track)
|
|||
track = GES_TRACK (ges_audio_track_new ());
|
||||
|
||||
layer = ges_layer_new ();
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
fail_unless (ges_timeline_add_track (timeline, track));
|
||||
|
|
|
@ -46,7 +46,7 @@ GST_START_TEST (test_ges_scenario)
|
|||
|
||||
/* Timeline and 1 Layer */
|
||||
GST_DEBUG ("Create a timeline");
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
|
||||
GST_DEBUG ("Create a layer");
|
||||
|
@ -169,7 +169,7 @@ GST_START_TEST (test_ges_timeline_add_layer)
|
|||
|
||||
/* Timeline and 1 Layer */
|
||||
GST_DEBUG ("Create a timeline");
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
|
||||
GST_DEBUG ("Create a layer");
|
||||
|
@ -280,7 +280,7 @@ GST_START_TEST (test_ges_timeline_add_layer_first)
|
|||
|
||||
/* Timeline and 1 Layer */
|
||||
GST_DEBUG ("Create a timeline");
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
|
||||
GST_DEBUG ("Create a layer");
|
||||
|
@ -382,7 +382,7 @@ GST_START_TEST (test_ges_timeline_remove_track)
|
|||
|
||||
/* Timeline and 1 Layer */
|
||||
GST_DEBUG ("Create a timeline");
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
|
||||
GST_DEBUG ("Create a layer");
|
||||
|
@ -540,7 +540,7 @@ GST_START_TEST (test_ges_timeline_multiple_tracks)
|
|||
|
||||
/* Timeline and 1 Layer */
|
||||
GST_DEBUG ("Create a timeline");
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
|
||||
g_signal_connect (timeline, "select-tracks-for-object",
|
||||
|
@ -683,7 +683,7 @@ GST_START_TEST (test_ges_pipeline_change_state)
|
|||
ges_init ();
|
||||
|
||||
layer = ges_layer_new ();
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
|
||||
pipeline = ges_test_create_pipeline (timeline);
|
||||
|
|
|
@ -36,7 +36,7 @@ GST_START_TEST (test_object_properties)
|
|||
|
||||
layer = ges_layer_new ();
|
||||
fail_unless (layer != NULL);
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
fail_unless (ges_timeline_add_track (timeline, track));
|
||||
|
@ -114,7 +114,7 @@ GST_START_TEST (test_split_object)
|
|||
|
||||
layer = ges_layer_new ();
|
||||
fail_unless (layer != NULL);
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
fail_unless (timeline != NULL);
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
ASSERT_OBJECT_REFCOUNT (timeline, "timeline", 1);
|
||||
|
@ -203,7 +203,7 @@ GST_START_TEST (test_clip_group_ungroup)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = ges_layer_new ();
|
||||
audio_track = GES_TRACK (ges_audio_track_new ());
|
||||
video_track = GES_TRACK (ges_video_track_new ());
|
||||
|
|
|
@ -48,7 +48,7 @@ GST_START_TEST (test_add_effect_to_clip)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = ges_layer_new ();
|
||||
track_audio = GES_TRACK (ges_audio_track_new ());
|
||||
track_video = GES_TRACK (ges_video_track_new ());
|
||||
|
@ -95,7 +95,7 @@ GST_START_TEST (test_get_effects_from_tl)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = ges_layer_new ();
|
||||
track_video = GES_TRACK (ges_video_track_new ());
|
||||
|
||||
|
@ -184,7 +184,7 @@ GST_START_TEST (test_effect_clip)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = ges_layer_new ();
|
||||
track_audio = GES_TRACK (ges_audio_track_new ());
|
||||
track_video = GES_TRACK (ges_video_track_new ());
|
||||
|
@ -224,8 +224,8 @@ GST_START_TEST (test_effect_clip)
|
|||
GES_BASE_EFFECT (tmp->data));
|
||||
fail_unless (priority > effect_prio);
|
||||
fail_unless (GES_IS_EFFECT (tmp->data));
|
||||
fail_unless (ges_track_element_get_track (GES_TRACK_ELEMENT (tmp->
|
||||
data))->type == track_type[i]);
|
||||
fail_unless (ges_track_element_get_track (GES_TRACK_ELEMENT (tmp->data))->
|
||||
type == track_type[i]);
|
||||
effect_prio = priority;
|
||||
|
||||
gst_object_unref (tmp->data);
|
||||
|
@ -253,7 +253,7 @@ GST_START_TEST (test_priorities_clip)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = ges_layer_new ();
|
||||
track_audio = GES_TRACK (ges_audio_track_new ());
|
||||
track_video = GES_TRACK (ges_video_track_new ());
|
||||
|
@ -363,7 +363,7 @@ GST_START_TEST (test_effect_set_properties)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = ges_layer_new ();
|
||||
track_video = GES_TRACK (ges_video_track_new ());
|
||||
|
||||
|
@ -450,7 +450,7 @@ GST_START_TEST (test_clip_signals)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = ges_layer_new ();
|
||||
track_video = GES_TRACK (ges_video_track_new ());
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ GST_START_TEST (test_move_group)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
|
||||
layer = ges_timeline_append_layer (timeline);
|
||||
layer1 = ges_timeline_append_layer (timeline);
|
||||
|
@ -328,7 +328,7 @@ GST_START_TEST (test_group_in_group)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
|
||||
/* Our timeline
|
||||
*
|
||||
|
|
|
@ -34,7 +34,7 @@ GST_START_TEST (test_layer_properties)
|
|||
ges_init ();
|
||||
|
||||
/* Timeline and 1 Layer */
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = (GESLayer *) ges_layer_new ();
|
||||
|
||||
/* The default priority is 0 */
|
||||
|
@ -124,7 +124,7 @@ GST_START_TEST (test_layer_priorities)
|
|||
ges_init ();
|
||||
|
||||
/* Timeline and 3 Layer */
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer1 = (GESLayer *) ges_layer_new ();
|
||||
layer2 = (GESLayer *) ges_layer_new ();
|
||||
layer3 = (GESLayer *) ges_layer_new ();
|
||||
|
@ -276,7 +276,7 @@ GST_START_TEST (test_timeline_auto_transition)
|
|||
fail_unless (GES_IS_ASSET (asset));
|
||||
|
||||
GST_DEBUG ("Create timeline");
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
assert_is_type (timeline, GES_TYPE_TIMELINE);
|
||||
|
||||
GST_DEBUG ("Create layers");
|
||||
|
@ -340,7 +340,7 @@ GST_START_TEST (test_single_layer_automatic_transition)
|
|||
fail_unless (GES_IS_ASSET (asset));
|
||||
|
||||
GST_DEBUG ("Create timeline");
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
assert_is_type (timeline, GES_TYPE_TIMELINE);
|
||||
|
||||
GST_DEBUG ("Create first layer");
|
||||
|
@ -745,7 +745,7 @@ GST_START_TEST (test_multi_layer_automatic_transition)
|
|||
fail_unless (GES_IS_ASSET (asset));
|
||||
|
||||
GST_DEBUG ("Create timeline");
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
assert_is_type (timeline, GES_TYPE_TIMELINE);
|
||||
|
||||
GST_DEBUG ("Create first layer");
|
||||
|
@ -1235,7 +1235,7 @@ GST_START_TEST (test_layer_activate_automatic_transition)
|
|||
fail_unless (GES_IS_ASSET (asset));
|
||||
|
||||
GST_DEBUG ("Create timeline");
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
assert_is_type (timeline, GES_TYPE_TIMELINE);
|
||||
|
||||
GST_DEBUG ("Append a layer to the timeline");
|
||||
|
@ -1457,7 +1457,7 @@ GST_START_TEST (test_layer_meta_string)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1480,7 +1480,7 @@ GST_START_TEST (test_layer_meta_boolean)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1502,7 +1502,7 @@ GST_START_TEST (test_layer_meta_int)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1524,7 +1524,7 @@ GST_START_TEST (test_layer_meta_uint)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1546,7 +1546,7 @@ GST_START_TEST (test_layer_meta_int64)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1568,7 +1568,7 @@ GST_START_TEST (test_layer_meta_uint64)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1590,7 +1590,7 @@ GST_START_TEST (test_layer_meta_float)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1613,7 +1613,7 @@ GST_START_TEST (test_layer_meta_double)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1639,7 +1639,7 @@ GST_START_TEST (test_layer_meta_date)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1667,7 +1667,7 @@ GST_START_TEST (test_layer_meta_date_time)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1700,7 +1700,7 @@ GST_START_TEST (test_layer_meta_value)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1728,7 +1728,7 @@ GST_START_TEST (test_layer_meta_register)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
@ -1764,7 +1764,7 @@ GST_START_TEST (test_layer_meta_foreach)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
layer = ges_layer_new ();
|
||||
ges_timeline_add_layer (timeline, layer);
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@ GST_START_TEST (simple_audio_mixed_with_pipeline)
|
|||
GstMessage *message;
|
||||
GESLayer *layer, *layer1;
|
||||
GESTrack *track = GES_TRACK (ges_audio_track_new ());
|
||||
GESTimeline *timeline = create_timeline_sync (FALSE);
|
||||
GESTimeline *timeline = ges_timeline_new ();
|
||||
GESPipeline *pipeline = ges_test_create_pipeline (timeline);
|
||||
|
||||
ges_timeline_add_track (timeline, track);
|
||||
|
@ -146,7 +146,7 @@ GST_START_TEST (audio_video_mixed_with_pipeline)
|
|||
GESLayer *layer, *layer1;
|
||||
GESTrack *track = GES_TRACK (ges_video_track_new ());
|
||||
GESTrack *track_audio = GES_TRACK (ges_audio_track_new ());
|
||||
GESTimeline *timeline = create_timeline_sync (FALSE);
|
||||
GESTimeline *timeline = ges_timeline_new ();
|
||||
GESPipeline *pipeline = ges_test_create_pipeline (timeline);
|
||||
|
||||
ges_timeline_add_track (timeline, track);
|
||||
|
|
|
@ -49,7 +49,7 @@ GST_START_TEST (test_overlay_properties)
|
|||
fail_unless (track != NULL);
|
||||
layer = ges_layer_new ();
|
||||
fail_unless (layer != NULL);
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
fail_unless (ges_timeline_add_track (timeline, track));
|
||||
|
@ -120,7 +120,7 @@ GST_START_TEST (test_overlay_in_layer)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = (GESLayer *) ges_layer_new ();
|
||||
a = GES_TRACK (ges_audio_track_new ());
|
||||
v = GES_TRACK (ges_video_track_new ());
|
||||
|
|
|
@ -277,32 +277,3 @@ play_timeline (GESTimeline * timeline)
|
|||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
_project_loaded_cb (GESProject * project, GESTimeline * timeline, GMainLoop * l)
|
||||
{
|
||||
GST_DEBUG_OBJECT (project, "Loaded");
|
||||
g_main_loop_quit (l);
|
||||
}
|
||||
|
||||
GESTimeline *
|
||||
create_timeline_sync (gboolean audio_video)
|
||||
{
|
||||
GMainLoop *l;
|
||||
GESAsset *project;
|
||||
GESTimeline *timeline;
|
||||
|
||||
if (audio_video)
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
else
|
||||
timeline = ges_timeline_new ();
|
||||
|
||||
project = ges_extractable_get_asset (GES_EXTRACTABLE (timeline));
|
||||
|
||||
l = g_main_loop_new (NULL, FALSE);
|
||||
g_signal_connect (project, "loaded", G_CALLBACK (_project_loaded_cb), l);
|
||||
g_main_loop_run (l);
|
||||
g_main_loop_unref (l);
|
||||
|
||||
return timeline;
|
||||
}
|
||||
|
|
|
@ -47,13 +47,6 @@ ges_generate_test_file_audio_video (const gchar * filedest,
|
|||
gboolean
|
||||
play_timeline (GESTimeline * timeline);
|
||||
|
||||
|
||||
/* This function is needed to avoid having an extra refcount when creating a blanck
|
||||
* timeline and while the project::loaded signal has not been emited, as this is
|
||||
* done on idle. This function will wait for that signal to be emited before
|
||||
* returning the new timeline*/
|
||||
GESTimeline * create_timeline_sync (gboolean audio_video);
|
||||
|
||||
#define gnl_object_check(gnlobj, start, duration, mstart, mduration, priority, active) { \
|
||||
guint64 pstart, pdur, inpoint, pprio, pact; \
|
||||
g_object_get (gnlobj, "start", &pstart, "duration", &pdur, \
|
||||
|
|
|
@ -33,7 +33,7 @@ GST_START_TEST (test_text_properties_in_layer)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = ges_layer_new ();
|
||||
a = GES_TRACK (ges_audio_track_new ());
|
||||
v = GES_TRACK (ges_video_track_new ());
|
||||
|
|
|
@ -52,7 +52,7 @@ GST_START_TEST (test_basic_timeline_edition)
|
|||
track = GES_TRACK (ges_audio_track_new ());
|
||||
fail_unless (track != NULL);
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
fail_unless (ges_timeline_add_track (timeline, track));
|
||||
|
||||
|
@ -254,7 +254,7 @@ GST_START_TEST (test_snapping)
|
|||
track = GES_TRACK (ges_video_track_new ());
|
||||
fail_unless (track != NULL);
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
|
||||
fail_unless (ges_timeline_add_track (timeline, track));
|
||||
|
@ -511,7 +511,7 @@ GST_START_TEST (test_simple_triming)
|
|||
g_main_loop_run (mainloop);
|
||||
|
||||
/* the asset is now loaded */
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
assets = ges_project_list_assets (project, GES_TYPE_CLIP);
|
||||
|
||||
assert_equals_int (g_list_length (assets), 1);
|
||||
|
@ -552,7 +552,7 @@ GST_START_TEST (test_timeline_edition_mode)
|
|||
track = GES_TRACK (ges_video_track_new ());
|
||||
fail_unless (track != NULL);
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
|
||||
fail_unless (ges_timeline_add_track (timeline, track));
|
||||
|
@ -999,7 +999,7 @@ GST_START_TEST (test_groups)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
|
||||
/* Our timeline
|
||||
*
|
||||
|
@ -1185,7 +1185,7 @@ GST_START_TEST (test_snapping_groups)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
g_object_set (timeline, "snapping-distance", (guint64) 3, NULL);
|
||||
|
||||
/* Our timeline
|
||||
|
@ -1324,7 +1324,7 @@ GST_START_TEST (test_scaling)
|
|||
G_TYPE_INT, 1000, NULL);
|
||||
|
||||
ges_init ();
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
ges_timeline_add_track (timeline, trackv);
|
||||
layer = ges_layer_new ();
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
|
|
|
@ -45,11 +45,11 @@ GST_START_TEST (test_title_source_properties)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
track = GES_TRACK (ges_video_track_new ());
|
||||
fail_unless (track != NULL);
|
||||
layer = ges_layer_new ();
|
||||
fail_unless (layer != NULL);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
fail_unless (ges_timeline_add_track (timeline, track));
|
||||
|
@ -120,7 +120,7 @@ GST_START_TEST (test_title_source_in_layer)
|
|||
|
||||
ges_init ();
|
||||
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
layer = ges_layer_new ();
|
||||
a = GES_TRACK (ges_audio_track_new ());
|
||||
v = GES_TRACK (ges_video_track_new ());
|
||||
|
|
|
@ -37,7 +37,7 @@ GST_START_TEST (test_transition_basic)
|
|||
|
||||
track = GES_TRACK (ges_video_track_new ());
|
||||
layer = ges_layer_new ();
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (track != NULL);
|
||||
fail_unless (layer != NULL);
|
||||
fail_unless (timeline != NULL);
|
||||
|
@ -81,7 +81,7 @@ GST_START_TEST (test_transition_properties)
|
|||
|
||||
track = GES_TRACK (ges_video_track_new ());
|
||||
layer = ges_layer_new ();
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (track != NULL);
|
||||
fail_unless (layer != NULL);
|
||||
fail_unless (timeline != NULL);
|
||||
|
|
|
@ -87,7 +87,7 @@ GST_START_TEST (test_filesource_basic)
|
|||
|
||||
mainloop = g_main_loop_new (NULL, FALSE);
|
||||
|
||||
timeline = create_timeline_sync (TRUE);
|
||||
timeline = ges_timeline_new_audio_video ();
|
||||
fail_unless (timeline != NULL);
|
||||
|
||||
layer = ges_layer_new ();
|
||||
|
@ -131,7 +131,7 @@ GST_START_TEST (test_filesource_properties)
|
|||
|
||||
layer = ges_layer_new ();
|
||||
fail_unless (layer != NULL);
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (GES_IS_TIMELINE (timeline));
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
fail_unless (ges_timeline_add_track (timeline, track));
|
||||
|
@ -220,7 +220,7 @@ GST_START_TEST (test_filesource_images)
|
|||
|
||||
layer = ges_layer_new ();
|
||||
fail_unless (layer != NULL);
|
||||
timeline = create_timeline_sync (FALSE);
|
||||
timeline = ges_timeline_new ();
|
||||
fail_unless (timeline != NULL);
|
||||
fail_unless (ges_timeline_add_layer (timeline, layer));
|
||||
fail_unless (ges_timeline_add_track (timeline, a));
|
||||
|
|
Loading…
Reference in a new issue