Date: Friday, November 8, 2013 @ 17:06:41 Author: bisson Revision: 199076
upstream update Modified: mpd/trunk/PKGBUILD Deleted: mpd/trunk/77c63511d8809f7785328138e7e3a50303302730.patch ------------------------------------------------+ 77c63511d8809f7785328138e7e3a50303302730.patch | 53 ----------------------- PKGBUILD | 9 +-- 2 files changed, 3 insertions(+), 59 deletions(-) Deleted: 77c63511d8809f7785328138e7e3a50303302730.patch =================================================================== --- 77c63511d8809f7785328138e7e3a50303302730.patch 2013-11-08 14:49:13 UTC (rev 199075) +++ 77c63511d8809f7785328138e7e3a50303302730.patch 2013-11-08 16:06:41 UTC (rev 199076) @@ -1,53 +0,0 @@ -From 77c63511d8809f7785328138e7e3a50303302730 Mon Sep 17 00:00:00 2001 -From: Max Kellermann <[email protected]> -Date: Wed, 06 Nov 2013 22:30:29 +0000 -Subject: PlayerThread: reduce the number of DecoderThread wakeups - -After the number of decoded chunks has fallen below the threshold, the -PlayerThread woke up the DecoderThread over and over. This commit -adds a boolean flag that avoids these duplicate wakeups, and thus -reduces the number of system calls. ---- -diff --git a/src/PlayerThread.cxx b/src/PlayerThread.cxx -index e2e3ee3..cb3d6a9 100644 ---- a/src/PlayerThread.cxx -+++ b/src/PlayerThread.cxx -@@ -69,6 +69,12 @@ class Player { - bool decoder_starting; - - /** -+ * Did we wake up the DecoderThread recently? This avoids -+ * duplicate wakeup calls. -+ */ -+ bool decoder_woken; -+ -+ /** - * is the player paused? - */ - bool paused; -@@ -133,6 +139,7 @@ public: - :pc(_pc), dc(_dc), buffer(_buffer), - buffering(true), - decoder_starting(false), -+ decoder_woken(false), - paused(false), - queued(true), - output_open(false), -@@ -861,8 +868,13 @@ Player::PlayNextChunk() - pc.Lock(); - if (!dc.IsIdle() && - dc.pipe->GetSize() <= (pc.buffered_before_play + -- buffer.GetSize() * 3) / 4) -- dc.Signal(); -+ buffer.GetSize() * 3) / 4) { -+ if (!decoder_woken) { -+ decoder_woken = true; -+ dc.Signal(); -+ } -+ } else -+ decoder_woken = false; - pc.Unlock(); - - return true; --- -cgit v0.9.1-27-gd5a4 Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-08 14:49:13 UTC (rev 199075) +++ PKGBUILD 2013-11-08 16:06:41 UTC (rev 199076) @@ -6,8 +6,8 @@ # Contributor: Ben <[email protected]> pkgname=mpd -pkgver=0.18.2 -pkgrel=2 +pkgver=0.18.3 +pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' license=('GPL') @@ -16,11 +16,9 @@ 'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl') makedepends=('doxygen') source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig} - '77c63511d8809f7785328138e7e3a50303302730.patch' 'tmpfiles.d' 'conf') -sha1sums=('116f4cf0147320abd5253435c4be134a1d5eace8' 'SKIP' - '361122fa0267fbfc1a37cc953f9aadfa55fa0193' +sha1sums=('e95d1a818ddeff6bb83c969bcc8d3b6ae26ff058' 'SKIP' 'f4d5922abb69abb739542d8e93f4dfd748acdad7' '67c145c046cddd885630d72ce8ebe71f8321ff3b') @@ -29,7 +27,6 @@ prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -R -p1 -i ../77c63511d8809f7785328138e7e3a50303302730.patch # http://bugs.musicpd.org/view.php?id=3860 sed 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:g' -i src/input/CdioParanoiaInputPlugin.cxx }
