Bugfix in RtAudio. Almost working properly

lasp/device/lasp_cppdaq.h

@@ -30,7 +30,7 @@ typedef vector<us> usvec;
 typedef std::lock_guard<std::mutex> mutexlock;
 
 class DataType {
-public:
+  public:
     string name;
     unsigned sw;
     bool is_floating;
@@ -55,7 +55,7 @@ const std::vector<DataType> dataTypes = {
 };
 
 class DaqApi {
-public:
+  public:
     string apiname = "Invalid API";
     int apicode = -1;
     unsigned api_specific_subcode = 0;

lasp/device/lasp_cpprtaudio.cpp

@@ -160,7 +160,7 @@ class AudioDaq: public Daq {
       }
 
       try {
-        rtaudio = new RtAudio((RtAudio::Api) devinfo.api_specific_devindex);
+        rtaudio = new RtAudio((RtAudio::Api) devinfo.api.api_specific_subcode);
         if(!rtaudio) {
           throw runtime_error("RtAudio allocation failed");
         }
@@ -177,6 +177,8 @@ class AudioDaq: public Daq {
             );
       } catch(...) {
         if(rtaudio) delete rtaudio;
+        if(instreamparams) delete instreamparams;
+        if(outstreamparams) delete outstreamparams;
         throw;
       }
       if(monitorOutput) {
@@ -224,16 +226,22 @@ class AudioDaq: public Daq {
       assert(rtaudio);
       rtaudio->stopStream();
     }
-    if(inqueue) delete inqueue;
-    if(outqueue) delete outqueue;
-    if(outDelayqueue) delete outDelayqueue;
-
+    if(inqueue) {
+      inqueue = nullptr;
+    }
+    if(outqueue) {
+      outqueue = nullptr;
+    }
+    if(outDelayqueue) {
+      delete outDelayqueue;
+      outDelayqueue = nullptr;
+    }
   }
   bool isRunning() const {return (rtaudio && rtaudio->isStreamRunning());}
 
   ~AudioDaq() {
     assert(rtaudio);
-    if(rtaudio->isStreamRunning()) {
+    if(isRunning()) {
       stop();
     }
     if(rtaudio->isStreamOpen()) {

lasp/device/lasp_cppuldaq.cpp

@@ -192,12 +192,14 @@ public:
 
     outqueue = NULL;
     inqueue = NULL;
-    if (inbuffer)
+    if (inbuffer) {
       delete inbuffer;
-    if (outbuffer)
+      inbuffer = nullptr;
+    }
+    if (outbuffer) {
       delete outbuffer;
-    outbuffer = NULL;
-    inbuffer = NULL;
+      outbuffer = nullptr;
+    }
   }
 
   friend void threadfcn(DT9837A *);

lasp/device/lasp_daq.pyx

@@ -285,22 +285,21 @@ cdef class Daq:
             if sd.inQueue:
                 # If waiting in the input queue, hereby we let it run.
                 sd.inQueue.enqueue(NULL)
-                # printf('Joining thread...\n')
-                # HERE WE SHOULD RELEASE THE GIL, as exiting the thread function
-                # will require the GIL, which is locked by this thread!
+
             sd.thread.join()
-                # printf('Thread joined!\n')
             del sd.thread
             sd.thread = NULL
 
+            if sd.inQueue:
+                while not sd.inQueue.empty():
+                    free(sd.inQueue.dequeue())
+                del sd.inQueue
+
             if sd.outQueue:
                 while not sd.outQueue.empty():
                     free(sd.outQueue.dequeue())
                 del sd.outQueue
-                    if sd.inQueue:
-                        while not sd.inQueue.empty():
-                            free(sd.inQueue.dequeue())
-                            del sd.inQueue
+                sd.outQueue = NULL
         fprintf(stderr, "End cleanup stream queues...\n")
 
         if sd.pyCallback: