X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=2d8d9cce390d5cb66fa7b3bea040210ff9426bb5;hp=a23c44063b95e3c981a7fa77cbef55b382855eab;hb=518a2727540cf5e105d28aa8fd31bb6afad05bf6;hpb=a551870e3ac31ff77e1757f226d3e307e4ef83fc

diff --git a/para.h b/para.h
index a23c4406..2d8d9cce 100644
--- a/para.h
+++ b/para.h
@@ -160,15 +160,16 @@ void ms2tv(const long unsigned n, struct timeval *tv);
 
 /* stat */
 enum {
-	SI_STATUS_BAR,		SI_STATUS,		SI_NUM_PLAYED,
+	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_DBINFO2,
-	SI_DBINFO3,		SI_DECODER_FLAGS,	SI_AUDIOD_STATUS,
+	SI_AUDIO_INFO3,		SI_AFS_MODE,		SI_ATTRIBUTES,
+	SI_DIRECTORY,		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
+	SI_AUDIOD_UPTIME,	SI_IMAGE_ID,		SI_LYRICS_ID,
+	NUM_STAT_ITEMS
 };
 
 int stat_item_valid(const char *item);
@@ -217,9 +218,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 */