projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMakeLists.txt: Fix copy-paste error (ENABLE_COTIRE).
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 5c69a9bc3a1aa428982ce64b15bf240bda08d322..8b97f8c0364eedd1fcf60a9bd2782e800d46314f 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-49,7
+49,7
@@
class LogicSnapshot;
}
namespace view {
}
namespace view {
-class Decode
Signal
;
+class Decode
Trace
;
class LogicSignal;
class Signal;
}
class LogicSignal;
class Signal;
}
@@
-94,15
+94,14
@@
public:
boost::shared_ptr<data::Logic> get_data();
boost::shared_ptr<data::Logic> get_data();
- bool add_decoder(srd_decoder *const dec,
- std::map<const srd_probe*,
- boost::shared_ptr<view::LogicSignal> > probes,
- GHashTable *options);
+#ifdef ENABLE_DECODE
+ 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::DecodeSignal *signal);
+ void remove_decode_signal(view::DecodeTrace *signal);
+#endif
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
@@
-162,7
+161,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;