ges: Always create a project to back a timeline

And fix all the tests as we need to wait for the project to be loaded
to check the reference count of the timeline (as we keep a ref on the
timeline in project to later emit "loaded" on idle).

diff --git a/ges/ges-project.c b/ges/ges-project.c
index 818c9f74256d720ccb6685d9e3d69a4211c33802..5600a3a9fa7a8966135b6501be9e385dff40b1bc 100644 (file)
--- a/ges/ges-project.c
+++ b/ges/ges-project.c
@@ -234,7 +234,7 @@ _uri_missing_accumulator (GSignalInvocationHint * ihint, GValue * return_accu,
 static GESExtractable *
 ges_project_extract (GESAsset * project, GError ** error)
 {
-  GESTimeline *timeline = ges_timeline_new ();
+  GESTimeline *timeline = g_object_new (GES_TYPE_TIMELINE, NULL);
 
   if (_load_project (GES_PROJECT (project), timeline, error))
     return GES_EXTRACTABLE (timeline);
@@ -328,7 +328,7 @@ ges_project_class_init (GESProjectClass * klass)
 
   /**
    * GESProject::asset-added:
-   * @formatter: the #GESProject
+   * @project: the #GESProject
    * @asset: The #GESAsset that has been added to @project
    */
   _signals[ASSET_ADDED_SIGNAL] =
@@ -338,7 +338,7 @@ ges_project_class_init (GESProjectClass * klass)
 
   /**
    * GESProject::asset-removed:
-   * @formatter: the #GESProject
+   * @project: the #GESProject
    * @asset: The #GESAsset that has been removed from @project
    */
   _signals[ASSET_REMOVED_SIGNAL] =

diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c
index 7cc999aa86a887f5d9e0ed59ad35f8586c04d1ae..e620f85976ce395bc103db2e6c78ace571e0be91 100644 (file)
--- a/ges/ges-timeline.c
+++ b/ges/ges-timeline.c
@@ -2364,7 +2364,9 @@ pad_removed_cb (GESTrack * track, GstPad * pad, TrackPrivate * tr_priv)
 GESTimeline *
 ges_timeline_new (void)
 {
-  return g_object_new (GES_TYPE_TIMELINE, NULL);
+  GESProject *project = ges_project_new (NULL);
+
+  return GES_TIMELINE (ges_asset_extract (GES_ASSET (project), NULL));
 }
 
 /**

diff --git a/tests/check/ges/backgroundsource.c b/tests/check/ges/backgroundsource.c
index 34c2aea3f3587962e89637eb7e6a7d8da191e026..e55e1e39a2a1d0260c00bfb96046a94a12c446e3 100644 (file)
--- a/tests/check/ges/backgroundsource.c
+++ b/tests/check/ges/backgroundsource.c
@@ -53,7 +53,7 @@ GST_START_TEST (test_test_source_properties)
   layer = ges_layer_new ();
   fail_unless (layer != NULL);
 
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   fail_unless (timeline != NULL);
   fail_unless (ges_timeline_add_layer (timeline, layer));
   fail_unless (ges_timeline_add_track (timeline, track));

diff --git a/tests/check/ges/basic.c b/tests/check/ges/basic.c
index 26bd00c374cc562c4e10bfd05d3080217c20bbf9..eac1bb0b8d0ad35677738af50c543fbbc22d21b6 100644 (file)
--- a/tests/check/ges/basic.c
+++ b/tests/check/ges/basic.c
@@ -46,7 +46,7 @@ GST_START_TEST (test_ges_scenario)
 
   /* Timeline and 1 Layer */
   GST_DEBUG ("Create a timeline");
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   fail_unless (ges_timeline_add_layer (timeline, layer));
 
   pipeline = ges_test_create_pipeline (timeline);

diff --git a/tests/check/ges/clip.c b/tests/check/ges/clip.c
index bd6524673d4d209fb0db2da4f29b78cf81bee82c..3be24061d6fe2aad5475c152a1d362b28b2f2f3c 100644 (file)
--- a/tests/check/ges/clip.c
+++ b/tests/check/ges/clip.c
@@ -36,7 +36,7 @@ GST_START_TEST (test_object_properties)
 
   layer = ges_layer_new ();
   fail_unless (layer != NULL);
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = ges_layer_new ();
   audio_track = GES_TRACK (ges_audio_track_new ());
   video_track = GES_TRACK (ges_video_track_new ());

diff --git a/tests/check/ges/effects.c b/tests/check/ges/effects.c
index dc720f3f8e6630d5c5855da670081a253a6677a6..3bfbff92cc1bde39d0e13fc94bac8914f6e075ba 100644 (file)
--- a/tests/check/ges/effects.c
+++ b/tests/check/ges/effects.c
@@ -48,7 +48,7 @@ GST_START_TEST (test_add_effect_to_clip)
 
   ges_init ();
 
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_layer_new ();
   track_audio = GES_TRACK (ges_audio_track_new ());
   track_video = GES_TRACK (ges_video_track_new ());
@@ -96,7 +96,7 @@ GST_START_TEST (test_get_effects_from_tl)
 
   ges_init ();
 
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_layer_new ();
   track_video = GES_TRACK (ges_video_track_new ());
 
@@ -185,7 +185,7 @@ GST_START_TEST (test_effect_clip)
 
   ges_init ();
 
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_layer_new ();
   track_audio = GES_TRACK (ges_audio_track_new ());
   track_video = GES_TRACK (ges_video_track_new ());
@@ -255,7 +255,7 @@ GST_START_TEST (test_priorities_clip)
 
   ges_init ();
 
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = ges_layer_new ();
   track_audio = GES_TRACK (ges_audio_track_new ());
   track_video = GES_TRACK (ges_video_track_new ());
@@ -365,7 +365,7 @@ GST_START_TEST (test_effect_set_properties)
 
   ges_init ();
 
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_layer_new ();
   track_video = GES_TRACK (ges_video_track_new ());
 
@@ -453,7 +453,7 @@ GST_START_TEST (test_clip_signals)
 
   ges_init ();
 
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_layer_new ();
   track_video = GES_TRACK (ges_video_track_new ());
 

diff --git a/tests/check/ges/group.c b/tests/check/ges/group.c
index e60b61e6004d1a2fad0db970e0be709d70ebd331..2e744159df4f37663c1608fa62dd994cccee64fe 100644 (file)
--- a/tests/check/ges/group.c
+++ b/tests/check/ges/group.c
@@ -34,7 +34,7 @@ GST_START_TEST (test_move_group)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
 
   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 = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
 
   /* Our timeline
    *

diff --git a/tests/check/ges/layer.c b/tests/check/ges/layer.c
index 6721b92ad6351141fa5de6c3f56378b01d22c2db..4e7b12cb994d34be0f301d001bef366462b02a0c 100644 (file)
--- a/tests/check/ges/layer.c
+++ b/tests/check/ges/layer.c
@@ -34,7 +34,7 @@ GST_START_TEST (test_layer_properties)
   ges_init ();
 
   /* Timeline and 1 Layer */
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   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 = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   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 = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   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 = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   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 = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1480,7 +1480,7 @@ GST_START_TEST (test_layer_meta_boolean)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1502,7 +1502,7 @@ GST_START_TEST (test_layer_meta_int)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1524,7 +1524,7 @@ GST_START_TEST (test_layer_meta_uint)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1546,7 +1546,7 @@ GST_START_TEST (test_layer_meta_int64)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1568,7 +1568,7 @@ GST_START_TEST (test_layer_meta_uint64)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1590,7 +1590,7 @@ GST_START_TEST (test_layer_meta_float)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1613,7 +1613,7 @@ GST_START_TEST (test_layer_meta_double)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1639,7 +1639,7 @@ GST_START_TEST (test_layer_meta_date)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   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 = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1700,7 +1700,7 @@ GST_START_TEST (test_layer_meta_value)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1728,7 +1728,7 @@ GST_START_TEST (test_layer_meta_register)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 
@@ -1764,7 +1764,7 @@ GST_START_TEST (test_layer_meta_foreach)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   layer = ges_layer_new ();
   ges_timeline_add_layer (timeline, layer);
 

diff --git a/tests/check/ges/mixers.c b/tests/check/ges/mixers.c
index 167cd32d86f95f9313024ced530fea7832846c5d..29fed3588dfd13c30b71b99bebd6efa09400e1d5 100644 (file)
--- a/tests/check/ges/mixers.c
+++ b/tests/check/ges/mixers.c
@@ -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 = ges_timeline_new ();
+  GESTimeline *timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  GESTimeline *timeline = create_timeline_sync (FALSE);
   GESPipeline *pipeline = ges_test_create_pipeline (timeline);
 
   ges_timeline_add_track (timeline, track);

diff --git a/tests/check/ges/overlays.c b/tests/check/ges/overlays.c
index 430e3c35ef7da37f0aa184b073c85b6ffc7e3235..e47d22e7f9edf4483909ce8c7349cbd7bf6a59b3 100644 (file)
--- a/tests/check/ges/overlays.c
+++ b/tests/check/ges/overlays.c
@@ -49,7 +49,7 @@ GST_START_TEST (test_overlay_properties)
   fail_unless (track != NULL);
   layer = ges_layer_new ();
   fail_unless (layer != NULL);
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_layer_new ();
   a = GES_TRACK (ges_audio_track_new ());
   v = GES_TRACK (ges_video_track_new ());

diff --git a/tests/check/ges/simplelayer.c b/tests/check/ges/simplelayer.c
index c873929bca4da4caac00d8ecc4c98696d9b76476..67b87148612f7d749dc982559e24c1e19e9b4e96 100644 (file)
--- a/tests/check/ges/simplelayer.c
+++ b/tests/check/ges/simplelayer.c
@@ -34,7 +34,7 @@ GST_START_TEST (test_gsl_add)
   /* This is the simplest scenario ever */
 
   /* Timeline and 1 Layer */
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_layer_new ();
   fail_unless (ges_timeline_add_layer (timeline, layer));
   track = GES_TRACK (ges_video_track_new ());
@@ -102,7 +102,7 @@ GST_START_TEST (test_gsl_move_simple)
   ges_init ();
 
   /* Timeline and 1 Layer */
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_layer_new ();
   fail_unless (ges_timeline_add_layer (timeline, layer));
   track = ges_track_new (GES_TRACK_TYPE_CUSTOM, gst_caps_new_any ());
@@ -201,7 +201,7 @@ GST_START_TEST (test_gsl_with_transitions)
   ges_init ();
 
   /* Timeline and 1 Layer */
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_layer_new ();
 
   g_signal_connect (G_OBJECT (layer), "notify::valid",

diff --git a/tests/check/ges/test-utils.c b/tests/check/ges/test-utils.c
index 637a17e20766023f3d18d241359c41a05fdc2088..2468cb4ba67fa11edc0e56bdbd2b6f83d55deeb4 100644 (file)
--- a/tests/check/ges/test-utils.c
+++ b/tests/check/ges/test-utils.c
@@ -277,3 +277,32 @@ 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;
+}

diff --git a/tests/check/ges/test-utils.h b/tests/check/ges/test-utils.h
index 366230201ffde2f6c8cf501d2147c601c38f5271..cd810adb194c617ed90598f632090e53ff053140 100644 (file)
--- a/tests/check/ges/test-utils.h
+++ b/tests/check/ges/test-utils.h
@@ -47,6 +47,13 @@ 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,           \

diff --git a/tests/check/ges/text_properties.c b/tests/check/ges/text_properties.c
index d7a8872a2a3b92e5653606f7184e81b264f194da..d35ef5c17a3ccf5fdccaccacb544bbdf3073c71e 100644 (file)
--- a/tests/check/ges/text_properties.c
+++ b/tests/check/ges/text_properties.c
@@ -33,7 +33,7 @@ GST_START_TEST (test_text_properties_in_layer)
 
   ges_init ();
 
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_layer_new ();
   a = GES_TRACK (ges_audio_track_new ());
   v = GES_TRACK (ges_video_track_new ());

diff --git a/tests/check/ges/timelineedition.c b/tests/check/ges/timelineedition.c
index 66560a68523dcecd95c8e57983e255b4221a1aa1..913bfe51c66503abe4ab7e1562f68a2305782686 100644 (file)
--- a/tests/check/ges/timelineedition.c
+++ b/tests/check/ges/timelineedition.c
@@ -52,7 +52,7 @@ GST_START_TEST (test_basic_timeline_edition)
   track = GES_TRACK (ges_audio_track_new ());
   fail_unless (track != NULL);
 
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   fail_unless (timeline != NULL);
 
   fail_unless (ges_timeline_add_track (timeline, track));
@@ -999,7 +999,7 @@ GST_START_TEST (test_groups)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
 
   /* Our timeline
    *
@@ -1185,7 +1185,7 @@ GST_START_TEST (test_snapping_groups)
 
   ges_init ();
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   ges_timeline_add_track (timeline, trackv);
   layer = ges_layer_new ();
   fail_unless (ges_timeline_add_layer (timeline, layer));

diff --git a/tests/check/ges/titles.c b/tests/check/ges/titles.c
index 6564bfbaa98f5e2ee03dc3754c6218ae99f689f1..f71d87a47af434a7ff0ad98b114cac5136da1138 100644 (file)
--- a/tests/check/ges/titles.c
+++ b/tests/check/ges/titles.c
@@ -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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   layer = (GESLayer *) ges_simple_layer_new ();
   a = GES_TRACK (ges_audio_track_new ());
   v = GES_TRACK (ges_video_track_new ());

diff --git a/tests/check/ges/transition.c b/tests/check/ges/transition.c
index c8906eadbba34dbaf0cadb894bcb827a35a38d96..42b0e8af41e346cf90586148c70f3d90b59473c6 100644 (file)
--- a/tests/check/ges/transition.c
+++ b/tests/check/ges/transition.c
@@ -37,7 +37,7 @@ GST_START_TEST (test_transition_basic)
 
   track = GES_TRACK (ges_video_track_new ());
   layer = ges_layer_new ();
-  timeline = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   fail_unless (track != NULL);
   fail_unless (layer != NULL);
   fail_unless (timeline != NULL);

diff --git a/tests/check/ges/uriclip.c b/tests/check/ges/uriclip.c
index 09dfb4ed80bedeb453ddf1d11fada752772da3ab..2fef22ba53ebe39606b341dd2c597886363ac861 100644 (file)
--- a/tests/check/ges/uriclip.c
+++ b/tests/check/ges/uriclip.c
@@ -87,7 +87,7 @@ GST_START_TEST (test_filesource_basic)
 
   mainloop = g_main_loop_new (NULL, FALSE);
 
-  timeline = ges_timeline_new_audio_video ();
+  timeline = create_timeline_sync (TRUE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   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 = ges_timeline_new ();
+  timeline = create_timeline_sync (FALSE);
   fail_unless (timeline != NULL);
   fail_unless (ges_timeline_add_layer (timeline, layer));
   fail_unless (ges_timeline_add_track (timeline, a));