X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=b406818bd52a27bfc1794e0c95d8f9c0e9ef12a0;hp=6bd048d8c590cb2bc493a1f65860a30517f6230e;hb=4643fd6eeee81acc0e82e47e7895a3111775bbba;hpb=0879c9de4eaf8c78131c243d8e9fec013df0d14a

diff --git a/para.h b/para.h
index 6bd048d8..b406818b 100644
--- a/para.h
+++ b/para.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file para.h global paraslash definitions */
 
@@ -88,7 +84,6 @@ int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds);
 int tv_diff(const struct timeval *b, const struct timeval *a,
 		struct timeval *diff);
 long unsigned tv2ms(const struct timeval *tv);
-void d2tv(double x, struct timeval *tv);
 void tv_add(const struct timeval *a, const struct timeval *b,
 		struct timeval *sum);
 void tv_scale(const unsigned long mult, const struct timeval *tv,
@@ -104,15 +99,6 @@ void compute_chunk_time(long unsigned chunk_num,
 		struct timeval *result);
 struct timeval *clock_get_realtime(struct timeval *tv);
 
-/** The enum of all status items. */
-enum status_items {STATUS_ITEM_ENUM NUM_STAT_ITEMS};
-extern const char *status_item_list[];
-/** Loop over each status item. */
-#define FOR_EACH_STATUS_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++)
-int for_each_stat_item(char *item_buf, size_t num_bytes,
-	int (*item_handler)(int, char *));
-
-
 /**
  * Return a random non-negative integer in an interval.
  *
@@ -207,7 +193,7 @@ _static_inline_ bool iov_valid(const struct iovec *iov)
  *
  *	2. The wav header (para_write only).
  *
- *	3. The --format option of para_write.
+ *	3. The --sample-format option of para_write.
  */
 #define SAMPLE_FORMATS \
 	SAMPLE_FORMAT(SF_S8, "8 bit signed"), \
@@ -224,66 +210,67 @@ enum sample_format {SAMPLE_FORMATS};
 #define SAMPLE_FORMAT(a, b) b
 /** \endcond sample_format */
 
-/** Debug loglevel, gets really noisy. */
-#define LL_DEBUG 0
-/** Still noisy, but won't fill your disk. */
-#define LL_INFO  1
-/** Normal, but significant event. */
-#define LL_NOTICE 2
-/** Unexpected event that can be handled. */
-#define LL_WARNING 3
-/** Unhandled error condition. */
-#define LL_ERROR 4
-/** System might be unreliable. */
-#define LL_CRIT 5
-/** Last message before exit. */
-#define LL_EMERG 6
-/** Number of all loglevels. */
-#define NUM_LOGLEVELS 7
-
-/** Log messages with lower priority than that will not be compiled in. */
-#define COMPILE_TIME_LOGLEVEL 0
+/** Debug, Info, etc. */
+enum loglevels {LOGLEVELS, NUM_LOGLEVELS};
 
-/** \cond log */
-#if LL_DEBUG >= COMPILE_TIME_LOGLEVEL
 #define PARA_DEBUG_LOG(f,...) para_log(LL_DEBUG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
-#else
-#define PARA_DEBUG_LOG(...) do {;} while (0)
-#endif
-
-#if LL_INFO >= COMPILE_TIME_LOGLEVEL
 #define PARA_INFO_LOG(f,...) para_log(LL_INFO, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
-#else
-#define PARA_INFO_LOG(...) do {;} while (0)
-#endif
-
-#if LL_NOTICE >= COMPILE_TIME_LOGLEVEL
 #define PARA_NOTICE_LOG(f,...) para_log(LL_NOTICE, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
-#else
-#define PARA_NOTICE_LOG(...) do {;} while (0)
-#endif
-
-#if LL_WARNING >= COMPILE_TIME_LOGLEVEL
 #define PARA_WARNING_LOG(f,...) para_log(LL_WARNING, "%s: " f, __FUNCTION__, ##  __VA_ARGS__)
-#else
-#define PARA_WARNING_LOG(...) do {;} while (0)
-#endif
-
-#if LL_ERROR >= COMPILE_TIME_LOGLEVEL
 #define PARA_ERROR_LOG(f,...) para_log(LL_ERROR, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
-#else
-#define PARA_ERROR_LOG(...) do {;} while (0)
-#endif
-
-#if LL_CRIT >= COMPILE_TIME_LOGLEVEL
 #define PARA_CRIT_LOG(f,...) para_log(LL_CRIT, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
-#else
-#define PARA_CRIT_LOG(...) do {;} while (0)
-#endif
-
-#if LL_EMERG >= COMPILE_TIME_LOGLEVEL
 #define PARA_EMERG_LOG(f,...) para_log(LL_EMERG, "%s: " f, __FUNCTION__, ## __VA_ARGS__)
-#else
-#define PARA_EMERG_LOG(...)
-#endif
-/** \endcond log */
+
+#define STATUS_ITEMS \
+	STATUS_ITEM(basename) \
+	STATUS_ITEM(status) \
+	STATUS_ITEM(num_played) \
+	STATUS_ITEM(mtime) \
+	STATUS_ITEM(bitrate) \
+	STATUS_ITEM(frequency) \
+	STATUS_ITEM(file_size) \
+	STATUS_ITEM(status_flags) \
+	STATUS_ITEM(format) \
+	STATUS_ITEM(score) \
+	STATUS_ITEM(techinfo) \
+	STATUS_ITEM(afs_mode) \
+	STATUS_ITEM(attributes_txt) \
+	STATUS_ITEM(decoder_flags) \
+	STATUS_ITEM(audiod_status) \
+	STATUS_ITEM(play_time) \
+	STATUS_ITEM(attributes_bitmap) \
+	STATUS_ITEM(offset) \
+	STATUS_ITEM(seconds_total) \
+	STATUS_ITEM(stream_start) \
+	STATUS_ITEM(current_time) \
+	STATUS_ITEM(audiod_uptime) \
+	STATUS_ITEM(image_id) \
+	STATUS_ITEM(lyrics_id) \
+	STATUS_ITEM(duration) \
+	STATUS_ITEM(directory) \
+	STATUS_ITEM(lyrics_name) \
+	STATUS_ITEM(image_name) \
+	STATUS_ITEM(path) \
+	STATUS_ITEM(hash) \
+	STATUS_ITEM(channels) \
+	STATUS_ITEM(last_played) \
+	STATUS_ITEM(num_chunks) \
+	STATUS_ITEM(chunk_time) \
+	STATUS_ITEM(amplification) \
+	STATUS_ITEM(artist) \
+	STATUS_ITEM(title) \
+	STATUS_ITEM(year) \
+	STATUS_ITEM(album) \
+	STATUS_ITEM(comment) \
+	STATUS_ITEM(max_chunk_size) \
+
+#define STATUS_ITEM(_name) SI_ ##_name,
+enum status_items {STATUS_ITEMS NUM_STAT_ITEMS};
+#undef STATUS_ITEM
+#define STATUS_ITEM(_name) #_name,
+
+extern const char *status_item_list[];
+/** Loop over each status item. */
+#define FOR_EACH_STATUS_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++)
+int for_each_stat_item(char *item_buf, size_t num_bytes,
+	int (*item_handler)(int, char *));