Make sigrokdecode a non-optional dependancy

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index e70ca9891c565ca81891ef30e2f1b2246aa661d8..5fe4ccb6cfb63cce767ef5bbb142d99216503528 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifdef ENABLE_SIGROKDECODE
 #include <libsigrokdecode/libsigrokdecode.h>
-#endif
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
@@ -216,7 +214,6 @@ void MainWindow::setup_ui()
        // Setup the context bar
        _context_bar = new toolbars::ContextBar(this);
        addToolBar(_context_bar);
-       insertToolBarBreak(_context_bar);
 
        // Set the title
        setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
@@ -355,6 +352,7 @@ void MainWindow::run_stop()
                                QString("Capture failed"), _1));
                break;
 
+       case SigSession::AwaitingTrigger:
        case SigSession::Running:
                _session.stop_capture();
                break;
@@ -363,7 +361,7 @@ void MainWindow::run_stop()
 
 void MainWindow::capture_state_changed(int state)
 {
-       _sampling_bar->set_sampling(state != SigSession::Stopped);
+       _sampling_bar->set_capture_state((pv::SigSession::capture_state)state);
 }
 
 void MainWindow::view_selection_changed()