Commit cb28f496 authored by Edward Hervey's avatar Edward Hervey Committed by Edward Hervey

tools: Fix discoverer deprecation

The only information provided by "misc" was the missing plugins which
is already handled with another API
parent d69fa0c7
...@@ -231,7 +231,9 @@ GST_START_TEST (test_disco_missing_plugins) ...@@ -231,7 +231,9 @@ GST_START_TEST (test_disco_missing_plugins)
result = gst_discoverer_info_get_result (info); result = gst_discoverer_info_get_result (info);
GST_INFO ("result: %d, error message: %s", result, err->message); GST_INFO ("result: %d, error message: %s", result, err->message);
fail_unless_equals_int (result, GST_DISCOVERER_MISSING_PLUGINS); fail_unless_equals_int (result, GST_DISCOVERER_MISSING_PLUGINS);
#ifndef GST_DISABLE_DEPRECATED
GST_INFO ("misc: %" GST_PTR_FORMAT, gst_discoverer_info_get_misc (info)); GST_INFO ("misc: %" GST_PTR_FORMAT, gst_discoverer_info_get_misc (info));
#endif
gst_discoverer_info_unref (info); gst_discoverer_info_unref (info);
g_error_free (err); g_error_free (err);
......
...@@ -66,7 +66,9 @@ gst_stream_information_to_string (GstDiscovererStreamInfo * info, GString * s, ...@@ -66,7 +66,9 @@ gst_stream_information_to_string (GstDiscovererStreamInfo * info, GString * s,
{ {
gchar *tmp; gchar *tmp;
GstCaps *caps; GstCaps *caps;
#ifndef GST_DISABLE_DEPRECATED
const GstStructure *misc; const GstStructure *misc;
#endif
my_g_string_append_printf (s, depth, "Codec:\n"); my_g_string_append_printf (s, depth, "Codec:\n");
caps = gst_discoverer_stream_info_get_caps (info); caps = gst_discoverer_stream_info_get_caps (info);
...@@ -75,6 +77,7 @@ gst_stream_information_to_string (GstDiscovererStreamInfo * info, GString * s, ...@@ -75,6 +77,7 @@ gst_stream_information_to_string (GstDiscovererStreamInfo * info, GString * s,
my_g_string_append_printf (s, depth, " %s\n", tmp); my_g_string_append_printf (s, depth, " %s\n", tmp);
g_free (tmp); g_free (tmp);
#ifndef GST_DISABLE_DEPRECATED
my_g_string_append_printf (s, depth, "Additional info:\n"); my_g_string_append_printf (s, depth, "Additional info:\n");
if ((misc = gst_discoverer_stream_info_get_misc (info))) { if ((misc = gst_discoverer_stream_info_get_misc (info))) {
tmp = gst_structure_to_string (misc); tmp = gst_structure_to_string (misc);
...@@ -83,6 +86,7 @@ gst_stream_information_to_string (GstDiscovererStreamInfo * info, GString * s, ...@@ -83,6 +86,7 @@ gst_stream_information_to_string (GstDiscovererStreamInfo * info, GString * s,
} else { } else {
my_g_string_append_printf (s, depth, " None\n"); my_g_string_append_printf (s, depth, " None\n");
} }
#endif
my_g_string_append_printf (s, depth, "Stream ID: %s\n", my_g_string_append_printf (s, depth, "Stream ID: %s\n",
gst_discoverer_stream_info_get_stream_id (info)); gst_discoverer_stream_info_get_stream_id (info));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment