From: Andre Noll <maan@systemlinux.org>
Date: Thu, 18 Aug 2011 13:19:41 +0000 (+0200)
Subject: Merge branch 't/alsa_poll_fd'
X-Git-Tag: v0.4.8~5
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=9fe520149ef6bbc6bed4ee538bd2310af9d6a2cd;hp=8c8d095eaf5207d4446c561bf26f0eecd2d5f505

Merge branch 't/alsa_poll_fd'
---

diff --git a/NEWS b/NEWS
index 40c30bf9..05c866b4 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ are the highlights of this release.
 	  tarballs. This reduces the size of the tarballs but requires
 	  gengetopt to build the tarball.
 	- Compiles cleanly also with llvm/clang.
+	- The alsa writer used poll fds instead of computing timeouts.
 	- Corrupt mp3 files are handled more gracefully.
 	- sched: Optimized zero timeouts.
 	- vss timeout cleanups.
diff --git a/crypt.c b/crypt.c
index f064fb3a..5b7029d3 100644
--- a/crypt.c
+++ b/crypt.c
@@ -204,7 +204,7 @@ out:
 		ret = ret2;
 	if (ret < 0) {
 		free(key);
-		result = NULL;
+		*result = NULL;
 		PARA_ERROR_LOG("key %s: %s\n", key_file, para_strerror(-ret));
 	} else
 		*result = key;
diff --git a/mp3_afh.c b/mp3_afh.c
index b83343ed..b0d44ec9 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -420,7 +420,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 		if (ret < 0)
 			continue;
 		fl = ret;
-		tmp.tv_sec = fl;
+		tmp.tv_sec = fl - header.padding;
 		tmp.tv_usec = 0;
 		tv_divide(br * 125, &tmp, &cct);
 		tv_add(&cct, &total_time, &tmp);