Replace tb->lock() / unlock() with start() / stop().

lock() / unlock() seems to cause occasioanly hangs.
gqrx-sdr · Apr 11, 2014 · eca0ea7 · eca0ea7
1 parent b118d55
commit eca0ea7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/applications/gqrx/mainwindow.cpp b/applications/gqrx/mainwindow.cpp
@@ -833,7 +833,6 @@ void MainWindow::selectDemod(int index)
             rx->set_demod(receiver::RX_DEMOD_WFM_M);
         else
             rx->set_demod(receiver::RX_DEMOD_WFM_S);
-
         break;
 
         /* LSB */

diff --git a/applications/gqrx/receiver.cpp b/applications/gqrx/receiver.cpp
@@ -179,13 +179,20 @@ void receiver::set_input_device(const std::string device)
 
     input_devstr = device;
 
-    tb->lock();
+    // tb->lock() can hang occasionally
+    if (d_running)
+    {
+        tb->stop();
+        tb->wait();
+    }
 
     tb->disconnect(src, 0, iq_swap, 0);
     src.reset();
     src = osmosdr::source::make(device);
     tb->connect(src, 0, iq_swap, 0);
-    tb->unlock();
+
+    if (d_running)
+        tb->start();
 }
 
 
@@ -673,7 +680,13 @@ receiver::status receiver::set_demod(rx_demod demod)
     //if (demod == d_demod)
     //    return ret;
 
-    tb->lock();
+    // tb->lock() seems to hang occasioanlly
+    if (d_running)
+    {
+        tb->stop();
+        tb->wait();
+    }
+
     tb->disconnect_all();
 
     switch (demod)
@@ -718,7 +731,9 @@ receiver::status receiver::set_demod(rx_demod demod)
     }
 
     d_demod = demod;
-    tb->unlock();
+
+    if (d_running)
+        tb->start();
 
     return ret;
 }