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

[pulseview.git] / pv / samplingbar.cpp

diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp
index 60d7b4c8aec6cdcb2841a383ee5e8922b4fcc7be..41e98be2653e67602a9eede6888d8662106edb0c 100644 (file)
--- a/pv/samplingbar.cpp
+++ b/pv/samplingbar.cpp
@@ -22,15 +22,13 @@
 
 #include <boost/foreach.hpp>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 #include <QAction>
 
 #include "samplingbar.h"
 
-#include <pv/dialogs/hwcap.h>
+#include <pv/dialogs/deviceoptions.h>
 
 namespace pv {
 
@@ -45,7 +43,7 @@ const uint64_t SamplingBar::RecordLengths[11] = {
        250000000,
        500000000,
        1000000000,
-       10000000000
+       10000000000ULL,
 };
 
 SamplingBar::SamplingBar(QWidget *parent) :
@@ -177,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;
 
@@ -214,7 +212,7 @@ void SamplingBar::configure()
        sr_dev_inst *const sdi = get_selected_device();
        assert(sdi);
 
-       pv::dialogs::HwCap dlg(this, sdi);
+       pv::dialogs::DeviceOptions dlg(this, sdi);
        dlg.exec();
 }