projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved RulerHeight out of View into Ruler
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index e0eb493853cb54d871f2aafc5e8e15b21376a232..980fef947192e2ecb06202400b7d4dc6650ab08c 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-49,7
+49,8
@@
class LogicSnapshot;
}
namespace view {
}
namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
class Signal;
}
class Signal;
}
@@
-93,15
+94,12
@@
public:
boost::shared_ptr<data::Logic> get_data();
boost::shared_ptr<data::Logic> get_data();
- void add_decoder(srd_decoder *const dec,
- std::map<const srd_probe*,
- boost::shared_ptr<view::Signal> > probes,
- GHashTable *options);
+ bool add_decoder(srd_decoder *const dec);
- std::vector< boost::shared_ptr<view::Decode
Signal
> >
+ std::vector< boost::shared_ptr<view::Decode
Trace
> >
get_decode_signals() const;
get_decode_signals() const;
- void remove_decode_signal(view::Decode
Signal
*signal);
+ void remove_decode_signal(view::Decode
Trace
*signal);
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
@@
-161,7
+159,7
@@
private:
*/
struct sr_dev_inst *_sdi;
*/
struct sr_dev_inst *_sdi;
- std::vector< boost::shared_ptr<view::Decode
Signal
> > _decode_traces;
+ std::vector< boost::shared_ptr<view::Decode
Trace
> > _decode_traces;
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;