X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Finit.c;h=bcf1ad3db9821231cb1b3a11dc1533b85cf6f85c;hb=46401a29ca2cadec2e98694e392b6541deaf75bf;hp=b0da4c435947186794551f36dedf71d4697b71aa;hpb=b026b1ac697815f2bd67e11a8718478dc1d3aed6;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/init.c b/libchimara/init.c
index b0da4c4..bcf1ad3 100644
--- a/libchimara/init.c
+++ b/libchimara/init.c
@@ -1,14 +1,14 @@
 #include <config.h>
 #include <glib.h>
 #include <glib/gi18n-lib.h>
-#ifdef GSTREAMER_SOUND
+#if defined(GSTREAMER_0_10_SOUND) || defined(GSTREAMER_1_0_SOUND)
 #include <gst/gst.h>
 #endif
 
 static gboolean chimara_initialized = FALSE;
 
 /* This function is called at every entry point of the library, to set up
-threads and gettext. It is NOT called from Glk functions. */
+gettext and GStreamer. It is NOT called from Glk functions. */
 void
 chimara_init(void)
 {
@@ -17,25 +17,15 @@ chimara_init(void)
 		/* Setup gettext */
 		bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
 		bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-		
-		/* Make sure threads have been initialized */
-		if(!g_thread_supported())
-			g_error(_("In order to use the Chimara library, you must initialize"
-				" the thread system by calling g_threads_init() and "
-				"gdk_threads_init() BEFORE the initial call to gtk_init() in "
-				"your main program."));
 
-#ifdef GSTREAMER_SOUND
+#if defined(GSTREAMER_0_10_SOUND) || defined(GSTREAMER_1_0_SOUND)
 		/* Make sure GStreamer has been initialized if it hasn't been already;
 		in particular, if you want your program to parse GStreamer command line
 		options then you should do it yourself, before gtk_init(). */
+
 		if( !gst_is_initialized() )
 			gst_init(NULL, NULL);
 #endif
-
-		/* Initialize thread-private data */
-		extern GPrivate *glk_data_key;
-		glk_data_key = g_private_new(NULL);
 	}
 }