projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure sr_config_get is called even when assert is compiled out
[pulseview.git]
/
pv
/
samplingbar.cpp
diff --git
a/pv/samplingbar.cpp
b/pv/samplingbar.cpp
index 4ea2686b4d2b522c2203dab01a00cfee86e4951b..24fcc40a86794b88f5e97af7686dc2cdf188cd9d 100644
(file)
--- a/
pv/samplingbar.cpp
+++ b/
pv/samplingbar.cpp
@@
-143,6
+143,15
@@
struct sr_dev_inst* SamplingBar::get_selected_device() const
index).value<void*>();
}
index).value<void*>();
}
+void SamplingBar::set_selected_device(struct sr_dev_inst *const sdi)
+{
+ for (int i = 0; i < _device_selector.count(); i++)
+ if (sdi == _device_selector.itemData(i).value<void*>()) {
+ _device_selector.setCurrentIndex(i);
+ return;
+ }
+}
+
uint64_t SamplingBar::get_record_length() const
{
const int index = _record_length_selector.currentIndex();
uint64_t SamplingBar::get_record_length() const
{
const int index = _record_length_selector.currentIndex();
@@
-204,7
+213,7
@@
void SamplingBar::update_sample_rate_selector_value()
assert(sdi);
uint64_t *samplerate = NULL;
assert(sdi);
uint64_t *samplerate = NULL;
- if(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
+ if
(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
(const void**)&samplerate, sdi) != SR_OK) {
qDebug() <<
"WARNING: Failed to get value of sample rate";
(const void**)&samplerate, sdi) != SR_OK) {
qDebug() <<
"WARNING: Failed to get value of sample rate";
@@
-218,8
+227,8
@@
void SamplingBar::update_sample_rate_selector_value()
_sample_rate_value.setValue(*samplerate);
else if (_sample_rate_list_action->isVisible())
{
_sample_rate_value.setValue(*samplerate);
else if (_sample_rate_list_action->isVisible())
{
- for(int i = 0; i < _sample_rate_list.count(); i++)
- if(*samplerate == _sample_rate_list.itemData(
+ for
(int i = 0; i < _sample_rate_list.count(); i++)
+ if
(*samplerate == _sample_rate_list.itemData(
i).value<uint64_t>())
_sample_rate_list.setCurrentIndex(i);
}
i).value<uint64_t>())
_sample_rate_list.setCurrentIndex(i);
}