From 1d04852f3d78a49360da3e8a5289793fbeae2e0f Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sun, 19 Jan 2014 22:05:55 +0000 Subject: [PATCH] Ported to new SR_CONF_LIMIT_SAMPLES config key --- pv/toolbars/samplingbar.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 036294bc..04aba21a 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -235,15 +235,21 @@ void SamplingBar::update_sample_count_selector() 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 (sr_config_list(sdi->driver, sdi, NULL, + SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK) { + 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) -- 2.30.2