projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move view-independent data from view::DecodeTrace to SignalBase
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 83a73f4af7678252dc28b0afee6f25cf2b02b553..a4fc352d1969fd527951820bbf75e37f8b2b991c 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-73,7
+73,6
@@
class Device;
}
namespace view {
}
namespace view {
-class DecodeTrace;
class View;
}
class View;
}
@@
-126,10
+125,7
@@
public:
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
- std::vector< std::shared_ptr<view::DecodeTrace> >
- get_decode_signals() const;
-
- void remove_decode_signal(view::DecodeTrace *signal);
+ void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
#endif
private:
#endif
private:
@@
-164,8
+160,6
@@
private:
std::unordered_set< std::shared_ptr<pv::view::View> > views_;
std::unordered_set< std::shared_ptr<pv::view::View> > views_;
- std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
-
mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
capture_state capture_state_;
mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
capture_state capture_state_;