X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=b5a8f7bb14fe42d022c5d0faafffbd46062116a3;hp=049262d39d75074a84e7bdf984e4e1c1c48258bd;hb=501edee5b98e4133bb64f41f78ffec1cd6f91f7e;hpb=c5517c98d28a74a89086b0641e3633d16eaf9df7

diff --git a/para.h b/para.h
index 049262d3..b5a8f7bb 100644
--- a/para.h
+++ b/para.h
@@ -23,25 +23,19 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/wait.h>
-#include <signal.h>
-#include <sys/signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <time.h> /* time(), localtime() */
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <stropts.h>
-#include <poll.h>
-#include <sys/socket.h>
+#include <ctype.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <ctype.h>
+#include <sys/socket.h>
 #include <sys/un.h> /* needed by create_pf_socket */
+#include <string.h>
 #include "gcc-compat.h"
 
 /* some internal constants */
@@ -49,9 +43,9 @@
 #define MAXLINE 255
 
 
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define ABS(a) ((a) > 0 ? (a) : -(a))
+#define PARA_MIN(a,b) ((a) < (b) ? (a) : (b))
+#define PARA_MAX(a,b) ((a) > (b) ? (a) : (b))
+#define PARA_ABS(a) ((a) > 0 ? (a) : -(a))
 
 /* Loglevels */
 #define DEBUG 1
@@ -67,37 +61,37 @@
 #if DEBUG > COMPILE_TIME_LOGLEVEL
 #define PARA_DEBUG_LOG(f,...) para_log(DEBUG, "%s: " f, __FUNCTION__, __VA_ARGS__)
 #else
-#define PARA_DEBUG_LOG(...)
+#define PARA_DEBUG_LOG(...) do {;} while (0)
 #endif
 
 #if INFO > COMPILE_TIME_LOGLEVEL
 #define PARA_INFO_LOG(f,...) para_log(INFO, "%s: " f, __FUNCTION__, __VA_ARGS__)
 #else
-#define PARA_INFO_LOG(...)
+#define PARA_INFO_LOG(...) do {;} while (0)
 #endif
 
 #if NOTICE > COMPILE_TIME_LOGLEVEL
 #define PARA_NOTICE_LOG(f,...) para_log(NOTICE, "%s: " f, __FUNCTION__, __VA_ARGS__)
 #else
-#define PARA_NOTICE_LOG(...)
+#define PARA_NOTICE_LOG(...) do {;} while (0)
 #endif
 
 #if WARNING > COMPILE_TIME_LOGLEVEL
 #define PARA_WARNING_LOG(f,...) para_log(WARNING, "%s: " f, __FUNCTION__, __VA_ARGS__)
 #else
-#define PARA_WARNING_LOG(...)
+#define PARA_WARNING_LOG(...) do {;} while (0)
 #endif
 
 #if ERROR > COMPILE_TIME_LOGLEVEL
 #define PARA_ERROR_LOG(f,...) para_log(ERROR, "%s: " f, __FUNCTION__, __VA_ARGS__)
 #else
-#define PARA_ERROR_LOG(...)
+#define PARA_ERROR_LOG(...) do {;} while (0)
 #endif
 
 #if CRIT > COMPILE_TIME_LOGLEVEL
 #define PARA_CRIT_LOG(f,...) para_log(CRIT, "%s: " f, __FUNCTION__, __VA_ARGS__)
 #else
-#define PARA_CRIT_LOG(...)
+#define PARA_CRIT_LOG(...) do {;} while (0)
 #endif
 
 #if EMERG > COMPILE_TIME_LOGLEVEL
@@ -122,9 +116,7 @@ int para_open_audiod_pipe(char *);
 int read_audiod_pipe(int, void (*)(char *));
 
 /* exec */
-int file_exists(const char *);
-int para_exec(pid_t *, const char *, char *const [], int *);
-int para_exec_cmdline_pid(pid_t *, char *, int *);
+int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds);
 
 /* signal */
 int para_signal_init(void);
@@ -139,7 +131,7 @@ long unsigned tv2ms(const struct timeval*);
 void d2tv(double, struct timeval*);
 void tv_add(const struct timeval*, const struct timeval *, struct timeval *);
 void tv_scale(const unsigned long, const struct timeval *, struct timeval *);
-void tv_divide(const unsigned long div, const struct timeval *tv,
+void tv_divide(const unsigned long divisor, const struct timeval *tv,
 	struct timeval *result);
 int tv_convex_combination(const long a, const struct timeval *tv1,
 		const long b, const struct timeval *tv2,
@@ -156,25 +148,26 @@ enum {
 	SI_DBINFO3,		SI_DECODER_FLAGS,	SI_AUDIOD_STATUS,
 	SI_PLAY_TIME,		SI_UPTIME,		SI_OFFSET,
 	SI_LENGTH,		SI_STREAM_START,	SI_CURRENT_TIME,
-	SI_AUDIOD_UPTIME,	SI_DBTOOL,
+	SI_AUDIOD_UPTIME,	SI_SELECTOR,		NUM_STAT_ITEMS
 };
-#define NUM_STAT_ITEMS (SI_DBTOOL + 1)
+
+int stat_item_valid(const char *item);
 int stat_line_valid(const char *);
-void stat_client_write(char *msg);
-int stat_client_add(int);
-void dump_empty_status(void);
-unsigned for_each_line(char *, int, void (*)(char *), int);
+void stat_client_write(char *msg, int itemnum);
+int stat_client_add(int fd, long unsigned mask);
+unsigned for_each_line(char *, int, void (*)(char *));
+#define FOR_EACH_STAT_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++)
 
 struct stat_item_data {
-	char *prefix, *postfix;
+	const char *prefix, *postfix;
 	unsigned x, y, len;
 	int fg, bg, align;
 };
 
 /* gui_theme */
 struct gui_theme {
-	char *name;
-	char *author;
+	const char *name;
+	const char *author;
 	int sb_fg, sb_bg;
 	int cmd_fg, cmd_bg;
 	int output_fg, output_bg;
@@ -182,7 +175,7 @@ struct gui_theme {
 	int err_msg_fg, err_msg_bg;
 	int welcome_fg, welcome_bg;
 	int sep_fg, sep_bg;
-	char *sep_str;
+	const char *sep_str;
 	int default_fg, default_bg;
 
 	int top_lines_default, top_lines_min;
@@ -198,7 +191,7 @@ void prev_theme(struct gui_theme *);
 #define CENTER 3
 
 
-__printf_2_3 void para_log(int, char*, ...);
+__printf_2_3 void para_log(int, const char*, ...);
 
 /* taken from printf man page */
 #define PARA_VSPRINTF(fmt, p) \
@@ -222,6 +215,3 @@ __printf_2_3 void para_log(int, char*, ...);
 		p = para_realloc(p, size); \
 	} \
 }
-
-
-