#include "para.h"
#include "string.h"
+#include "fd.h"
#include <SDL/SDL.h>
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 {
static struct stat_item stat_items[NUM_STAT_ITEMS];
-void para_log(__unused int ll, __unused char* fmt,...) /* no logging */
+void para_log(__a_unused int ll, __a_unused const char* fmt,...) /* no logging */
{
}
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
}
}
-static void print_msg(char *msg)
+static void print_msg(const char *msg)
{
SFont_FontInfo *font = &(fonts[MSG_FONT].fontinfo);
char *buf = strdup(msg);
/*
* 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;
tv.tv_usec = 3000000;
FD_ZERO(&rfds);
FD_SET(pipe, &rfds);
- ret = select(pipe + 1, &rfds, NULL, NULL, &tv);
-// printf("select returned %d\n", ret);
+ ret = para_select(pipe + 1, &rfds, NULL, &tv);
if (ret <= 0)
return 0;
if (read_audiod_pipe(pipe, update_status) > 0)
return 1;
-// clear_all_items();
free(stat_items[SI_STATUS_BAR].content);
stat_items[SI_STATUS_BAR].content =
para_strdup("audiod not running!?\n");