projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix an isnan() issue on (at least) MinGW and Mac OS X.
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index b5a2aee513c7a12026b94e7bd3720894fd9e735e..7ee4d98150b5ccdb491ff9e2093a3507a9e7ad0d 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-111,7
+111,7
@@
SamplingBar::SamplingBar(Session &session, MainWindow &main_window) :
}
void SamplingBar::set_device_list(
}
void SamplingBar::set_device_list(
- const std::list< std::
pair<std::shared_ptr<sigrok::Device>, std::string
> > &devices,
+ const std::list< std::
shared_ptr<sigrok::Device
> > &devices,
shared_ptr<Device> selected)
{
int selected_index = -1;
shared_ptr<Device> selected)
{
int selected_index = -1;
@@
-122,12
+122,12
@@
void SamplingBar::set_device_list(
device_selector_.clear();
device_selector_.clear();
- for (auto entry : devices) {
- auto device = entry.first;
- auto display_name = entry.second;
-
+ for (auto device : devices) {
assert(device);
assert(device);
+ string display_name =
+ session_.device_manager().get_display_name(device);
+
if (selected == device)
selected_index = device_selector_.count();
if (selected == device)
selected_index = device_selector_.count();