Handle device selection a little less aggressively to work around a p…

…ossible but on rpi
CasperTech · Aug 11, 2021 · 34c8ce3 · 34c8ce3
1 parent 1aa8935
commit 34c8ce3
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/lib/rtaudio b/lib/rtaudio
diff --git a/src/implementation/RtAudioStream.cpp b/src/implementation/RtAudioStream.cpp
@@ -3,6 +3,9 @@
 
 namespace CasperTech
 {
+    std::map<uint32_t, std::string> RtAudioStream::devices;
+    RtAudio::DeviceInfo RtAudioStream::defaultDevice;
+    int RtAudioStream::defaultDeviceId = -1;
 
     RtAudioStream::RtAudioStream()
         : _ringBuffer(std::make_unique<RingBuffer>(16384))
@@ -18,14 +21,25 @@ namespace CasperTech
 
     std::map<uint32_t, std::string> RtAudioStream::getDevices()
     {
-        std::map<uint32_t, std::string> devices;
+        if (!devices.empty())
+        {
+            return devices;
+        }
+        devices = {};
         uint32_t deviceCount = _rtAudio->getDeviceCount();
         RtAudio::DeviceInfo info;
         for(uint32_t i = 0; i < deviceCount; i++)
         {
             try
             {
                 info = _rtAudio->getDeviceInfo(i);
+                if (info.isDefaultOutput && info.outputChannels > 0)
+                {
+                    defaultDevice = info;
+                    defaultDeviceId = i;
+                    _selectedDevice = info;
+                    _selectedDeviceId = i;
+                }
                 devices[i] = info.name;
             }
             catch(RtAudioError&)
@@ -38,6 +52,12 @@ namespace CasperTech
 
     void RtAudioStream::selectDevice(uint32_t device)
     {
+        if (defaultDeviceId > -1 && device == defaultDeviceId)
+        {
+            _selectedDevice = defaultDevice;
+            _selectedDeviceId = defaultDeviceId;
+            return;
+        }
         try
         {
             _selectedDevice = _rtAudio->getDeviceInfo(device);
@@ -51,8 +71,15 @@ namespace CasperTech
 
     void RtAudioStream::selectDefaultDevice()
     {
+        if (defaultDeviceId > -1)
+        {
+            _selectedDevice = defaultDevice;
+            _selectedDeviceId = defaultDeviceId;
+            return;
+        }
         uint32_t deviceCount = _rtAudio->getDeviceCount();
         RtAudio::DeviceInfo info;
+        std::cout << "DeviceCount: " << deviceCount << std::endl;
         for(uint32_t i = 0; i < deviceCount; i++)
         {
             try
@@ -71,9 +98,9 @@ namespace CasperTech
                     return;
                 }
             }
-            catch(RtAudioError&)
+            catch(RtAudioError& e)
             {
-
+                std::cout << e.what() << std::endl << std::flush;
             }
         }
 #ifdef _DEBUG

diff --git a/src/implementation/RtAudioStream.h b/src/implementation/RtAudioStream.h
@@ -33,6 +33,9 @@ namespace CasperTech
                                         double streamTime, RtAudioStreamStatus status, void *data);
             int fillBuffer(void *outputBuffer, void *inputBuffer, unsigned int nBufferFrames,
                            double streamTime, RtAudioStreamStatus status);
+            static std::map<uint32_t, std::string> devices;
+            static RtAudio::DeviceInfo defaultDevice;
+            static int defaultDeviceId;
 
             int _selectedDeviceId = 0;
             std::unique_ptr<RtAudio> _rtAudio;
+91 −0		.github/workflows/ci.yml
+0 −78		.travis.yml
+1 −1		README.md
+21 −37		RtAudio.cpp
+13 −15		RtAudio.h
+2 −2		doc/doxygen/Doxyfile.in
+1 −1		doc/release.txt
+17 −17		include/asio.h
+0 −2		include/asiolist.cpp
+1 −1		include/dsound.h
+1 −1		include/iasiothiscallresolver.cpp
+6 −6		include/soundcard.h
+93 −0		meson.build
+8 −0		meson_options.txt
+5 −5		rtaudio_c.h