gst/playback/gstplaybasebin.c: Throw error if we failed to find a suitable output...

Original commit message from CVS:
* gst/playback/gstplaybasebin.c: (gst_play_base_bin_change_state):
Throw error if we failed to find a suitable output. This should
throw an error if we successfully set up a pipeline (e.g. because
we recognized a media file) but found no decodable streams in it
(e.g. because it contains only media stream types for which we
have no decoders, or because it's not a media type).

diff --git a/ChangeLog b/ChangeLog
index f0acaf89d4e00119c4cb54e0de802d03c9891e13..8623b259c786eef0067f60398558addf26dfecf9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-24  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+       * gst/playback/gstplaybasebin.c: (gst_play_base_bin_change_state):
+         Throw error if we failed to find a suitable output. This should
+         throw an error if we successfully set up a pipeline (e.g. because
+         we recognized a media file) but found no decodable streams in it
+         (e.g. because it contains only media stream types for which we
+         have no decoders, or because it's not a media type).
+
 2004-09-23  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
        * ext/dirac/Makefile.am:

diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index cd300bcbb4423639ce7bc60a54e379a7382de8e6..5520d1c4e364f43f346068fe439f9ae1c97dcc61 100644 (file)
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -555,6 +555,12 @@ gst_play_base_bin_change_state (GstElement * element)
             CODEC_NOT_FOUND,
             ("cannot open file \"%s\"", play_base_bin->uri), (NULL));
         ret = GST_STATE_FAILURE;
+      } else if (!play_base_bin->streaminfo) {
+        GST_ELEMENT_ERROR (GST_ELEMENT (play_base_bin), STREAM,
+            CODEC_NOT_FOUND,
+            ("Failed to find any supported stream in file \"%s\"",
+                play_base_bin->uri), (NULL));
+        ret = GST_STATE_FAILURE;
       } else {
         ret = gst_element_set_state (play_base_bin->thread, GST_STATE_PAUSED);
       }