X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.hpp;h=10e70cb9bed9b94f944c015976a03b57d7284167;hp=d027d60e6b3b303802e3c87164d6dba3622e1319;hb=50288bdb7bf361e34474a8b53efc49d133de1508;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/toolbars/samplingbar.hpp b/pv/toolbars/samplingbar.hpp
index d027d60e..10e70cb9 100644
--- a/pv/toolbars/samplingbar.hpp
+++ b/pv/toolbars/samplingbar.hpp
@@ -31,7 +31,7 @@
 #include <QToolBar>
 #include <QToolButton>
 
-#include <pv/sigsession.hpp>
+#include <pv/session.hpp>
 #include <pv/widgets/popuptoolbutton.hpp>
 #include <pv/widgets/sweeptimingwidget.hpp>
 
@@ -45,7 +45,8 @@ class QAction;
 
 namespace pv {
 
-class SigSession;
+class MainWindow;
+class Session;
 
 namespace toolbars {
 
@@ -59,15 +60,15 @@ private:
 	static const uint64_t DefaultSampleCount;
 
 public:
-	SamplingBar(SigSession &session, QWidget *parent);
+	SamplingBar(Session &session, pv::MainWindow &main_window);
 
 	void set_device_list(
-		const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
+		const std::list< std::shared_ptr<sigrok::Device> > &devices,
 		std::shared_ptr<sigrok::Device> selected);
 
 	std::shared_ptr<sigrok::Device> get_selected_device() const;
 
-	void set_capture_state(pv::SigSession::capture_state state);
+	void set_capture_state(pv::Session::capture_state state);
 
 Q_SIGNALS:
 	void run_stop();
@@ -92,7 +93,8 @@ protected:
 	bool eventFilter(QObject *watched, QEvent *event);
 
 private:
-	SigSession &session_;
+	Session &session_;
+	MainWindow &main_window_;
 
 	QComboBox device_selector_;
 	bool updating_device_selector_;