diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-22 23:15:19 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-22 23:15:19 +0000 |
| commit | 7cb9b7ab9db548eca8a67883b010dd14d2efd07e (patch) | |
| tree | 9bb89dfc5492ca7945541013bc9992485a775f72 /tests/icles | |
| parent | ba2ec3ff984262eceb6fdeeed08cefcaee045b15 (diff) | |
| download | gstreamer-plugins-good-7cb9b7ab9db548eca8a67883b010dd14d2efd07e.tar.gz | |
Use new GLib API unconditionally
Diffstat (limited to 'tests/icles')
| -rw-r--r-- | tests/icles/equalizer-test.c | 5 | ||||
| -rw-r--r-- | tests/icles/gdkpixbufsink-test.c | 5 | ||||
| -rw-r--r-- | tests/icles/test-oss4.c | 5 | ||||
| -rw-r--r-- | tests/icles/v4l2src-test.c | 6 | ||||
| -rw-r--r-- | tests/icles/videocrop-test.c | 5 |
5 files changed, 1 insertions, 25 deletions
diff --git a/tests/icles/equalizer-test.c b/tests/icles/equalizer-test.c index fc6d5273e..e082162ed 100644 --- a/tests/icles/equalizer-test.c +++ b/tests/icles/equalizer-test.c @@ -179,11 +179,6 @@ main (int argc, char **argv) GstPad *eq_sinkpad; gchar *uri; -#if !GLIB_CHECK_VERSION (2, 31, 0) - if (!g_thread_supported ()) - g_thread_init (NULL); -#endif - /* command line option parsing */ ctx = g_option_context_new ("FILENAME"); g_option_context_add_group (ctx, gst_init_get_option_group ()); diff --git a/tests/icles/gdkpixbufsink-test.c b/tests/icles/gdkpixbufsink-test.c index 8ada8614b..a09d9f135 100644 --- a/tests/icles/gdkpixbufsink-test.c +++ b/tests/icles/gdkpixbufsink-test.c @@ -330,11 +330,6 @@ main (int argc, char **argv) GOptionContext *ctx; GError *opt_err = NULL; -#if !GLIB_CHECK_VERSION (2, 31, 0) - if (!g_thread_supported ()) - g_thread_init (NULL); -#endif - gtk_init (&argc, &argv); /* command line option parsing */ diff --git a/tests/icles/test-oss4.c b/tests/icles/test-oss4.c index 233e891fd..ad8f46cd0 100644 --- a/tests/icles/test-oss4.c +++ b/tests/icles/test-oss4.c @@ -233,11 +233,6 @@ 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 (""); g_option_context_add_main_entries (ctx, options, NULL); g_option_context_add_group (ctx, gst_init_get_option_group ()); diff --git a/tests/icles/v4l2src-test.c b/tests/icles/v4l2src-test.c index 5020c5e7f..674267798 100644 --- a/tests/icles/v4l2src-test.c +++ b/tests/icles/v4l2src-test.c @@ -491,14 +491,10 @@ main (int argc, char *argv[]) gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); loop = g_main_loop_new (NULL, FALSE); -#if !GLIB_CHECK_VERSION (2, 31, 0) - input_thread = g_thread_create (read_user, source, TRUE, NULL); -#else input_thread = g_thread_try_new ("v4l2src-test", read_user, source, NULL); -#endif if (input_thread == NULL) { - fprintf (stderr, "error: g_thread_create return NULL"); + fprintf (stderr, "error: g_thread_try_new() failed"); return -1; } diff --git a/tests/icles/videocrop-test.c b/tests/icles/videocrop-test.c index de8963b3f..001f89163 100644 --- a/tests/icles/videocrop-test.c +++ b/tests/icles/videocrop-test.c @@ -193,11 +193,6 @@ main (int argc, char **argv) GstCaps *filter_caps = NULL; GList *caps_list, *l; -#if !GLIB_CHECK_VERSION (2, 31, 0) - if (!g_thread_supported ()) - g_thread_init (NULL); -#endif - /* command line option parsing */ ctx = g_option_context_new (""); g_option_context_add_group (ctx, gst_init_get_option_group ()); |