From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 27 Aug 2017 10:11:22 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/si_conversion'
X-Git-Tag: v0.6.1~11
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=fe3d9cd155b5eac8706015854c343440823e12da;p=paraslash.git

Merge branch 'refs/heads/t/si_conversion'

A single patch which moves the list of status items from configure.ac
to para.h.

Cooking for five weeks.

* refs/heads/t/si_conversion:
  Define status items in para.h.
---

fe3d9cd155b5eac8706015854c343440823e12da
diff --cc command.c
index 077c159d,52f4153b..69564336
--- a/command.c
+++ b/command.c
@@@ -107,18 -107,18 +107,18 @@@ static unsigned get_status(struct misc_
  	clock_get_realtime(&current_time);
  	/*
  	 * The calls to WRITE_STATUS_ITEM() below never fail because
 -	 * b->max_size is zero (unlimited), see para_printf(). However, clang
 -	 * is not smart enough to prove this and complains nevertheless.
 +	 * b->max_size is zero (unlimited), see \ref para_printf(). However,
 +	 * clang is not smart enough to prove this and complains nevertheless.
  	 * Casting the return value to void silences clang.
  	 */
- 	(void)WRITE_STATUS_ITEM(&b, SI_STATUS, "%s\n", status);
- 	(void)WRITE_STATUS_ITEM(&b, SI_STATUS_FLAGS, "%s\n", flags);
- 	(void)WRITE_STATUS_ITEM(&b, SI_OFFSET, "%li\n", offset);
- 	(void)WRITE_STATUS_ITEM(&b, SI_AFS_MODE, "%s\n", mmd->afs_mode_string);
- 	(void)WRITE_STATUS_ITEM(&b, SI_STREAM_START, "%lu.%lu\n",
+ 	(void)WRITE_STATUS_ITEM(&b, SI_status, "%s\n", status);
+ 	(void)WRITE_STATUS_ITEM(&b, SI_status_flags, "%s\n", flags);
+ 	(void)WRITE_STATUS_ITEM(&b, SI_offset, "%li\n", offset);
+ 	(void)WRITE_STATUS_ITEM(&b, SI_afs_mode, "%s\n", mmd->afs_mode_string);
+ 	(void)WRITE_STATUS_ITEM(&b, SI_stream_start, "%lu.%lu\n",
  		(long unsigned)nmmd->stream_start.tv_sec,
  		(long unsigned)nmmd->stream_start.tv_usec);
- 	(void)WRITE_STATUS_ITEM(&b, SI_CURRENT_TIME, "%lu.%lu\n",
+ 	(void)WRITE_STATUS_ITEM(&b, SI_current_time, "%lu.%lu\n",
  		(long unsigned)current_time.tv_sec,
  		(long unsigned)current_time.tv_usec);
  	free(flags);
@@@ -426,40 -426,41 +426,40 @@@ EXPORT_SERVER_CMD_HANDLER(version)
  
  /** These status items are cleared if no audio file is currently open. */
  #define EMPTY_STATUS_ITEMS \
- 	ITEM(PATH) \
- 	ITEM(DIRECTORY) \
- 	ITEM(BASENAME) \
- 	ITEM(SCORE) \
- 	ITEM(ATTRIBUTES_BITMAP) \
- 	ITEM(ATTRIBUTES_TXT) \
- 	ITEM(HASH) \
- 	ITEM(IMAGE_ID) \
- 	ITEM(IMAGE_NAME) \
- 	ITEM(LYRICS_ID) \
- 	ITEM(LYRICS_NAME) \
- 	ITEM(BITRATE) \
- 	ITEM(FORMAT) \
- 	ITEM(FREQUENCY) \
- 	ITEM(CHANNELS) \
- 	ITEM(DURATION) \
- 	ITEM(SECONDS_TOTAL) \
- 	ITEM(NUM_PLAYED) \
- 	ITEM(LAST_PLAYED) \
- 	ITEM(TECHINFO) \
- 	ITEM(ARTIST) \
- 	ITEM(TITLE) \
- 	ITEM(YEAR) \
- 	ITEM(ALBUM) \
- 	ITEM(COMMENT) \
- 	ITEM(MTIME) \
- 	ITEM(FILE_SIZE) \
- 	ITEM(CHUNK_TIME) \
- 	ITEM(NUM_CHUNKS) \
- 	ITEM(AMPLIFICATION) \
+ 	ITEM(path) \
+ 	ITEM(directory) \
+ 	ITEM(basename) \
+ 	ITEM(score) \
+ 	ITEM(attributes_bitmap) \
+ 	ITEM(attributes_txt) \
+ 	ITEM(hash) \
+ 	ITEM(image_id) \
+ 	ITEM(image_name) \
+ 	ITEM(lyrics_id) \
+ 	ITEM(lyrics_name) \
+ 	ITEM(bitrate) \
+ 	ITEM(format) \
+ 	ITEM(frequency) \
+ 	ITEM(channels) \
+ 	ITEM(duration) \
+ 	ITEM(seconds_total) \
+ 	ITEM(num_played) \
+ 	ITEM(last_played) \
+ 	ITEM(techinfo) \
+ 	ITEM(artist) \
+ 	ITEM(title) \
+ 	ITEM(year) \
+ 	ITEM(album) \
+ 	ITEM(comment) \
+ 	ITEM(mtime) \
+ 	ITEM(file_size) \
+ 	ITEM(chunk_time) \
+ 	ITEM(num_chunks) \
+ 	ITEM(amplification) \
  
 -/**
 - * Write a list of audio-file related status items with empty values.
 - *
 - * This is used by vss when currently no audio file is open.
 +/*
 + * Create a set of audio-file related status items with empty values. These are
 + * written to stat clients when no audio file is open.
   */
  static unsigned empty_status_items(bool parser_friendly, char **result)
  {