From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 14 Jul 2019 10:56:19 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/ff'
X-Git-Tag: v0.6.3~44
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=ba83a291cd486e8ab53ac64d81b17d8f5705d715;hp=-c;p=paraslash.git

Merge branch 'refs/heads/t/ff'

A short series which overhauls the ff server command.

Cooking for almost a year (for no good reason).

* refs/heads/t/ff:
  com_ff(): Fix bad grammar in help text.
  com_ff(): Depreciate "n-" syntax.
  com_ff(): Simplify code for jumping backwards.
  com_ff(): Avoid "unsigned i".
---

ba83a291cd486e8ab53ac64d81b17d8f5705d715
diff --combined NEWS.md
index 55ef3be9,55ef3be9..1aca9b0a
--- a/NEWS.md
+++ b/NEWS.md
@@@ -1,6 -1,6 +1,16 @@@
  NEWS
  ====
  
++----------------------------------------------
++0.6.3 (to be announced) "generalized activity"
++----------------------------------------------
++
++- The ff command now accepts a negative argument to instruct the
++  virtual streaming system to jump backwards in the current audio
++  stream. The old syntax (e.g., "ff 30-") is still supported but it
++  is deprecated and no longer documented. The compatibility code is
++  sheduled for removal after 0.7.0.
++
  --------------------------------------
  0.6.2 (2018-06-30) "elastic diversity"
  --------------------------------------
diff --combined command.c
index 67f6bf3c,f8d679e7..481fd0f6
--- a/command.c
+++ b/command.c
@@@ -279,7 -279,7 +279,7 @@@ static int check_sender_args(struct com
  }
  
  /**
 - * Send a sideband packet through a blocking file descriptor.
 + * Receive a sideband packet from a blocking file descriptor.
   *
   * \param scc fd and crypto keys.
   * \param expected_band The expected band designator.
@@@ -663,8 -663,7 +663,7 @@@ EXPORT_SERVER_CMD_HANDLER(nomore)
  static int com_ff(struct command_context *cc, struct lls_parse_result *lpr)
  {
  	long promille;
- 	int ret, backwards = 0;
- 	unsigned i;
+ 	int i, ret;
  	char c, *errctx;
  
  	ret = lls(lls_check_arg_count(lpr, 1, 1, &errctx));
@@@ -672,20 -671,33 +671,33 @@@
  		send_errctx(cc, errctx);
  		return ret;
  	}
- 	if (!(ret = sscanf(lls_input(0, lpr), "%u%c", &i, &c)))
- 		return -E_COMMAND_SYNTAX;
- 	if (ret > 1 && c == '-')
- 		backwards = 1; /* jmp backwards */
+ 	ret = para_atoi32(lls_input(0, lpr), &i);
+ 	if (ret < 0) {
+ 		if (ret != -E_ATOI_JUNK_AT_END)
+ 			return ret;
+ 		/*
+ 		 * Compatibility code to keep the historic syntax (ff 30-)
+ 		 * working. This can be removed after 0.7.0.
+ 		 */
+ 		ret = sscanf(lls_input(0, lpr), "%i%c", &i, &c);
+ 		if (ret <= 0)
+ 			return -E_COMMAND_SYNTAX;
+ 		if (ret > 1 && c == '-') {
+ 			PARA_WARNING_LOG("use of obsolete syntax\n");
+ 			i = -i;
+ 		}
+ 	}
  	mutex_lock(mmd_mutex);
  	ret = -E_NO_AUDIO_FILE;
  	if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
  		goto out;
  	ret = 1;
  	promille = (1000 * mmd->current_chunk) / mmd->afd.afhi.chunks_total;
- 	if (backwards)
- 		promille -= 1000 * i / mmd->afd.afhi.seconds_total;
- 	else
- 		promille += 1000 * i / mmd->afd.afhi.seconds_total;
+ 	/*
+ 	 * We need this cast because without it the expression on the right
+ 	 * hand side is of unsigned type.
+ 	 */
+ 	promille += 1000 * i / (int)mmd->afd.afhi.seconds_total;
  	if (promille < 0)
  		promille = 0;
  	if (promille > 1000) {