From 61e6b3c11612591d0a27c7f67059f207e8500f7d Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sun, 19 Nov 2017 13:32:37 +0100
Subject: [PATCH] set stereo ins and outs for dummy driver

---
 source/backend/engine/CarlaEngineRtAudio.cpp | 85 +++++++++++---------
 1 file changed, 47 insertions(+), 38 deletions(-)

diff --git a/source/backend/engine/CarlaEngineRtAudio.cpp b/source/backend/engine/CarlaEngineRtAudio.cpp
index e312be27b..b166114a8 100644
--- a/source/backend/engine/CarlaEngineRtAudio.cpp
+++ b/source/backend/engine/CarlaEngineRtAudio.cpp
@@ -191,56 +191,64 @@ public:
             return false;
         }
 
-        const uint devCount(fAudio.getDeviceCount());
-        const bool isDummy(fAudio.getCurrentApi() == RtAudio::RtAudio::RTAUDIO_DUMMY);
-
-        if (devCount == 0 && ! isDummy)
-        {
-            setLastError("No audio devices available for this driver");
-            return false;
-        }
-
         RtAudio::StreamParameters iParams, oParams;
         bool deviceSet = false;
 
-        if (pData->options.audioDevice != nullptr && pData->options.audioDevice[0] != '\0')
+        if (fAudio.getCurrentApi() == RtAudio::RtAudio::RTAUDIO_DUMMY)
+        {
+            fDeviceName = "Dummy";
+            iParams.nChannels = 2;
+            oParams.nChannels = 2;
+        }
+        else
         {
-            for (uint i=0; i < devCount; ++i)
+            const uint devCount(fAudio.getDeviceCount());
+
+            if (devCount == 0)
             {
-                RtAudio::DeviceInfo devInfo(fAudio.getDeviceInfo(i));
+                setLastError("No audio devices available for this driver");
+                return false;
+            }
 
-                if (devInfo.probed && devInfo.outputChannels > 0 && devInfo.name == pData->options.audioDevice)
+            if (pData->options.audioDevice != nullptr && pData->options.audioDevice[0] != '\0')
+            {
+                for (uint i=0; i < devCount; ++i)
                 {
-                    deviceSet   = true;
-                    fDeviceName = devInfo.name.c_str();
-                    iParams.deviceId  = i;
-                    oParams.deviceId  = i;
-                    iParams.nChannels = devInfo.inputChannels;
-                    oParams.nChannels = devInfo.outputChannels;
-                    break;
+                    RtAudio::DeviceInfo devInfo(fAudio.getDeviceInfo(i));
+
+                    if (devInfo.probed && devInfo.outputChannels > 0 && devInfo.name == pData->options.audioDevice)
+                    {
+                        deviceSet   = true;
+                        fDeviceName = devInfo.name.c_str();
+                        iParams.deviceId  = i;
+                        oParams.deviceId  = i;
+                        iParams.nChannels = devInfo.inputChannels;
+                        oParams.nChannels = devInfo.outputChannels;
+                        break;
+                    }
                 }
             }
-        }
 
-        if (! deviceSet)
-        {
-            iParams.deviceId  = fAudio.getDefaultInputDevice();
-            oParams.deviceId  = fAudio.getDefaultOutputDevice();
-            iParams.nChannels = fAudio.getDeviceInfo(iParams.deviceId).inputChannels;
-            oParams.nChannels = fAudio.getDeviceInfo(oParams.deviceId).outputChannels;
+            if (! deviceSet)
+            {
+                iParams.deviceId  = fAudio.getDefaultInputDevice();
+                oParams.deviceId  = fAudio.getDefaultOutputDevice();
+                iParams.nChannels = fAudio.getDeviceInfo(iParams.deviceId).inputChannels;
+                oParams.nChannels = fAudio.getDeviceInfo(oParams.deviceId).outputChannels;
 
-            carla_stdout("No device set, using %i inputs and %i outputs", iParams.nChannels, oParams.nChannels);
-        }
+                carla_stdout("No device set, using %i inputs and %i outputs", iParams.nChannels, oParams.nChannels);
+            }
 
-        if (oParams.nChannels == 0 && ! isDummy)
-        {
-            setLastError("Current audio setup has no outputs, cannot continue");
-            return false;
-        }
+            if (oParams.nChannels == 0)
+            {
+                setLastError("Current audio setup has no outputs, cannot continue");
+                return false;
+            }
 
-        iParams.nChannels = carla_fixedValue(0U, 128U, iParams.nChannels);
-        oParams.nChannels = carla_fixedValue(0U, 128U, oParams.nChannels);
-        fAudioInterleaved = fAudio.getCurrentApi() == RtAudio::LINUX_PULSE;
+            iParams.nChannels = carla_fixedValue(0U, 128U, iParams.nChannels);
+            oParams.nChannels = carla_fixedValue(0U, 128U, oParams.nChannels);
+            fAudioInterleaved = fAudio.getCurrentApi() == RtAudio::LINUX_PULSE;
+        }
 
         RtAudio::StreamOptions rtOptions;
         rtOptions.flags = RTAUDIO_MINIMIZE_LATENCY | RTAUDIO_HOG_DEVICE | RTAUDIO_SCHEDULE_REALTIME;
@@ -256,7 +264,8 @@ public:
         uint bufferFrames = pData->options.audioBufferSize;
 
         try {
-            fAudio.openStream(&oParams, (iParams.nChannels > 0) ? &iParams : nullptr, RTAUDIO_FLOAT32, pData->options.audioSampleRate, &bufferFrames, carla_rtaudio_process_callback, this, &rtOptions);
+            fAudio.openStream(&oParams, (iParams.nChannels > 0) ? &iParams : nullptr, RTAUDIO_FLOAT32,
+                              pData->options.audioSampleRate, &bufferFrames, carla_rtaudio_process_callback, this, &rtOptions);
         }
         catch (const RtAudioError& e) {
             setLastError(e.what());