X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=f9aa81dfdc4e7bc2e4e843543091709821d96a0a;hb=2b81ae4682ade4109ffa442794de36ceb32045eb;hp=142eb3f1c08960a8db7be4cbfe964574c5aa8d1c;hpb=20f81a58a9778fa7bc0dc4367f913437ed27c5e8;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 142eb3f..f9aa81d 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -95,6 +95,21 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 	}
 }
 
+void MainWindow::run_stop()
+{
+	switch(session_.get_capture_state()) {
+	case Session::Stopped:
+		session_.start_capture([&](QString message) {
+			session_error("Capture failed", message); });
+		break;
+
+	case Session::AwaitingTrigger:
+	case Session::Running:
+		session_.stop_capture();
+		break;
+	}
+}
+
 void MainWindow::setup_ui()
 {
 	setObjectName(QString::fromUtf8("MainWindow"));
@@ -255,13 +270,11 @@ void MainWindow::setup_ui()
 	addToolBar(toolbar);
 
 	// Setup the sampling bar
-	sampling_bar_ = new toolbars::SamplingBar(session_, this);
+	sampling_bar_ = new toolbars::SamplingBar(session_, *this);
 
 	// Populate the device list and select the initially selected device
 	update_device_list();
 
-	connect(sampling_bar_, SIGNAL(run_stop()), this,
-		SLOT(run_stop()));
 	addToolBar(sampling_bar_);
 
 	// Set the title
@@ -541,24 +554,9 @@ void MainWindow::add_decoder(srd_decoder *decoder)
 #endif
 }
 
-void MainWindow::run_stop()
-{
-	switch(session_.get_capture_state()) {
-	case SigSession::Stopped:
-		session_.start_capture([&](QString message) {
-			session_error("Capture failed", message); });
-		break;
-
-	case SigSession::AwaitingTrigger:
-	case SigSession::Running:
-		session_.stop_capture();
-		break;
-	}
-}
-
 void MainWindow::capture_state_changed(int state)
 {
-	sampling_bar_->set_capture_state((pv::SigSession::capture_state)state);
+	sampling_bar_->set_capture_state((pv::Session::capture_state)state);
 }
 
 void MainWindow::device_selected()