projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build on MinGW (boost thread related).
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 08a0fd0fadb5cbe23b89e8e93acea84dae027599..62994256c80b2008c97158f213a13690ee5af41e 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-29,6
+29,8
@@
#include <thread>
#include <vector>
#include <thread>
#include <vector>
+#include <boost/thread.hpp>
+
#include <QObject>
#include <QString>
#include <QObject>
#include <QString>
@@
-104,8
+106,9
@@
public:
std::set< std::shared_ptr<data::SignalData> > get_data() const;
std::set< std::shared_ptr<data::SignalData> > get_data() const;
- std::vector< std::shared_ptr<view::Signal> >
- get_signals() const;
+ boost::shared_mutex& signals_mutex() const;
+
+ const std::vector< std::shared_ptr<view::Signal> >& signals() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
@@
-158,7
+161,7
@@
private:
mutable std::mutex _sampling_mutex;
capture_state _capture_state;
mutable std::mutex _sampling_mutex;
capture_state _capture_state;
- mutable
std::
mutex _signals_mutex;
+ mutable
boost::shared_
mutex _signals_mutex;
std::vector< std::shared_ptr<view::Signal> > _signals;
mutable std::mutex _data_mutex;
std::vector< std::shared_ptr<view::Signal> > _signals;
mutable std::mutex _data_mutex;