[SCM] forked-daapd/master: Fix playing audio locally

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Mon Feb 23 11:23:20 UTC 2015


The following commit has been merged in the master branch:
commit a7ff2f67b404182bdfae4e2f222fd82d219d22fd
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Feb 23 09:34:39 2015 +0100

    Fix playing audio locally
    
    Closes: #779011

diff --git a/debian/patches/0004-Fix-laudio-buffer-underrun-issue-87.patch b/debian/patches/0004-Fix-laudio-buffer-underrun-issue-87.patch
new file mode 100644
index 0000000..b090044
--- /dev/null
+++ b/debian/patches/0004-Fix-laudio-buffer-underrun-issue-87.patch
@@ -0,0 +1,28 @@
+From f1a59a3482b74d93436425bc788cf06a1ddd9121 Mon Sep 17 00:00:00 2001
+From: ejurgensen <espenjurgensen at gmail.com>
+Date: Sat, 17 Jan 2015 14:31:41 +0100
+Subject: [PATCH] Fix laudio buffer underrun (issue #87)
+
+---
+ src/laudio_alsa.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/laudio_alsa.c b/src/laudio_alsa.c
+index c56d7b2..6234805 100644
+--- a/src/laudio_alsa.c
++++ b/src/laudio_alsa.c
+@@ -281,8 +281,9 @@ laudio_write(uint8_t *buf, uint64_t rtptime)
+ 	}
+ 
+       /* Don't let ALSA fill up the buffer too much */
+-      if (nsamp == AIRTUNES_V2_PACKET_SAMPLES)
+-	return;
++// Disabled - seems to cause buffer underruns
++//      if (nsamp == AIRTUNES_V2_PACKET_SAMPLES)
++//	return;
+     }
+ }
+ 
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 2b4ca3e..8b1f4d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fix-bad-free-when-encountering-an-error-fetching-que.patch
 0002-Fix-invalid-read-on-empty-string-queries.patch
 0003-Fix-problems-with-iTunes-12.1-see-issue-100.patch
+0004-Fix-laudio-buffer-underrun-issue-87.patch

-- 
forked-daapd packaging



More information about the pkg-multimedia-commits mailing list