handle status items via autoconf.

[paraslash.git] / para.h

diff --git a/para.h b/para.h
index 17c6a821d0b99918b25735ae5ce34b20047efe3f..2c95f817b5bb8a43538ab93743fa92148c886ba6 100644 (file)
--- a/para.h
+++ b/para.h
@@ -158,18 +158,8 @@ int tv_convex_combination(const long a, const struct timeval *tv1,
                struct timeval *result);
 void ms2tv(const long unsigned n, struct timeval *tv);
 
-/* stat */
-enum {
-       SI_BASENAME,            SI_STATUS,              SI_NUM_PLAYED,
-       SI_MTIME,               SI_LENGTH_MIN,          SI_LENGTH_SEC,
-       SI_FILE_SIZE,           SI_STATUS_FLAGS,        SI_FORMAT,
-       SI_SCORE,               SI_AUDIO_INFO1,         SI_AUDIO_INFO2,
-       SI_AUDIO_INFO3,         SI_AFS_MODE,            SI_ATTRIBUTES,
-       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_SELECTOR,            NUM_STAT_ITEMS
-};
+enum status_items {STATUS_ITEM_ENUM NUM_STAT_ITEMS};
+extern const char *status_item_list[];
 
 int stat_item_valid(const char *item);
 int stat_line_valid(const char *);
@@ -217,9 +207,9 @@ __printf_2_3 void para_log(int, const char*, ...);
  *
  * \return An integer between zero and \p max - 1, inclusively.
  */
-static inline int para_random(unsigned max)
+static inline long int para_random(unsigned max)
 {
-       return ((max + 0.0) * (rand() / (RAND_MAX + 1.0)));
+       return ((max + 0.0) * (random() / (RAND_MAX + 1.0)));
 }
 
 /** Round up x to a multiple of y */