X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=10931aaf08461cef768d95720a833e0f86f8139e;hp=f3e67ed9c1213b13c3a486767564799421e089e4;hb=ce2bb6c458275ec6c0a115a2c814a15761474f11;hpb=d1bfba58e0a93444c7381e9029eda5e786b2fa02 diff --git a/para.h b/para.h index f3e67ed9..10931aaf 100644 --- a/para.h +++ b/para.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2006 Andre Noll + * Copyright (C) 1997-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,25 +23,19 @@ #include #include #include -#include -#include #include #include -#include #include /* time(), localtime() */ #include #include #include #include -#include -#include -#include +#include #include #include -#include -#include -#include +#include #include /* needed by create_pf_socket */ +#include #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 @@ -106,10 +100,37 @@ #define PARA_EMERG_LOG(...) #endif -#define COPYRIGHT "Copyright (c) 1997-2006 by Andre Noll" - -#define LICENSE "This is free software with ABSOLUTELY NO WARRANTY. " \ - "See COPYING for details." +/** + * define a standard log function that always writes to stderr + * + * \param loglevel_barier If the loglevel of the current message + * is less than that, the message is going to be ignored. + * + */ +#define INIT_STDERR_LOGGING(loglevel_barrier) \ + __printf_2_3 void para_log(int ll, const char* fmt,...) \ + { \ + va_list argp; \ + if (ll < loglevel_barrier) \ + return; \ + va_start(argp, fmt); \ + vfprintf(stderr, fmt, argp); \ + va_end(argp); \ + } + + +#define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION "\n" \ + "Copyright (C) 2007 Andre Noll\n" \ + "This is free software with ABSOLUTELY NO WARRANTY." \ + " See COPYING for details.\n" \ + "Written by Andre Noll.\n" \ + "Report bugs to .\n" + +#define HANDLE_VERSION_FLAG(_prefix, _args_info_struct) \ + if (_args_info_struct.version_given) { \ + printf("%s", VERSION_TEXT(_prefix)); \ + exit(EXIT_SUCCESS); \ + } #define AWAITING_DATA_MSG "\nAwaiting Data." #define PROCEED_MSG "\nProceed.\n" @@ -122,16 +143,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 *); - -/* signal */ -int para_signal_init(void); -int para_install_sighandler(int); -void para_reap_children(void); -pid_t para_reap_child(void); -int para_next_signal(void); +int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds); /* time */ int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *diff); @@ -139,7 +151,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 +168,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); +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 +195,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 +211,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 +235,3 @@ __printf_2_3 void para_log(int, char*, ...); p = para_realloc(p, size); \ } \ } - - -