X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=27af7c7b8acfd1cc6787cfbe70f6c917f08ac1ea;hb=82afd5e35c8113b719d78e5c654edf933375218a;hp=59d190d427792db64221feb338d166257dfbe2ec;hpb=19adbc2c342b190161ec1223377a3619974b91f7;p=pulseview.git diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 59d190d4..27af7c7b 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -24,8 +24,6 @@ #include -#include - #include #include @@ -166,17 +164,17 @@ void SamplingBar::update_sample_rate_selector() const uint64_t *elements = NULL; gsize num_elements; + if (_updating_sample_rate) + return; + const shared_ptr dev_inst = get_selected_device(); if (!dev_inst) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); - + 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; @@ -230,22 +228,21 @@ void SamplingBar::update_sample_rate_selector_value() GVariant *gvar; uint64_t samplerate; + if (_updating_sample_rate) + return; + const shared_ptr dev_inst = get_selected_device(); if (!dev_inst) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); - - if (sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_SAMPLERATE, &gvar) != SR_OK) { - qDebug() << - "WARNING: Failed to get value of sample rate"; + 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; @@ -255,13 +252,14 @@ void SamplingBar::update_sample_count_selector() { GVariant *gvar; + if (_updating_sample_count) + return; + const shared_ptr dev_inst = get_selected_device(); if (!dev_inst) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); - + assert(!_updating_sample_count); _updating_sample_count = true; if (_sample_count_supported) @@ -270,8 +268,8 @@ void SamplingBar::update_sample_count_selector() uint64_t min_sample_count = 0; uint64_t max_sample_count = MaxSampleCount; - if (sr_config_list(sdi->driver, sdi, NULL, - SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK) { + 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); @@ -283,8 +281,7 @@ void SamplingBar::update_sample_count_selector() _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) @@ -307,44 +304,50 @@ void SamplingBar::commit_sample_count() { uint64_t sample_count = 0; + if (_updating_sample_count) + return; + const shared_ptr dev_inst = get_selected_device(); if (!dev_inst) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); - 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; + if (_updating_sample_rate) + return; + const shared_ptr dev_inst = get_selected_device(); if (!dev_inst) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); - 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() @@ -360,9 +363,6 @@ void SamplingBar::on_device_selected() if (!dev_inst) return; - const sr_dev_inst *const sdi = dev_inst->dev_inst(); - assert(sdi); - _session.set_device(dev_inst); // Update the configure popup @@ -378,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]) { @@ -391,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(); @@ -405,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() @@ -422,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