SamplingBar: Only use DefaultSampleCount if the _sample_count widget is unset.

[pulseview.git] / pv / toolbars / samplingbar.h

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 94d9344e1e07b4403d474e8b2748fc6c4149c478..db4e856e26dfff48a59a80bae7f41909aa124e30 100644 (file)
--- 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,12 @@ 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::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_selected_device(
+               boost::shared_ptr<pv::device::DevInst> dev_inst);
 
        void set_capture_state(pv::SigSession::capture_state state);
 
@@ -82,11 +87,13 @@ private slots:
        void on_sample_rate_changed();
        void on_run_stop();
 
+       void on_config_changed();
+
 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;