BladeRF2Output: removed applySettings from stop method

f4exb · Aug 27, 2024 · 1b37a4f · 1b37a4f
1 parent 7b4e751
commit 1b37a4f
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/plugins/samplesink/bladerf2output/bladerf2output.cpp b/plugins/samplesink/bladerf2output/bladerf2output.cpp
@@ -399,14 +399,14 @@ void BladeRF2Output::stop()
         qDebug("BladeRF2Output::stop: SO mode. Just stop and delete the thread");
         bladeRF2OutputThread->stopWork();
         delete bladeRF2OutputThread;
-        m_thread = 0;
+        m_thread = nullptr;
 
         // remove old thread address from buddies (reset in all buddies)
         const std::vector<DeviceAPI*>& sinkBuddies = m_deviceAPI->getSinkBuddies();
         std::vector<DeviceAPI*>::const_iterator it = sinkBuddies.begin();
 
         for (; it != sinkBuddies.end(); ++it) {
-            ((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_sink->setThread(0);
+            ((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_sink->setThread(nullptr);
         }
 
         m_deviceShared.m_dev->closeTx(0); // close the unique channel
@@ -422,7 +422,7 @@ void BladeRF2Output::stop()
         for (int i = 0; i < nbOriginalChannels-1; i++) // save original FIFO references
         {
             fifos[i] = bladeRF2OutputThread->getFifo(i);
-            stillActiveFIFO = stillActiveFIFO || (bladeRF2OutputThread->getFifo(i) != 0);
+            stillActiveFIFO = stillActiveFIFO || (bladeRF2OutputThread->getFifo(i) != nullptr);
             log2Interps[i] = bladeRF2OutputThread->getLog2Interpolation(i);
         }
 
@@ -450,7 +450,7 @@ void BladeRF2Output::stop()
         std::vector<DeviceAPI*>::const_iterator it = sinkBuddies.begin();
 
         for (; it != sinkBuddies.end(); ++it) {
-            ((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_sink->setThread(0);
+            ((DeviceBladeRF2Shared*) (*it)->getBuddySharedPtr())->m_sink->setThread(nullptr);
         }
 
         // close all channels
@@ -479,11 +479,9 @@ void BladeRF2Output::stop()
     else // remove channel from existing thread
     {
         qDebug("BladeRF2Output::stop: MO mode. Not changing MO configuration. Just remove FIFO reference");
-        bladeRF2OutputThread->setFifo(requestedChannel, 0); // remove FIFO
+        bladeRF2OutputThread->setFifo(requestedChannel, nullptr); // remove FIFO
     }
 
-    applySettings(m_settings, QList<QString>(), true); // re-apply forcibly to set sample rate with the new number of channels
-
     m_running = false;
 }