projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6546a6a
)
Use SR_CONF_DEVICE_OPTIONS to decide if LIMIT_SAMPLES is supported.
author
Martin Ling
<martin-git@earth.li>
Tue, 14 Jan 2014 20:36:53 +0000
(20:36 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 18 Jan 2014 22:56:12 +0000
(22:56 +0000)
pv/toolbars/samplingbar.cpp
patch
|
blob
|
history
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index 987719d8c2f45cfa37db50a03b95c7e34bcbf70d..15eaf3b488d481f5fd5b1a6e599a692332093518 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-204,28
+204,43
@@
void SamplingBar::update_sample_count_selector()
{
sr_dev_inst *const sdi = get_selected_device();
GVariant *gvar;
{
sr_dev_inst *const sdi = get_selected_device();
GVariant *gvar;
- uint64_t samplecount;
+ uint64_t samplecount
= 0
;
assert(sdi);
assert(sdi);
- if (sr_config_get(sdi->driver, sdi, NULL,
- SR_CONF_LIMIT_SAMPLES, &gvar) != SR_OK)
+ _sample_count_supported = false;
+
+ if (sr_config_list(sdi->driver, sdi, NULL,
+ SR_CONF_DEVICE_OPTIONS, &gvar) == SR_OK)
{
{
- _sample_count_supported = false;
- _sample_count.show_none();
+ gsize num_opts;
+ 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++)
+ {
+ if (options[i] == SR_CONF_LIMIT_SAMPLES)
+ {
+ _sample_count_supported = true;
+ break;
+ }
+ }
}
}
- else
- {
- _sample_count_supported = true;
+
+ if (_sample_count_supported)
_sample_count.show_min_max_step(0, UINT64_MAX, 1);
_sample_count.show_min_max_step(0, UINT64_MAX, 1);
+ else
+ _sample_count.show_none();
+ if (sr_config_get(sdi->driver, sdi, NULL,
+ SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK)
+ {
samplecount = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
samplecount = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
-
- _updating_sample_count = true;
- _sample_count.set_value(samplecount);
- _updating_sample_count = false;
}
}
+
+ _updating_sample_count = true;
+ _sample_count.set_value(samplecount);
+ _updating_sample_count = false;
}
void SamplingBar::commit_sample_count()
}
void SamplingBar::commit_sample_count()