X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=42462d22a7cca0d9ff13ab844897e240a51f8968;hb=7c65709437184b09753d1bcacc02467b8f6171f1;hp=333eda2a0a75dfbc02f9c534444d389d42498efa;hpb=20f81a58a9778fa7bc0dc4367f913437ed27c5e8;p=pulseview.git

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 333eda2..42462d2 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -26,19 +26,23 @@
 
 #include <QMainWindow>
 
-#include "sigsession.hpp"
+#include "session.hpp"
 
 struct srd_decoder;
 
 class QVBoxLayout;
 
+namespace sigrok {
+class Device;
+}
+
 namespace pv {
 
 class DeviceManager;
 
 namespace toolbars {
 class ContextBar;
-class SamplingBar;
+class MainBar;
 }
 
 namespace view {
@@ -58,6 +62,10 @@ public:
 		const char *open_file_name = NULL,
 		QWidget *parent = 0);
 
+	void run_stop();
+
+	void select_device(std::shared_ptr<sigrok::Device> device);
+
 private:
 	void setup_ui();
 
@@ -100,8 +108,6 @@ private Q_SLOTS:
 
 	void add_decoder(srd_decoder *decoder);
 
-	void run_stop();
-
 	void capture_state_changed(int state);
 	void device_selected();
 
@@ -120,14 +126,14 @@ private:
 
 	DeviceManager &device_manager_;
 
-	SigSession session_;
+	Session session_;
 
 	pv::view::View *view_;
 
 	QWidget *central_widget_;
 	QVBoxLayout *vertical_layout_;
 
-	toolbars::SamplingBar *sampling_bar_;
+	toolbars::MainBar *main_bar_;
 };
 
 } // namespace pv