X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=27af7c7b8acfd1cc6787cfbe70f6c917f08ac1ea;hb=82afd5e35c8113b719d78e5c654edf933375218a;hp=036294bcf063a850029c854021890e9d6db36f0a;hpb=b50ef520745ffb90eb32f27ac6c46c2d5e4baf82;p=pulseview.git diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 036294bc..27af7c7b 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -24,17 +24,18 @@ #include -#include - #include #include #include "samplingbar.h" #include +#include #include #include +using boost::shared_ptr; +using std::map; using std::max; using std::min; using std::string; @@ -95,14 +96,20 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) : } void SamplingBar::set_device_list( - const std::list &devices) + const std::list< shared_ptr > &devices) { _updating_device_selector = true; _device_selector.clear(); + _device_selector_map.clear(); + + BOOST_FOREACH (shared_ptr dev_inst, devices) { + assert(dev_inst); + const string title = dev_inst->format_device_title(); + const sr_dev_inst *sdi = dev_inst->dev_inst(); + assert(sdi); - BOOST_FOREACH (sr_dev_inst *sdi, devices) { - const string title = DeviceManager::format_device_title(sdi); + _device_selector_map[sdi] = dev_inst; _device_selector.addItem(title.c_str(), qVariantFromValue((void*)sdi)); } @@ -112,20 +119,32 @@ void SamplingBar::set_device_list( on_device_selected(); } -struct sr_dev_inst* SamplingBar::get_selected_device() const +shared_ptr SamplingBar::get_selected_device() const { const int index = _device_selector.currentIndex(); if (index < 0) - return NULL; + return shared_ptr(); + + const sr_dev_inst *const sdi = + (const sr_dev_inst*)_device_selector.itemData( + index).value(); + assert(sdi); + + map >:: + const_iterator iter = _device_selector_map.find(sdi); + if (iter == _device_selector_map.end()) + return shared_ptr(); - return (sr_dev_inst*)_device_selector.itemData( - index).value(); + return shared_ptr((*iter).second); } -void SamplingBar::set_selected_device(struct sr_dev_inst *const sdi) +void SamplingBar::set_selected_device(boost::shared_ptr dev_inst) { + assert(dev_inst); + for (int i = 0; i < _device_selector.count(); i++) - if (sdi == _device_selector.itemData(i).value()) { + if (dev_inst->dev_inst() == + _device_selector.itemData(i).value()) { _device_selector.setCurrentIndex(i); return; } @@ -141,18 +160,21 @@ void SamplingBar::set_capture_state(pv::SigSession::capture_state state) void SamplingBar::update_sample_rate_selector() { - const sr_dev_inst *const sdi = get_selected_device(); GVariant *gvar_dict, *gvar_list; const uint64_t *elements = NULL; gsize num_elements; - if (!sdi) + if (_updating_sample_rate) + return; + + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) return; + assert(!_updating_sample_rate); _updating_sample_rate = true; - if (sr_config_list(sdi->driver, sdi, NULL, - SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK) + if (!(gvar_dict = dev_inst->list_config(NULL, SR_CONF_SAMPLERATE))) { _sample_rate.show_none(); _updating_sample_rate = false; @@ -203,21 +225,24 @@ void SamplingBar::update_sample_rate_selector() void SamplingBar::update_sample_rate_selector_value() { - sr_dev_inst *const sdi = get_selected_device(); GVariant *gvar; uint64_t samplerate; - assert(sdi); + if (_updating_sample_rate) + return; - if (sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_SAMPLERATE, &gvar) != SR_OK) { - qDebug() << - "WARNING: Failed to get value of sample rate"; + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; + + if (!(gvar = dev_inst->get_config(NULL, SR_CONF_SAMPLERATE))) { + qDebug() << "WARNING: Failed to get value of sample rate"; return; } samplerate = g_variant_get_uint64(gvar); g_variant_unref(gvar); + assert(!_updating_sample_rate); _updating_sample_rate = true; _sample_rate.set_value(samplerate); _updating_sample_rate = false; @@ -225,28 +250,38 @@ void SamplingBar::update_sample_rate_selector_value() void SamplingBar::update_sample_count_selector() { - sr_dev_inst *const sdi = get_selected_device(); GVariant *gvar; - assert(sdi); + if (_updating_sample_count) + return; + + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; + assert(!_updating_sample_count); _updating_sample_count = true; if (_sample_count_supported) { uint64_t sample_count = DefaultSampleCount; + uint64_t min_sample_count = 0; uint64_t max_sample_count = MaxSampleCount; - if (sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_MAX_UNCOMPRESSED_SAMPLES, &gvar) == SR_OK) { - max_sample_count = g_variant_get_uint64(gvar); + if ((gvar = dev_inst->list_config(NULL, SR_CONF_LIMIT_SAMPLES))) + { + g_variant_get(gvar, "(tt)", + &min_sample_count, &max_sample_count); g_variant_unref(gvar); } - _sample_count.show_125_list(MinSampleCount, max_sample_count); + min_sample_count = min(max(min_sample_count, MinSampleCount), + max_sample_count); + + _sample_count.show_125_list( + min_sample_count, max_sample_count); - if (sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK) + if ((gvar = dev_inst->get_config(NULL, SR_CONF_LIMIT_SAMPLES))) { sample_count = g_variant_get_uint64(gvar); if (sample_count == 0) @@ -269,36 +304,50 @@ void SamplingBar::commit_sample_count() { uint64_t sample_count = 0; - sr_dev_inst *const sdi = get_selected_device(); - assert(sdi); + if (_updating_sample_count) + return; + + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; sample_count = _sample_count.value(); // Set the sample count - if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, - g_variant_new_uint64(sample_count)) != SR_OK) { + assert(!_updating_sample_count); + _updating_sample_count = true; + if (!dev_inst->set_config(NULL, SR_CONF_LIMIT_SAMPLES, + g_variant_new_uint64(sample_count))) { qDebug() << "Failed to configure sample count."; return; } + _updating_sample_count = false; } void SamplingBar::commit_sample_rate() { uint64_t sample_rate = 0; - sr_dev_inst *const sdi = get_selected_device(); - assert(sdi); + if (_updating_sample_rate) + return; + + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; sample_rate = _sample_rate.value(); if (sample_rate == 0) return; // Set the samplerate - if (sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE, - g_variant_new_uint64(sample_rate)) != SR_OK) { + assert(!_updating_sample_rate); + _updating_sample_rate = true; + if (!dev_inst->set_config(NULL, SR_CONF_SAMPLERATE, + g_variant_new_uint64(sample_rate))) { qDebug() << "Failed to configure samplerate."; return; } + _updating_sample_rate = false; } void SamplingBar::on_device_selected() @@ -310,11 +359,14 @@ void SamplingBar::on_device_selected() if (_updating_device_selector) return; - sr_dev_inst *const sdi = get_selected_device(); - _session.set_device(sdi); + const shared_ptr dev_inst = get_selected_device(); + if (!dev_inst) + return; + + _session.set_device(dev_inst); // Update the configure popup - DeviceOptions *const opts = new DeviceOptions(sdi, this); + DeviceOptions *const opts = new DeviceOptions(dev_inst, this); _configure_button_action->setVisible( !opts->binding().properties().empty()); _configure_button.set_popup(opts); @@ -326,12 +378,12 @@ void SamplingBar::on_device_selected() // Update supported options. _sample_count_supported = false; - if (sr_config_list(sdi->driver, sdi, NULL, - SR_CONF_DEVICE_OPTIONS, &gvar) == SR_OK) + if ((gvar = dev_inst->list_config(NULL, SR_CONF_DEVICE_OPTIONS))) { gsize num_opts; - const int *const options = (const int32_t *)g_variant_get_fixed_array( - gvar, &num_opts, sizeof(int32_t)); + const int *const options = + (const int32_t *)g_variant_get_fixed_array( + gvar, &num_opts, sizeof(int32_t)); for (unsigned int i = 0; i < num_opts; i++) { switch (options[i]) { @@ -339,13 +391,18 @@ void SamplingBar::on_device_selected() _sample_count_supported = true; break; case SR_CONF_LIMIT_FRAMES: - sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES, + dev_inst->set_config(NULL, SR_CONF_LIMIT_FRAMES, g_variant_new_uint64(1)); break; } } } + // Add notification of reconfigure events + disconnect(this, SLOT(on_config_changed())); + connect(dev_inst.get(), SIGNAL(config_changed()), + this, SLOT(on_config_changed())); + // Update sweep timing widgets. update_sample_count_selector(); update_sample_rate_selector(); @@ -353,14 +410,12 @@ void SamplingBar::on_device_selected() void SamplingBar::on_sample_count_changed() { - if(!_updating_sample_count) - commit_sample_count(); + commit_sample_count(); } void SamplingBar::on_sample_rate_changed() { - if (!_updating_sample_rate) - commit_sample_rate(); + commit_sample_rate(); } void SamplingBar::on_run_stop() @@ -370,5 +425,13 @@ void SamplingBar::on_run_stop() run_stop(); } +void SamplingBar::on_config_changed() +{ + commit_sample_count(); + update_sample_count_selector(); + commit_sample_rate(); + update_sample_rate_selector(); +} + } // namespace toolbars } // namespace pv