From: Andre Noll <maan@systemlinux.org>
Date: Sat, 3 May 2014 17:56:01 +0000 (+0200)
Subject: Merge branch 't/alsa_improvements'
X-Git-Tag: v0.5.3~22
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=bfdd36f2879b8dee1f6d3330bc49fbb5644d3caf

Merge branch 't/alsa_improvements'

Was cooking for almost two months.

* t/alsa_improvements:
  alsa: Remove pointless initialization.
  alsa_mix: Allow non-positive mixer values.
  alsa: New writer option: --buffer-time.
  alsa: Work around poll fd problems.
  alsa: Set period time.
  alsa: Also dump hardware params.
  alsa: Improve help text of --device.
  alsa: Improve documentation of struct private_alsa_write_data.
  alsa: Don't set t->error in ->pre_select().
---

bfdd36f2879b8dee1f6d3330bc49fbb5644d3caf
diff --cc NEWS
index 508288ec,cc9b67ad..7cf5dca2
--- a/NEWS
+++ b/NEWS
@@@ -1,35 -1,14 +1,41 @@@
  NEWS
  ====
  
 ----------------------------------------------
 -0.5.2 (to be announced) "orthogonal interior"
 ----------------------------------------------
++-------------------------------------------------
++0.5.3 (to be released) "symbolic synchronization"
++-------------------------------------------------
+ 
 -	- The new sync synchronizes playback between multiple clients.
++	- Various alsa-related fixes, mostly for the raspberry pi.
++
 +----------------------------------------
 +0.5.2 (2014-04-11) "orthogonal interior"
 +----------------------------------------
 +
 +The new sync filter, the AES_CTR128 stream cipher and the overhauled
 +network code are the highlights of this release. It also includes a
 +fair number of smaller fixes and improvements not mentioned here.
 +
 +	- The new sync filter synchronizes playback between multiple
 +	  clients.
 +	- Connections between para_server and para_client are now
 +	  encrypted by means of AES rather than RC4 if both sides
 +	  support it. RC4 is still available as a fallback. This
 +	  feature is fully transparent, i.e. no command line options
 +	  are necessary, and a client linked against openssl can
 +	  speak with a server linked against libgcrypt and vice versa.
  	- Major cleanup of the networking subsystem.
 +	- Improvements to para_fade: the new set mode, multi-channel
 +	  initial volumes, better error logging.
 +	- The man pages of para_audiod, para_filter, para_recv, and
 +	  para_write contain the relevant options for receivers, filters,
 +	  writers. This broke in 0.5.0.
 +	- ogg/vorbis latency improvements.
 +	- Improved user manual.
  	- Minor fixes to avoid clang warnings.
  
 +Downloads: ./releases/paraslash-0.5.2.tar.bz2 (tarball),
 +./releases/paraslash-0.5.2.tar.bz2.asc (signature)
 +
  ------------------------------------------
  0.5.1 (2013-12-20) "temporary implication"
  ------------------------------------------
diff --cc alsa_mix.c
index be38e887,0c2a1cf8..c860efc8
--- a/alsa_mix.c
+++ b/alsa_mix.c
@@@ -148,12 -148,12 +148,12 @@@ static int alsa_mix_set_channel(struct 
  	if (ret < 0) {
  		PARA_NOTICE_LOG("unable to get %s range (%s): %s\n",
  			mixer_channel, h->card, snd_strerror(ret));
 -		return -E_ALSA_MIX_BAD_ELEM;
 +		return -E_ALSA_MIX_RANGE;
  	}
- 	if (h->pmin < 0 || h->pmax < 0 || h->pmin >= h->pmax) {
+ 	if (h->pmin >= h->pmax) {
  		PARA_NOTICE_LOG("alsa reported %s range %ld-%ld (%s)\n",
  			mixer_channel, h->pmin, h->pmax, h->card);
 -		return -E_ALSA_MIX_BAD_ELEM;
 +		return -E_ALSA_MIX_RANGE;
  	}
  	return 1;
  }