projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warning for unused Session::sample_thread_proc() parameter
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index ac3d654c63f06a4d70cd82db368bf16383c41453..e113cf4fdb77711d33a4aac0b45cff49521e88ce 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-114,8
+114,6
@@
public:
void stop_capture();
void stop_capture();
- std::set< std::shared_ptr<data::SignalData> > get_data() const;
-
double get_samplerate() const;
const std::unordered_set< std::shared_ptr<view::Signal> >
double get_samplerate() const;
const std::unordered_set< std::shared_ptr<view::Signal> >
@@
-139,8
+137,7
@@
private:
std::shared_ptr<sigrok::Channel> channel) const;
private:
std::shared_ptr<sigrok::Channel> channel) const;
private:
- void sample_thread_proc(std::shared_ptr<devices::Device> device,
- std::function<void (const QString)> error_handler);
+ void sample_thread_proc(std::function<void (const QString)> error_handler);
void feed_in_header();
void feed_in_header();
@@
-168,6
+165,7
@@
private:
mutable boost::shared_mutex signals_mutex_;
std::unordered_set< std::shared_ptr<view::Signal> > signals_;
mutable boost::shared_mutex signals_mutex_;
std::unordered_set< std::shared_ptr<view::Signal> > signals_;
+ std::set< std::shared_ptr<data::SignalData> > all_signal_data_;
mutable std::recursive_mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
mutable std::recursive_mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;