mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 02:01:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

tools: Count argc after parsing GOption on Windows

Browse source 
Existing codes rely on modified argc value by g_option_context_parse()
but g_option_context_parse_strv() is used in case of Windows.
Count arguments after the option parsing manually.
Fixing command "gst-inspect-1.0.exe -b"

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4313>
This commit is contained in:
Seungha Yang 2023-03-31 04:40:58 +09:00 committed by GStreamer Marge Bot
parent 6bb1257c99
commit 55db8367f7
8 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-bad/tools/gst-transcoder.c
View file

@ -373,6 +373,10 @@ real_main (int argc, char *argv[])
g_option_context_free (ctx); g_option_context_free (ctx);
return 1; return 1;
} }
#ifdef G_OS_WIN32
argc = g_strv_length (argv);
#endif
gst_pb_utils_init (); gst_pb_utils_init ();
if (settings.list) { if (settings.list) {

4
subprojects/gst-plugins-base/tools/gst-device-monitor.c
View file

@ -337,6 +337,10 @@ real_main (int argc, char **argv)
} }
g_option_context_free (ctx); g_option_context_free (ctx);
#ifdef G_OS_WIN32
argc = g_strv_length (argv);
#endif
GST_DEBUG_CATEGORY_INIT (devmon_debug, "device-monitor", 0, GST_DEBUG_CATEGORY_INIT (devmon_debug, "device-monitor", 0,
"gst-device-monitor"); "gst-device-monitor");

4
subprojects/gst-plugins-base/tools/gst-discoverer.c
View file

@ -685,6 +685,10 @@ real_main (int argc, char **argv)
g_option_context_free (ctx); g_option_context_free (ctx);
#ifdef G_OS_WIN32
argc = g_strv_length (argv);
#endif
if (argc < 2) { if (argc < 2) {
g_print ("usage: %s <uris>\n", argv[0]); g_print ("usage: %s <uris>\n", argv[0]);
exit (-1); exit (-1);

4
subprojects/gst-plugins-base/tools/gst-play.c
View file

@ -1711,6 +1711,10 @@ real_main (int argc, char **argv)
} }
g_option_context_free (ctx); g_option_context_free (ctx);
#ifdef G_OS_WIN32
argc = g_strv_length (argv);
#endif
GST_DEBUG_CATEGORY_INIT (play_debug, "play", 0, "gst-play"); GST_DEBUG_CATEGORY_INIT (play_debug, "play", 0, "gst-play");
if (print_version) { if (print_version) {

4
subprojects/gstreamer/tools/gst-inspect.c
View file

@ -2189,6 +2189,10 @@ real_main (int argc, char *argv[])
gst_init (&argc, &argv); gst_init (&argc, &argv);
#endif #endif
#if defined(G_OS_WIN32) && !defined(GST_CHECK_MAIN)
argc = g_strv_length (argv);
#endif
gst_tools_print_version (); gst_tools_print_version ();
if (print_all && argc > 1) { if (print_all && argc > 1) {

4
subprojects/gstreamer/tools/gst-launch.c
View file

@ -1178,6 +1178,10 @@ real_main (int argc, char *argv[])
gst_init (&argc, &argv); gst_init (&argc, &argv);
#endif #endif
#ifdef G_OS_WIN32
argc = g_strv_length (argv);
#endif
gst_tools_print_version (); gst_tools_print_version ();
#ifdef G_OS_UNIX #ifdef G_OS_UNIX

4
subprojects/gstreamer/tools/gst-stats.c
View file

@ -1301,6 +1301,10 @@ main (gint argc, gchar * argv[])
} }
g_option_context_free (ctx); g_option_context_free (ctx);
#ifdef G_OS_WIN32
argc = g_strv_length (argv);
#endif
gst_tools_print_version (); gst_tools_print_version ();
if (filenames == NULL || *filenames == NULL) { if (filenames == NULL || *filenames == NULL) {

4
subprojects/gstreamer/tools/gst-typefind.c
View file

@ -177,6 +177,10 @@ real_main (int argc, char *argv[])
} }
g_option_context_free (ctx); g_option_context_free (ctx);
#ifdef G_OS_WIN32
argc = g_strv_length (argv);
#endif
gst_tools_print_version (); gst_tools_print_version ();
if (filenames == NULL || *filenames == NULL) { if (filenames == NULL || *filenames == NULL) {