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

Replace NO_X conditional compilation with testing whether DISPLAY env variable is set, and doing gtk_type_init() inst...

Browse source 
Original commit message from CVS:
Replace NO_X conditional compilation with testing whether DISPLAY env
variable is set, and doing gtk_type_init() instead of gtk_init() if not.
This commit is contained in:
Richard Boulton 2001-06-04 00:51:35 +00:00
parent 6466d1444a
commit 785d258c33
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/gst.c
View file

@ -34,8 +34,6 @@
#include "gstqueue.h"
#include "gsttypefind.h"
//#define NO_X
#define MAX_PATH_SPLIT 16
gchar *_gst_progname;
@ -59,16 +57,22 @@ void
gst_init (int *argc, char **argv[])
{
GstTrace *gst_trace;
gchar *display;
GST_INFO (GST_CAT_GST_INIT, "Initializing GStreamer Core Library");
if (!g_thread_supported ()) g_thread_init (NULL);
#ifdef NO_X
gtk_type_init ();
#else
gtk_init (argc,argv);
#endif
/* Only initialise gtk fully if we have an X display.
* FIXME: this fails if the display is specified differently, eg, by
* a command line parameter. This is okay though, since this is only
* a quick hack and should be replaced when we move to gobject.*/
display = g_getenv("DISPLAY");
if (display == NULL) {
gtk_type_init ();
} else {
gtk_init (argc,argv);
}
if (!gst_init_check (argc,argv)) {
exit (0);
@ -216,7 +220,6 @@ gst_init_check (int *argc,
/* check for ENV variables */
{
gchar *plugin_path = g_getenv("GST_PLUGIN_PATH");
gst_add_paths_func (plugin_path);
}