From 8530acf0799e63384f0f460e73d8660fae9898d8 Mon Sep 17 00:00:00 2001
From: Nils Fenner <nilsfenner@web.de>
Date: Sun, 18 Oct 2015 21:19:33 +0200
Subject: [PATCH] fix asserts when (un-)subscribing input

---
 src/audio/audio.cpp | 26 +++++++++++++-------------
 src/audio/audio.h   |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp
index 59aa2a105..d14dfce40 100644
--- a/src/audio/audio.cpp
+++ b/src/audio/audio.cpp
@@ -55,7 +55,7 @@ Audio::Audio()
     : audioThread(new QThread())
     , audioInLock(QMutex::Recursive)
     , audioOutLock(QMutex::Recursive)
-    , userCount(0)
+    , inputSubscriptions(0)
     , alOutDev(nullptr)
     , alInDev(nullptr)
     , outputVolume(1.0)
@@ -156,11 +156,8 @@ void Audio::suscribeInput()
 */
 void Audio::SubscribeInput()
 {
-    assert(userCount >= 0);
-
-    qDebug() << "subscribing input";
-
-    if (!userCount++)
+    qDebug() << "subscribing input" << inputSubscriptions;
+    if (!inputSubscriptions++)
     {
         OpenInput(Settings::getInstance().getInDev());
 
@@ -190,10 +187,13 @@ Call once you don't need to capture on the open input device anymore.
 */
 void Audio::UnSubscribeInput()
 {
-    assert(userCount > 0);
+    qDebug() << "unsubscribing input" << inputSubscriptions;
+    if (inputSubscriptions > 0)
+        inputSubscriptions--;
+    else if(inputSubscriptions < 0)
+        inputSubscriptions = 0;
 
-    qDebug() << "unsubscribing input" << userCount;
-    if (!--userCount)
+    if (!inputSubscriptions)
     {
         closeOutput();
 #if (!FIX_SND_PCM_PREPARE_BUG)
@@ -324,7 +324,7 @@ void Audio::CloseInput()
         if (alcCaptureCloseDevice(alInDev) == ALC_TRUE)
         {
             alInDev = nullptr;
-            userCount = 0;
+            inputSubscriptions = 0;
         }
         else
         {
@@ -346,7 +346,7 @@ void Audio::CloseOutput()
     qDebug() << "Closing output";
     QMutexLocker locker(&audioOutLock);
 
-    if (userCount > 0)
+    if (inputSubscriptions > 0)
         return;
 
     if (alContext && alcMakeContextCurrent(nullptr) == ALC_TRUE)
@@ -512,7 +512,7 @@ Returns true if the input device is open and suscribed to
 bool Audio::IsInputReady()
 {
     QMutexLocker locker(&audioInLock);
-    return (alInDev && userCount);
+    return alInDev && inputSubscriptions;
 }
 
 bool Audio::isOutputClosed()
@@ -578,7 +578,7 @@ void Audio::PauseOutput()
     QMutexLocker lock(&audioOutLock);
 
     qDebug() << "Pause";
-    if (userCount == 0)
+    if (!inputSubscriptions)
         closeOutput();
 }
 
diff --git a/src/audio/audio.h b/src/audio/audio.h
index 7f4127775..8c7e5c267 100644
--- a/src/audio/audio.h
+++ b/src/audio/audio.h
@@ -116,7 +116,7 @@ private:
     QThread*            audioThread;
     QMutex              audioInLock;
     QMutex              audioOutLock;
-    std::atomic<int>    userCount;
+    std::atomic<int>    inputSubscriptions;
     ALCdevice*          alOutDev;
     ALCdevice*          alInDev;
     qreal               outputVolume;