X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Ftoolbars%2Fsamplingbar.h;h=e59d2f9f0b195da8417c126de2ea6f4ec7f53539;hb=48c8844588e204568a7ae58abe0fb2070cd56d77;hp=454d607931be9633354549a43d89ba137c744024;hpb=82afd5e35c8113b719d78e5c654edf933375218a;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 454d6079..e59d2f9f 100644
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -41,9 +41,12 @@ class QAction;
 
 namespace pv {
 
-class DevInst;
 class SigSession;
 
+namespace device {
+class DevInst;
+}
+
 namespace toolbars {
 
 class SamplingBar : public QToolBar
@@ -59,10 +62,11 @@ public:
 	SamplingBar(SigSession &session, QWidget *parent);
 
 	void set_device_list(
-		const std::list< boost::shared_ptr<pv::DevInst> > &devices);
+		const std::list< boost::shared_ptr<pv::device::DevInst> >
+			&devices,
+		boost::shared_ptr<pv::device::DevInst> selected);
 
-	boost::shared_ptr<pv::DevInst> get_selected_device() const;
-	void set_selected_device(boost::shared_ptr<pv::DevInst> dev_inst);
+	boost::shared_ptr<pv::device::DevInst> get_selected_device() const;
 
 	void set_capture_state(pv::SigSession::capture_state state);
 
@@ -73,6 +77,7 @@ private:
 	void update_sample_rate_selector();
 	void update_sample_rate_selector_value();
 	void update_sample_count_selector();
+	void update_device_config_widgets();
 	void commit_sample_rate();
 	void commit_sample_count();
 
@@ -88,7 +93,7 @@ private:
 	SigSession &_session;
 
 	QComboBox _device_selector;
-	std::map<const sr_dev_inst*, boost::weak_ptr<DevInst> >
+	std::map<const sr_dev_inst*, boost::weak_ptr<device::DevInst> >
 		_device_selector_map;
 	bool _updating_device_selector;