ges: Do not add any audio source when still image

We now have a backgroud so no problem with that.

Fix the testsuite accordingly

Fix #657514

diff --git a/ges/ges-timeline-file-source.c b/ges/ges-timeline-file-source.c
index e78d7919584e0dadca85e6a86c5f44feada805fc..185e358369ce3c1aaaf3d34ad03ad833fc9f0284 100644 (file)
--- a/ges/ges-timeline-file-source.c
+++ b/ges/ges-timeline-file-source.c
@@ -356,8 +356,8 @@ ges_timeline_filesource_create_track_object (GESTimelineObject * obj,
 
   if (priv->is_image) {
     if (track->type != GES_TRACK_TYPE_VIDEO) {
-      GST_DEBUG ("Object is still image, creating silent audio source");
-      res = (GESTrackObject *) ges_track_audio_test_source_new ();
+      GST_DEBUG ("Object is still image, not adding any audio source");
+      return NULL;
     } else {
       GST_DEBUG ("Creating a GESTrackImageSource");
       res = (GESTrackObject *) ges_track_image_source_new (priv->uri);

diff --git a/tests/check/ges/filesource.c b/tests/check/ges/filesource.c
index fec5e9335add8e114a6b94ea7925c22cf109cf33..76cedd51f4d39be2892e2dbc783fcf6ff93ac55f 100644 (file)
--- a/tests/check/ges/filesource.c
+++ b/tests/check/ges/filesource.c
@@ -187,20 +187,9 @@ GST_START_TEST (test_filesource_images)
   ges_track_remove_object (v, trobj);
   ges_timeline_object_release_track_object (tlobj, trobj);
 
-  /* the timeline object should create an audio test source when the is_image
-   * property is set true */
-
+  /* the timeline object should not create any TrackObject in the audio track */
   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
-   * And the timelineobject holds a reference to the object */
-  ASSERT_OBJECT_REFCOUNT (trobj, "Audio Track Object", 2);
-
-  ges_track_remove_object (v, trobj);
-  ges_timeline_object_release_track_object (tlobj, trobj);
-
+  fail_unless (trobj == NULL);
 
   g_object_unref (a);
   g_object_unref (v);