X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sdl_gui.c;h=d0bf2fbf65ae24df22e8224b3154f0720ff58286;hp=84a4c0d2f8a0ef43a49ee92ce8130375c9f33437;hb=5cbd764b2e3dc5c2e3c974ec528f91a03fca366d;hpb=48a247f640255dec0ce0e0d0ce8742d6223a14c2

diff --git a/sdl_gui.c b/sdl_gui.c
index 84a4c0d2..d0bf2fbf 100644
--- a/sdl_gui.c
+++ b/sdl_gui.c
@@ -68,19 +68,19 @@ struct gengetopt_args_info args_info;
 
 
 struct stat_item{
-        char *name;
-        char *prefix;
-        char *postfix;
-        char *content;
-        unsigned x;
-        unsigned y;
-        unsigned w;
-        unsigned h;
+	const char *name;
+	const char *prefix;
+	const char *postfix;
+	char *content;
+	unsigned x;
+	unsigned y;
+	unsigned w;
+	unsigned h;
 	Uint8 r;
 	Uint8 g;
 	Uint8 b;
-        int font;
-        int align;
+	int font;
+	int align;
 };
 
 struct font {
@@ -118,7 +118,7 @@ struct font fonts[] = {
 
 static struct stat_item stat_items[NUM_STAT_ITEMS];
 
-void para_log(__unused int ll, __unused char* fmt,...) /* no logging */
+void para_log(__unused int ll, __unused const char* fmt,...) /* no logging */
 {
 }
 
@@ -135,7 +135,6 @@ static void init_stat_items(void)
 
 	s[SI_STATUS_BAR].prefix = "";
 	s[SI_STATUS_BAR].postfix = "";
-	s[SI_STATUS_BAR].content = "";
 	s[SI_STATUS_BAR].x = 0;
 	s[SI_STATUS_BAR].y = 10;
 	s[SI_STATUS_BAR].w = 100;
@@ -148,7 +147,6 @@ static void init_stat_items(void)
 
 	s[SI_PLAY_TIME].prefix = "";
 	s[SI_PLAY_TIME].postfix = "";
-	s[SI_PLAY_TIME].content = "";
 	s[SI_PLAY_TIME].x = 35;
 	s[SI_PLAY_TIME].y = 20;
 	s[SI_PLAY_TIME].w = 65;
@@ -161,7 +159,6 @@ static void init_stat_items(void)
 
 	s[SI_STATUS].prefix = "";
 	s[SI_STATUS].postfix = "";
-	s[SI_STATUS].content = "";
 	s[SI_STATUS].x = 35;
 	s[SI_STATUS].y = 28;
 	s[SI_STATUS].w = 12;
@@ -174,7 +171,6 @@ static void init_stat_items(void)
 
 	s[SI_STATUS_FLAGS].prefix = " (";
 	s[SI_STATUS_FLAGS].postfix = ")";
-	s[SI_STATUS_FLAGS].content = "";
 	s[SI_STATUS_FLAGS].x = 47;
 	s[SI_STATUS_FLAGS].y = 28;
 	s[SI_STATUS_FLAGS].w = 15;
@@ -187,7 +183,6 @@ static void init_stat_items(void)
 
 	s[SI_NUM_PLAYED].prefix = "#";
 	s[SI_NUM_PLAYED].postfix = "";
-	s[SI_NUM_PLAYED].content = "0";
 	s[SI_NUM_PLAYED].x = 62;
 	s[SI_NUM_PLAYED].y = 28;
 	s[SI_NUM_PLAYED].w = 13;
@@ -200,7 +195,6 @@ static void init_stat_items(void)
 
 	s[SI_UPTIME].prefix = "Up: ";
 	s[SI_UPTIME].postfix = "";
-	s[SI_UPTIME].content = "";
 	s[SI_UPTIME].x = 75;
 	s[SI_UPTIME].y = 28;
 	s[SI_UPTIME].w = 25;
@@ -211,22 +205,20 @@ static void init_stat_items(void)
 	s[SI_UPTIME].font = N_YELLOW;
 	s[SI_UPTIME].align = RIGHT;
 
-	s[SI_DBTOOL].prefix = "selector: ";
-	s[SI_DBTOOL].postfix = "";
-	s[SI_DBTOOL].content = "no content yet";
-	s[SI_DBTOOL].x = 35;
-	s[SI_DBTOOL].y = 48;
-	s[SI_DBTOOL].w = 35;
-	s[SI_DBTOOL].h = FONT_HEIGHT;
-	s[SI_DBTOOL].r = 0;
-	s[SI_DBTOOL].g = 0;
-	s[SI_DBTOOL].b = 0;
-	s[SI_DBTOOL].font = N_YELLOW;
-	s[SI_DBTOOL].align = LEFT;
+	s[SI_SELECTOR].prefix = "selector: ";
+	s[SI_SELECTOR].postfix = "";
+	s[SI_SELECTOR].x = 35;
+	s[SI_SELECTOR].y = 48;
+	s[SI_SELECTOR].w = 35;
+	s[SI_SELECTOR].h = FONT_HEIGHT;
+	s[SI_SELECTOR].r = 0;
+	s[SI_SELECTOR].g = 0;
+	s[SI_SELECTOR].b = 0;
+	s[SI_SELECTOR].font = N_YELLOW;
+	s[SI_SELECTOR].align = LEFT;
 
 	s[SI_FORMAT].prefix = "Format: ";
 	s[SI_FORMAT].postfix = "";
-	s[SI_FORMAT].content = "";
 	s[SI_FORMAT].x = 70;
 	s[SI_FORMAT].y = 48;
 	s[SI_FORMAT].w = 30;
@@ -239,7 +231,6 @@ static void init_stat_items(void)
 
 	s[SI_MTIME].prefix = "MTime: ";
 	s[SI_MTIME].postfix = "";
-	s[SI_MTIME].content = "";
 	s[SI_MTIME].x = 35;
 	s[SI_MTIME].y = 35;
 	s[SI_MTIME].w = 65;
@@ -252,7 +243,6 @@ static void init_stat_items(void)
 
 	s[SI_FILE_SIZE].prefix = "Size: ";
 	s[SI_FILE_SIZE].postfix = "kb";
-	s[SI_FILE_SIZE].content = "";
 	s[SI_FILE_SIZE].x = 35;
 	s[SI_FILE_SIZE].y = 42;
 	s[SI_FILE_SIZE].w = 20;
@@ -265,7 +255,6 @@ static void init_stat_items(void)
 
 	s[SI_AUDIO_INFO1].prefix = "";
 	s[SI_AUDIO_INFO1].postfix = "";
-	s[SI_AUDIO_INFO1].content = "";
 	s[SI_AUDIO_INFO1].x = 0;
 	s[SI_AUDIO_INFO1].y = 60;
 	s[SI_AUDIO_INFO1].w = 100;
@@ -278,7 +267,6 @@ static void init_stat_items(void)
 
 	s[SI_AUDIO_INFO2].prefix = "";
 	s[SI_AUDIO_INFO2].postfix = "";
-	s[SI_AUDIO_INFO2].content = "";
 	s[SI_AUDIO_INFO2].x = 0;
 	s[SI_AUDIO_INFO2].y = 65;
 	s[SI_AUDIO_INFO2].w = 100;
@@ -291,7 +279,6 @@ static void init_stat_items(void)
 
 	s[SI_AUDIO_INFO3].prefix = "";
 	s[SI_AUDIO_INFO3].postfix = "";
-	s[SI_AUDIO_INFO3].content = "";
 	s[SI_AUDIO_INFO3].x = 0;
 	s[SI_AUDIO_INFO3].y = 70;
 	s[SI_AUDIO_INFO3].w = 100;
@@ -305,7 +292,6 @@ static void init_stat_items(void)
 	s[SI_DBINFO1].name = "dbinfo1:";
 	s[SI_DBINFO1].prefix = "";
 	s[SI_DBINFO1].postfix = "";
-	s[SI_DBINFO1].content = "";
 	s[SI_DBINFO1].x = 0;
 	s[SI_DBINFO1].y = 83;
 	s[SI_DBINFO1].w = 100;
@@ -318,7 +304,6 @@ static void init_stat_items(void)
 
 	s[SI_DBINFO2].prefix = "";
 	s[SI_DBINFO2].postfix = "";
-	s[SI_DBINFO2].content = "";
 	s[SI_DBINFO2].x = 0;
 	s[SI_DBINFO2].y = 88;
 	s[SI_DBINFO2].w = 100;
@@ -332,7 +317,6 @@ static void init_stat_items(void)
 	s[SI_DBINFO3].name = "dbinfo3:";
 	s[SI_DBINFO3].prefix = "";
 	s[SI_DBINFO3].postfix = "";
-	s[SI_DBINFO3].content = "";
 	s[SI_DBINFO3].x = 0;
 	s[SI_DBINFO3].y = 93;
 	s[SI_DBINFO3].w = 100;
@@ -450,7 +434,7 @@ static void tab2space(char *text)
 	}
 }
 
-static void print_msg(char *msg)
+static void print_msg(const char *msg)
 {
 	SFont_FontInfo *font = &(fonts[MSG_FONT].fontinfo);
 	char *buf = strdup(msg);
@@ -499,7 +483,7 @@ SDLKey get_key(void)
 /*
  * print message, wait for key (blocking), return 1 for 'q', 0 else
  */
-static SDLKey hit_key(char *msg)
+static SDLKey hit_key(const char *msg)
 {
 	SDLKey sym;