diff -p -up alsaplayer-0.99.80/alsaplayer/prefs.h~ alsaplayer-0.99.80/alsaplayer/prefs.h
--- alsaplayer-0.99.80/alsaplayer/prefs.h~	2007-07-08 16:15:55.000000000 +0200
+++ alsaplayer-0.99.80/alsaplayer/prefs.h	2008-08-14 11:06:00.000000000 +0200
@@ -57,10 +57,10 @@ void prefs_set_string(prefs_handle_t *pr
 void prefs_set_float(prefs_handle_t *prefs, const char *section, char *key, float val);
 void prefs_set_bool(prefs_handle_t *prefs, const char *section, char *key, int val);
 
-int prefs_get_int(prefs_handle_t *prefs, const char *section, char *key, int default_val);
-char *prefs_get_string(prefs_handle_t *prefs, const char *section, char *key, char *default_val);
+int prefs_get_int(prefs_handle_t *prefs, const char *section, const char *key, int default_val);
+char *prefs_get_string(prefs_handle_t *prefs, const char *section, const char *key, const char *default_val);
 float prefs_get_float(prefs_handle_t *prefs, const char *section, char *key, float default_val);
-int prefs_get_bool(prefs_handle_t *prefs, const char *section, char *key, int default_val);
+int prefs_get_bool(prefs_handle_t *prefs, const char *section, const char *key, int default_val);
 
 prefs_key_t* prefs_sort(prefs_handle_t *prefs);
 
diff -p -up alsaplayer-0.99.80/app/ControlSocket.cpp~ alsaplayer-0.99.80/app/ControlSocket.cpp
--- alsaplayer-0.99.80/app/ControlSocket.cpp~	2007-07-08 16:27:31.000000000 +0200
+++ alsaplayer-0.99.80/app/ControlSocket.cpp	2008-08-14 11:16:44.000000000 +0200
@@ -21,6 +21,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <unistd.h>
+#include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -242,7 +243,7 @@ static void socket_looper(void *arg)
 				if (getenv("HOME") == NULL) {
 					ap_message_add_int32(reply, "ack", 0);
 				} else {
-					char save_path[PATH_MAX];
+				  char save_path[PATH_MAX];
 					snprintf(save_path, sizeof(save_path)-1, "%s/.alsaplayer/latest.m3u", getenv("HOME"));
 					playlist->Save(save_path, PL_FORMAT_M3U);
 					ap_message_add_int32(reply, "ack", 1);
diff -p -up alsaplayer-0.99.80/app/Main.cpp~ alsaplayer-0.99.80/app/Main.cpp
--- alsaplayer-0.99.80/app/Main.cpp~	2007-10-08 21:15:41.000000000 +0200
+++ alsaplayer-0.99.80/app/Main.cpp	2008-08-14 11:09:04.000000000 +0200
@@ -88,7 +88,7 @@ prefs_handle_t *ap_prefs = NULL;
 void control_socket_start(Playlist *, interface_plugin *ui);
 void control_socket_stop();
 
-static char *default_pcm_device = "default";
+static char *default_pcm_device = (char *) "default";
 
 
 extern "C" {
@@ -144,7 +144,7 @@ interface_plugin_info_type load_interfac
 	interface_plugin *ui;
 
 	if (!global_pluginroot)
-		pluginroot = ADDON_DIR;
+	  pluginroot = (char *) ADDON_DIR;
 	else
 		pluginroot = global_pluginroot;
 
@@ -195,7 +195,7 @@ interface_plugin_info_type load_interfac
 extern int init_reverb();
 extern bool reverb_func(void *arg, void *data, int size);
 
-static char *copyright_string =
+static char *copyright_string = (char *)
     "AlsaPlayer " VERSION
     "\n(C) 1999-2004 Andy Lo A Foe <andy@alsaplayer.org> and others.";
 
@@ -209,7 +209,7 @@ static void list_available_plugins(const
 		return;
 
 	if (!global_pluginroot)
-		pluginroot = ADDON_DIR;
+	  pluginroot = (char *) ADDON_DIR;
 	else
 		pluginroot = global_pluginroot;
 
@@ -831,7 +831,7 @@ int main(int argc, char **argv)
 
 	// Check if we want jack
 	if (strcmp(argv[0], "jackplayer") == 0) {
-		use_output = "jack";
+	  use_output = (char *) "jack";
 	}
 	
 	// Check the output option
@@ -941,11 +941,11 @@ int main(int argc, char **argv)
 			(ap_prefs, "main", "default_interface", "gtk2");
 		// if we're trying to use the old gtk-1 interface, use gtk-2 instead
 		if (strcmp (interface, "gtk") == 0)
-			interface = "gtk2";
+		  interface = (char *) "gtk2";
 				// if we're trying to use the gtk interface, but we have no
 		// $DISPLAY, use the text interface instead
 		if (strcmp (interface, "gtk2") == 0 && !getenv("DISPLAY"))
-			interface = "text";
+		  interface = (char *) "text";
 		if (!(interface_plugin_info = load_interface(interface))) {
 			if (!(interface_plugin_info = load_interface(prefs_get_string
 						 (ap_prefs, "main", "fallback_interface", "text")))) {
diff -p -up alsaplayer-0.99.80/app/prefs.c~ alsaplayer-0.99.80/app/prefs.c
--- alsaplayer-0.99.80/app/prefs.c~	2007-07-08 16:30:17.000000000 +0200
+++ alsaplayer-0.99.80/app/prefs.c	2008-08-14 11:05:51.000000000 +0200
@@ -241,7 +241,7 @@ void prefs_set_float(prefs_handle_t *pre
 }
 
 
-int prefs_get_bool(prefs_handle_t *prefs, const char *section, char *key, int default_val)
+int prefs_get_bool(prefs_handle_t *prefs, const char *section, const char *key, int default_val)
 {
 	char str[1024];
 	char *res;
@@ -261,7 +261,7 @@ int prefs_get_bool(prefs_handle_t *prefs
 }
 
 
-int prefs_get_int(prefs_handle_t *prefs, const char *section, char *key, int default_val)
+int prefs_get_int(prefs_handle_t *prefs, const char *section, const char *key, int default_val)
 {
 	char str[1024];
 	char *res;
@@ -278,7 +278,7 @@ int prefs_get_int(prefs_handle_t *prefs,
 	return val;
 }
 
-char *prefs_get_string(prefs_handle_t *prefs, const char *section, char *key, char *default_val)
+char *prefs_get_string(prefs_handle_t *prefs, const char *section, const char *key, const char *default_val)
 {
 	prefs_key_t *entry;
 
diff -p -up alsaplayer-0.99.80/libalsaplayer/message.c~ alsaplayer-0.99.80/libalsaplayer/message.c
--- alsaplayer-0.99.80/libalsaplayer/message.c~	2007-07-08 18:07:05.000000000 +0200
+++ alsaplayer-0.99.80/libalsaplayer/message.c	2008-08-14 11:13:23.000000000 +0200
@@ -209,7 +209,7 @@ ap_message_t *ap_message_receive(int fd)
 }
 
 
-int ap_message_add_float(ap_message_t *msg, char *key, float val)
+int ap_message_add_float(ap_message_t *msg, const char *key, float val)
 {
 	ap_key_t *new_key;
 
@@ -226,7 +226,7 @@ int ap_message_add_float(ap_message_t *m
 }
 
 
-int ap_message_add_int32(ap_message_t *msg, char *key, int32_t val)
+int ap_message_add_int32(ap_message_t *msg, const char *key, int32_t val)
 {
 	ap_key_t *new_key;
 
@@ -244,7 +244,7 @@ int ap_message_add_int32(ap_message_t *m
 }
 
 
-ap_key_t *ap_message_find_key(ap_message_t *msg, char *key, int32_t key_type)
+ap_key_t *ap_message_find_key(ap_message_t *msg, const char *key, int32_t key_type)
 {
 	ap_key_t *current;
 	
@@ -262,7 +262,7 @@ ap_key_t *ap_message_find_key(ap_message
 }
 
 
-float *ap_message_find_float(ap_message_t *msg, char *key_id)
+float *ap_message_find_float(ap_message_t *msg, const char *key_id)
 {
 	ap_key_t *key;
 
@@ -273,7 +273,7 @@ float *ap_message_find_float(ap_message_
 }
 
 
-int32_t *ap_message_find_int32(ap_message_t *msg, char *key_id)
+int32_t *ap_message_find_int32(ap_message_t *msg, const char *key_id)
 {
 	ap_key_t *key;
 
@@ -284,7 +284,7 @@ int32_t *ap_message_find_int32(ap_messag
 }
 
 
-char *ap_message_find_string(ap_message_t *msg, char *key_id)
+char *ap_message_find_string(ap_message_t *msg, const char *key_id)
 {
 	ap_key_t *key;
 
@@ -295,7 +295,7 @@ char *ap_message_find_string(ap_message_
 }
 
 
-int ap_message_add_string(ap_message_t *msg, char *key_id, const char *val)
+int ap_message_add_string(ap_message_t *msg, const char *key_id, const char *val)
 {
 	ap_key_t *new_key;
 	char *str;
diff -p -up alsaplayer-0.99.80/libalsaplayer/message.h~ alsaplayer-0.99.80/libalsaplayer/message.h
--- alsaplayer-0.99.80/libalsaplayer/message.h~	2007-07-08 18:06:09.000000000 +0200
+++ alsaplayer-0.99.80/libalsaplayer/message.h	2008-08-14 11:12:52.000000000 +0200
@@ -127,17 +127,17 @@ typedef struct _ap_message ap_message_t;
 
 ap_message_t *ap_message_new(void);
 ap_key_t *ap_key_new(const char *keyid);
-int ap_message_add_float(ap_message_t *, char *, float);
-int ap_message_add_int32(ap_message_t *, char *, int32_t);
-int ap_message_add_string(ap_message_t *, char *, const char *);
+int ap_message_add_float(ap_message_t *, const char *, float);
+int ap_message_add_int32(ap_message_t *, const char *, int32_t);
+int ap_message_add_string(ap_message_t *, const char *, const char *);
 void ap_message_delete(ap_message_t *);
 
 int ap_message_send(int fd, ap_message_t *);
 ap_message_t *ap_message_receive(int fd);
 
-float *ap_message_find_float(ap_message_t *, char *);
-int32_t *ap_message_find_int32(ap_message_t *, char *);
-char *ap_message_find_string(ap_message_t *, char *);
+float *ap_message_find_float(ap_message_t *, const char *);
+int32_t *ap_message_find_int32(ap_message_t *, const char *);
+char *ap_message_find_string(ap_message_t *, const char *);
 
 #ifdef __cplusplus
 }