2008-12-26 06:34:45 +00:00
|
|
|
$OpenBSD: patch-xmms_main_c,v 1.9 2008/12/26 06:34:45 jakemsr Exp $
|
2007-12-08 21:54:57 +00:00
|
|
|
--- xmms/main.c.orig Sun Jul 16 06:40:04 2006
|
2008-12-26 06:34:45 +00:00
|
|
|
+++ xmms/main.c Tue Dec 23 23:47:01 2008
|
|
|
|
@@ -501,7 +501,9 @@ static void read_config(void)
|
|
|
|
cfg.gentitle_format = g_strdup("%p - %t");
|
|
|
|
if (cfg.outputplugin == NULL)
|
|
|
|
{
|
|
|
|
-#ifdef HAVE_OSS
|
|
|
|
+#if defined(HAVE_SNDIO)
|
|
|
|
+ cfg.outputplugin = g_strdup_printf("%s/%s/libsndioout.so", PLUGIN_DIR, plugin_dir_list[0]);
|
|
|
|
+#elif defined(HAVE_OSS)
|
|
|
|
cfg.outputplugin = g_strdup_printf("%s/%s/libOSS.so", PLUGIN_DIR, plugin_dir_list[0]);
|
|
|
|
#elif defined(sun)
|
|
|
|
cfg.outputplugin = g_strdup_printf("%s/%s/libSolaris.so", PLUGIN_DIR, plugin_dir_list[0]);
|
|
|
|
@@ -4192,11 +4194,12 @@ int main(int argc, char **argv)
|
2001-07-20 14:26:16 +00:00
|
|
|
|
2002-02-05 04:07:57 +00:00
|
|
|
signal(SIGPIPE, SIG_IGN); /* for controlsocket.c */
|
2004-04-15 19:23:46 +00:00
|
|
|
signal(SIGSEGV, segfault_handler);
|
2002-02-05 04:07:57 +00:00
|
|
|
+#if !defined(OpenBSD)
|
|
|
|
g_thread_init(NULL);
|
2004-04-15 19:23:46 +00:00
|
|
|
gtk_set_locale();
|
2002-02-05 04:07:57 +00:00
|
|
|
if (!g_thread_supported())
|
2004-04-15 19:23:46 +00:00
|
|
|
g_error(_("GLib does not support threads."));
|
|
|
|
-
|
2002-02-05 04:07:57 +00:00
|
|
|
+#endif
|
2001-07-20 14:26:16 +00:00
|
|
|
parse_cmd_line(argc, argv, &options);
|
|
|
|
|
2007-12-08 21:54:57 +00:00
|
|
|
#ifdef HAVE_SRANDOMDEV
|