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
/
devicemanager.hpp
diff --git
a/pv/devicemanager.hpp
b/pv/devicemanager.hpp
index 823cb2bc9542ee8632690be4780db421a8bcc1de..2ecf54af9aa3a84994da807806f85769769f9ff2 100644
(file)
--- a/
pv/devicemanager.hpp
+++ b/
pv/devicemanager.hpp
@@
-40,7
+40,7
@@
namespace sigrok {
namespace pv {
namespace pv {
-class S
igS
ession;
+class Session;
class DeviceManager
{
class DeviceManager
{
@@
-64,10
+64,12
@@
public:
const std::shared_ptr<sigrok::HardwareDevice> find_device_from_info(
const std::map<std::string, std::string> search_info);
const std::shared_ptr<sigrok::HardwareDevice> find_device_from_info(
const std::map<std::string, std::string> search_info);
-
const std::string
build_display_name(std::shared_ptr<sigrok::Device> device);
+
void
build_display_name(std::shared_ptr<sigrok::Device> device);
const std::string get_display_name(std::shared_ptr<sigrok::Device> dev);
const std::string get_display_name(std::shared_ptr<sigrok::Device> dev);
+ const std::string get_full_name(std::shared_ptr<sigrok::Device> dev);
+
void update_display_name(std::shared_ptr<sigrok::Device> dev);
private:
void update_display_name(std::shared_ptr<sigrok::Device> dev);
private:
@@
-77,7
+79,9
@@
private:
protected:
std::shared_ptr<sigrok::Context> context_;
std::list< std::shared_ptr<sigrok::HardwareDevice> > devices_;
protected:
std::shared_ptr<sigrok::Context> context_;
std::list< std::shared_ptr<sigrok::HardwareDevice> > devices_;
+
std::map< std::shared_ptr<sigrok::Device>, std::string > display_names_;
std::map< std::shared_ptr<sigrok::Device>, std::string > display_names_;
+ std::map< std::shared_ptr<sigrok::Device>, std::string > full_names_;
};
} // namespace pv
};
} // namespace pv