Drop a few more unneeded 'extern "C"'.

[pulseview.git] / pv / samplingbar.cpp

diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp
index 5f9e4371bd691fa98acb52ffb2ac88aa915a0c5d..41e98be2653e67602a9eede6888d8662106edb0c 100644 (file)
--- a/pv/samplingbar.cpp
+++ b/pv/samplingbar.cpp
@@ -22,14 +22,14 @@
 
 #include <boost/foreach.hpp>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 #include <QAction>
 
 #include "samplingbar.h"
 
+#include <pv/dialogs/deviceoptions.h>
+
 namespace pv {
 
 const uint64_t SamplingBar::RecordLengths[11] = {
@@ -43,19 +43,25 @@ const uint64_t SamplingBar::RecordLengths[11] = {
        250000000,
        500000000,
        1000000000,
-       10000000000
+       10000000000ULL,
 };
 
 SamplingBar::SamplingBar(QWidget *parent) :
        QToolBar("Sampling Bar", parent),
        _device_selector(this),
+       _configure_button(this),
        _record_length_selector(this),
        _sample_rate_list(this),
+       _icon_green(":/icons/status-green.svg"),
+       _icon_grey(":/icons/status-grey.svg"),
        _run_stop_button(this)
 {
-       connect(&_run_stop_button, SIGNAL(clicked()), this, SIGNAL(run_stop()));
+       connect(&_run_stop_button, SIGNAL(clicked()),
+               this, SIGNAL(run_stop()));
        connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
                this, SLOT(on_device_selected()));
+       connect(&_configure_button, SIGNAL(clicked()),
+               this, SLOT(configure()));
 
        _sample_rate_value.setDecimals(0);
        _sample_rate_value.setSuffix("Hz");
@@ -70,7 +76,13 @@ SamplingBar::SamplingBar(QWidget *parent) :
 
        set_sampling(false);
 
+       _configure_button.setIcon(QIcon::fromTheme("configure",
+               QIcon(":/icons/configure.png")));
+
+       _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
        addWidget(&_device_selector);
+       addWidget(&_configure_button);
        addWidget(&_record_length_selector);
        _sample_rate_list_action = addWidget(&_sample_rate_list);
        _sample_rate_value_action = addWidget(&_sample_rate_value);
@@ -120,6 +132,7 @@ uint64_t SamplingBar::get_sample_rate() const
 
 void SamplingBar::set_sampling(bool sampling)
 {
+       _run_stop_button.setIcon(sampling ? _icon_green : _icon_grey);
        _run_stop_button.setText(sampling ? "Stop" : "Run");
 }
 
@@ -162,7 +175,7 @@ void SamplingBar::update_sample_rate_selector()
        assert(_sample_rate_value_action);
        assert(_sample_rate_list_action);
 
-       if (sr_info_get(sdi->driver, SR_DI_SAMPLERATES,
+       if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
                (const void **)&samplerates, sdi) != SR_OK)
                return;
 
@@ -194,4 +207,13 @@ void SamplingBar::on_device_selected()
        update_sample_rate_selector();
 }
 
+void SamplingBar::configure()
+{
+       sr_dev_inst *const sdi = get_selected_device();
+       assert(sdi);
+
+       pv::dialogs::DeviceOptions dlg(this, sdi);
+       dlg.exec();
+}
+
 } // namespace pv