Update digital_lab

src/demod/DemodulatorInstance.cpp

@@ -257,7 +257,9 @@ void DemodulatorInstance::setOutputDevice(int device_id) {
 
 int DemodulatorInstance::getOutputDevice() {
     if (currentOutputDevice == -1) {
-        currentOutputDevice = audioThread->getOutputDevice();
+        if (audioThread) {
+            currentOutputDevice = audioThread->getOutputDevice();
+        }
     }
 
     return currentOutputDevice;
@@ -326,7 +328,7 @@ void DemodulatorInstance::setBandwidth(int bw) {
             bw = AudioThread::deviceSampleRate[getOutputDevice()];
         }
     }
-    if (!active) {
+    if (!active && demodulatorPreThread != NULL) {
         currentBandwidth = bw;
         checkBandwidth();
         demodulatorPreThread->getParams().bandwidth = currentBandwidth;

src/demod/DemodulatorPreThread.cpp

@@ -155,18 +155,20 @@ void DemodulatorPreThread::run() {
         }
 
         if (!initialized) {
+            inp->decRefCount();
             continue;
         }
 
         // Requested frequency is not center, shift it into the center!
         if ((params.frequency - inp->frequency) != shiftFrequency || rateChanged) {
             shiftFrequency = params.frequency - inp->frequency;
-            if (abs(shiftFrequency) <= (int) ((double) (wxGetApp().getSampleRate() / 2) * 1.5)) {
-                nco_crcf_set_frequency(freqShifter, (2.0 * M_PI) * (((double) abs(shiftFrequency)) / ((double) wxGetApp().getSampleRate())));
+            if (abs(shiftFrequency) <= (int) ((double) (inp->sampleRate / 2) * 1.5)) {
+                nco_crcf_set_frequency(freqShifter, (2.0 * M_PI) * (((double) abs(shiftFrequency)) / ((double) inp->sampleRate)));
             }
         }
 
-        if (abs(shiftFrequency) > (int) ((double) (wxGetApp().getSampleRate() / 2) * 1.5)) {
+        if (abs(shiftFrequency) > (int) ((double) (inp->sampleRate / 2) * 1.5)) {
+            inp->decRefCount();
             continue;
         }
 

src/demod/DemodulatorThread.cpp

@@ -126,14 +126,13 @@ void DemodulatorThread::run() {
     nco_crcf_pll_set_bandwidth(stereoPilot, 0.25f);
 
      // half band filter used for side-band elimination
-    resamp2_cccf ssbFilt = resamp2_cccf_create(12,-0.25f,60.0f);
+    resamp2_crcf ssbFilt = resamp2_crcf_create(12,-0.25f,60.0f);
 
     // Automatic IQ gain
     iqAutoGain = agc_crcf_create();
     agc_crcf_set_bandwidth(iqAutoGain, 0.1);
 
-    AudioThreadInput *ati_vis = new AudioThreadInput;
-    ati_vis->data.reserve(DEMOD_VIS_SIZE);
+    ReBuffer<AudioThreadInput> audioVisBuffers;
 
     std::cout << "Demodulator thread started.." << std::endl;
 
@@ -271,14 +270,14 @@ void DemodulatorThread::run() {
             case DEMOD_TYPE_LSB:
 				currentDemodLock = false;
                 for (int i = 0; i < bufSize; i++) { // Reject upper band
-                     resamp2_cccf_filter_execute(ssbFilt,(*inputData)[i],&x,&y);
+                     resamp2_crcf_filter_execute(ssbFilt,(*inputData)[i],&x,&y);
                      ampmodem_demodulate(demodAM, x, &demodOutputData[i]);
                 }
                 break;
             case DEMOD_TYPE_USB:
 				currentDemodLock = false;
                 for (int i = 0; i < bufSize; i++) { // Reject lower band
-                    resamp2_cccf_filter_execute(ssbFilt,(*inputData)[i],&x,&y);
+                    resamp2_crcf_filter_execute(ssbFilt,(*inputData)[i],&x,&y);
                     ampmodem_demodulate(demodAM, y, &demodOutputData[i]);
                 }
                 break;
@@ -734,8 +733,8 @@ void DemodulatorThread::run() {
         }
 
         if (ati && audioVisOutputQueue != NULL && audioVisOutputQueue->empty()) {
-
-            ati_vis->busy_update.lock();
+			AudioThreadInput *ati_vis = audioVisBuffers.getBuffer();
+			ati_vis->setRefCount(1);
             ati_vis->sampleRate = inp->sampleRate;
             ati_vis->inputRate = inp->sampleRate;
             
@@ -780,7 +779,6 @@ void DemodulatorThread::run() {
 //            std::cout << "Signal: " << agc_crcf_get_signal_level(agc) << " -- " << agc_crcf_get_rssi(agc) << "dB " << std::endl;
             }
 
-            ati_vis->busy_update.unlock();
             audioVisOutputQueue->push(ati_vis);
         }
 
@@ -899,7 +897,7 @@ void DemodulatorThread::run() {
     firhilbf_destroy(firStereoR2C);
     firhilbf_destroy(firStereoC2R);
     nco_crcf_destroy(stereoPilot);
-    resamp2_cccf_destroy(ssbFilt);
+    resamp2_crcf_destroy(ssbFilt);
 
     outputBuffers.purge();
 
@@ -907,7 +905,7 @@ void DemodulatorThread::run() {
         AudioThreadInput *dummy_vis;
         audioVisOutputQueue->pop(dummy_vis);
     }
-    delete ati_vis;
+	audioVisBuffers.purge();
 
     DemodulatorThreadCommand tCmd(DemodulatorThreadCommand::DEMOD_THREAD_CMD_DEMOD_TERMINATED);
     tCmd.context = this;