[SCM] libgroove/master: dummyplayer: do not unlock the play head mutex when an underrun occurs

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Wed Jan 4 00:37:47 UTC 2017


The following commit has been merged in the master branch:
commit 361936b7e85c1dadcf73a58e1d009b6727116209
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Jan 3 21:18:57 2017 -0300

    dummyplayer: do not unlock the play head mutex when an underrun occurs
    
    The lock needs to be held to be usable in pthread_cond_timedwait after
    exiting the read loop, after which the lock is released.
    
    Closes: #844137

diff --git a/debian/patches/dummyplayer-do-not-unlock-the-play-head-mutex-when-an-und.patch b/debian/patches/dummyplayer-do-not-unlock-the-play-head-mutex-when-an-und.patch
new file mode 100644
index 0000000..64b9977
--- /dev/null
+++ b/debian/patches/dummyplayer-do-not-unlock-the-play-head-mutex-when-an-und.patch
@@ -0,0 +1,23 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Tue, 3 Jan 2017 21:14:40 -0300
+Subject: dummyplayer: do not unlock the play head mutex when an underrun
+ occurs
+
+The lock needs to be held to be usable in pthread_cond_timedwait after
+exiting the read loop, after which the lock is released.
+---
+ grooveplayer/player.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/grooveplayer/player.c b/grooveplayer/player.c
+index 5d2239c..5d81c4f 100644
+--- a/grooveplayer/player.c
++++ b/grooveplayer/player.c
+@@ -198,7 +198,6 @@ static void *dummy_thread(void *arg) {
+                     // track of time, we're going to pretend that we did *not*
+                     // just get a buffer underrun. Instead we'll wait patiently
+                     // for the next buffer to appear and handle it appropriately.
+-                    pthread_mutex_unlock(&p->play_head_mutex);
+                     break;
+                 }
+             }
diff --git a/debian/patches/series b/debian/patches/series
index 18ec44d..975c29f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 gnu-install-dirs.patch
 no-Werror.patch
+dummyplayer-do-not-unlock-the-play-head-mutex-when-an-und.patch

-- 
libgroove packaging



More information about the pkg-multimedia-commits mailing list