changeset 292:f99bf98118fc trunk

[svn] How about a default timidity.cfg location that actually works?
author chainsaw
date Fri, 16 Dec 2005 12:17:53 -0800
parents 65fc94b88b46
children 9b191695629c
files Plugins/Input/timidity/src/xmms-timidity.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Input/timidity/src/xmms-timidity.c	Fri Dec 16 12:08:03 2005 -0800
+++ b/Plugins/Input/timidity/src/xmms-timidity.c	Fri Dec 16 12:17:53 2005 -0800
@@ -27,6 +27,7 @@
 #include <gtk/gtk.h>
 #include <string.h>
 #include <timidity.h>
+#include <stdio.h>
 
 #include "xmms-timidity.h"
 #include "interface.h"
@@ -118,7 +119,7 @@
 	}
 
 	if (xmmstimid_cfg.config_file == NULL)
-		xmmstimid_cfg.config_file = g_strdup("/etc/timidity/timidity.cfg");
+		xmmstimid_cfg.config_file = g_strdup("/etc/timidity.cfg");
 
 	if (mid_init(xmmstimid_cfg.config_file) != 0) {
 		xmmstimid_initialized = FALSE;
@@ -388,7 +389,7 @@
 	xmmstimid_eof = FALSE;
 	xmmstimid_seek_to = -1;
 
-	xmmstimid_decode_thread = g_thread_create(xmmstimid_play_loop, NULL, TRUE, NULL);
+	xmmstimid_decode_thread = g_thread_create((GThreadFunc)xmmstimid_play_loop, NULL, TRUE, NULL);
 	if (xmmstimid_decode_thread == NULL) {
 		mid_song_free(xmmstimid_song);
 		xmmstimid_stop();