gst-discoverer: The 'ready' signal was renamed to 'finished'

[platform/upstream/gstreamer.git] / tools / gst-discoverer.c

diff --git a/tools/gst-discoverer.c b/tools/gst-discoverer.c
index 02582b7..f761d8a 100644 (file)
--- a/tools/gst-discoverer.c
+++ b/tools/gst-discoverer.c
@@ -245,35 +245,57 @@ static void
 print_info (GstDiscovererInfo * info, GError * err)
 {
   GstDiscovererResult result = gst_discoverer_info_get_result (info);
+  GstDiscovererStreamInfo *sinfo;
 
   g_print ("Done discovering %s\n", gst_discoverer_info_get_uri (info));
-  if (result & GST_DISCOVERER_URI_INVALID)
-    g_print ("URI is not valid\n");
-  else if (result & GST_DISCOVERER_TIMEOUT)
-    g_print ("Timeout !\n");
-  if (result & GST_DISCOVERER_ERROR) {
-    g_print ("An error was encountered while discovering the file\n");
-    g_print (" %s\n", err->message);
-    if (verbose && (result & GST_DISCOVERER_MISSING_PLUGINS)) {
-      gchar *tmp =
-          gst_structure_to_string (gst_discoverer_info_get_misc (info));
-      g_print (" (%s)\n", tmp);
-      g_free (tmp);
+  switch (result) {
+    case GST_DISCOVERER_OK:
+    {
+      break;
+    }
+    case GST_DISCOVERER_URI_INVALID:
+    {
+      g_print ("URI is not valid\n");
+      break;
+    }
+    case GST_DISCOVERER_ERROR:
+    {
+      g_print ("An error was encountered while discovering the file\n");
+      g_print (" %s\n", err->message);
+      break;
+    }
+    case GST_DISCOVERER_TIMEOUT:
+    {
+      g_print ("Analyzing URI timed out\n");
+      break;
+    }
+    case GST_DISCOVERER_BUSY:
+    {
+      g_print ("Discoverer was busy\n");
+      break;
+    }
+    case GST_DISCOVERER_MISSING_PLUGINS:
+    {
+      g_print ("Missing plugins\n");
+      if (verbose) {
+        gchar *tmp =
+            gst_structure_to_string (gst_discoverer_info_get_misc (info));
+        g_print (" (%s)\n", tmp);
+        g_free (tmp);
+      }
+      break;
     }
-
-    return;
   }
 
-  if (!(result & (GST_DISCOVERER_ERROR | GST_DISCOVERER_TIMEOUT))) {
-    GstDiscovererStreamInfo *sinfo = gst_discoverer_info_get_stream_info (info);
+  if ((sinfo = gst_discoverer_info_get_stream_info (info))) {
     g_print ("\nTopology:\n");
     print_topology (sinfo, 1);
     g_print ("\nDuration:\n");
     print_duration (info, 1);
     gst_discoverer_stream_info_unref (sinfo);
   }
-  g_print ("\n");
 
+  g_print ("\n");
 }
 
 static void
@@ -356,7 +378,7 @@ _run_async (PrivStruct * ps)
 }
 
 static void
-_discoverer_ready (GstDiscoverer * dc, GMainLoop * ml)
+_discoverer_finished (GstDiscoverer * dc, GMainLoop * ml)
 {
   g_main_loop_quit (ml);
 }
@@ -426,7 +448,7 @@ main (int argc, char **argv)
 
     /* connect signals */
     g_signal_connect (dc, "discovered", G_CALLBACK (_new_discovered_uri), NULL);
-    g_signal_connect (dc, "ready", G_CALLBACK (_discoverer_ready), ml);
+    g_signal_connect (dc, "finished", G_CALLBACK (_discoverer_finished), ml);
 
     gst_discoverer_start (dc);
     /* run mainloop */