X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=9ee318e54e4cb1dae4798f41d60c9187dde517b2;hp=69383dbe65492734fbedd49d9525cddee4bc1119;hb=1dc5f16f83fd4758d2cb3661016b3f6d3ab4b6d8;hpb=f513183bb624dc785de48b556cca7a876b0e7754 diff --git a/para.h b/para.h index 69383dbe..9ee318e5 100644 --- a/para.h +++ b/para.h @@ -158,29 +158,15 @@ 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_DIRECTORY, SI_DECODER_FLAGS, SI_AUDIOD_STATUS, - SI_PLAY_TIME, SI_UPTIME, SI_OFFSET, - SI_SECONDS_TOTAL, SI_STREAM_START, SI_CURRENT_TIME, - SI_AUDIOD_UPTIME, SI_IMAGE_ID, SI_LYRICS_ID, - SI_DURATION, - NUM_STAT_ITEMS -}; - -extern const char *status_item_list[NUM_STAT_ITEMS]; - +/** 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 stat_item_valid(const char *item); int stat_line_valid(const char *); void stat_client_write(const char *msg, int itemnum); int stat_client_add(int fd, long unsigned mask); -/** Loop over each status item. */ -#define FOR_EACH_STAT_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++) __printf_2_3 void para_log(int, const char*, ...);