From ff6cc8af82136371a7e6236d438eed8b020ff951 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 4 Dec 2011 17:02:39 +0000 Subject: [PATCH] tools, tests: g_thread_init() is deprecated in glib master It's not needed any longer. --- tests/examples/encoding/encoding.c | 2 ++ tests/examples/overlay/gtk-xoverlay.c | 2 ++ tests/examples/overlay/qt-xoverlay.cpp | 2 ++ tests/examples/seek/jsseek.c | 2 ++ tests/examples/seek/scrubby.c | 2 ++ tests/examples/seek/seek.c | 2 ++ tests/icles/stress-playbin.c | 2 ++ tests/icles/test-colorkey.c | 2 ++ tests/icles/test-xoverlay.c | 2 ++ tools/gst-discoverer.c | 2 ++ 10 files changed, 20 insertions(+) diff --git a/tests/examples/encoding/encoding.c b/tests/examples/encoding/encoding.c index 86d7f8f..4c4865c 100644 --- a/tests/examples/encoding/encoding.c +++ b/tests/examples/encoding/encoding.c @@ -395,8 +395,10 @@ main (int argc, char **argv) GstEncodingProfile *prof; gchar *inputuri; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif ctx = g_option_context_new ("- encode URIs with GstProfile and encodebin"); g_option_context_add_main_entries (ctx, options, NULL); diff --git a/tests/examples/overlay/gtk-xoverlay.c b/tests/examples/overlay/gtk-xoverlay.c index c05685c..3050bd7 100644 --- a/tests/examples/overlay/gtk-xoverlay.c +++ b/tests/examples/overlay/gtk-xoverlay.c @@ -98,8 +98,10 @@ main (int argc, char **argv) gulong embed_xid; GstStateChangeReturn sret; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif gst_init (&argc, &argv); gtk_init (&argc, &argv); diff --git a/tests/examples/overlay/qt-xoverlay.cpp b/tests/examples/overlay/qt-xoverlay.cpp index aa483a7..cf8840f 100644 --- a/tests/examples/overlay/qt-xoverlay.cpp +++ b/tests/examples/overlay/qt-xoverlay.cpp @@ -80,8 +80,10 @@ find_video_sink (void) int main(int argc, char *argv[]) { +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif gst_init (&argc, &argv); QApplication app(argc, argv); diff --git a/tests/examples/seek/jsseek.c b/tests/examples/seek/jsseek.c index ab2bfc3..fd16c54 100644 --- a/tests/examples/seek/jsseek.c +++ b/tests/examples/seek/jsseek.c @@ -2672,8 +2672,10 @@ main (int argc, char **argv) GOptionContext *ctx; GError *err = NULL; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif ctx = g_option_context_new ("- test seeking in gsteamer"); g_option_context_add_main_entries (ctx, options, NULL); diff --git a/tests/examples/seek/scrubby.c b/tests/examples/seek/scrubby.c index c9a02f4..501d559 100644 --- a/tests/examples/seek/scrubby.c +++ b/tests/examples/seek/scrubby.c @@ -463,8 +463,10 @@ main (int argc, char **argv) GOptionContext *ctx; GError *err = NULL; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif ctx = g_option_context_new ("seek"); g_option_context_add_main_entries (ctx, options, NULL); diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c index b04967b..60c0997 100644 --- a/tests/examples/seek/seek.c +++ b/tests/examples/seek/seek.c @@ -2675,8 +2675,10 @@ main (int argc, char **argv) GOptionContext *ctx; GError *err = NULL; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif ctx = g_option_context_new ("- test seeking in gsteamer"); g_option_context_add_main_entries (ctx, options, NULL); diff --git a/tests/icles/stress-playbin.c b/tests/icles/stress-playbin.c index 3b90710..30970ce 100644 --- a/tests/icles/stress-playbin.c +++ b/tests/icles/stress-playbin.c @@ -100,8 +100,10 @@ main (int argc, char **argv) }; GTimer *timer; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif ctx = g_option_context_new ("FILES OR DIRECTORIES WITH AUDIO FILES"); g_option_context_add_main_entries (ctx, options, NULL); diff --git a/tests/icles/test-colorkey.c b/tests/icles/test-colorkey.c index ac04ba5..9d88aec 100644 --- a/tests/icles/test-colorkey.c +++ b/tests/icles/test-colorkey.c @@ -172,8 +172,10 @@ main (int argc, char **argv) GstPropertyProbe *probe; GValueArray *arr; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif gst_init (&argc, &argv); gtk_init (&argc, &argv); diff --git a/tests/icles/test-xoverlay.c b/tests/icles/test-xoverlay.c index 9ef552e..c1610b6 100644 --- a/tests/icles/test-xoverlay.c +++ b/tests/icles/test-xoverlay.c @@ -144,8 +144,10 @@ main (gint argc, gchar ** argv) gulong embed_xid = 0; gboolean force_aspect = FALSE, draw_borders = FALSE; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif gst_init (&argc, &argv); gtk_init (&argc, &argv); diff --git a/tools/gst-discoverer.c b/tools/gst-discoverer.c index 210c1ed..a3cd4f9 100644 --- a/tools/gst-discoverer.c +++ b/tools/gst-discoverer.c @@ -497,8 +497,10 @@ main (int argc, char **argv) }; GOptionContext *ctx; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif ctx = g_option_context_new -- 2.7.4