projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved form generation into Binding
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 4ce6131d4bd39f9a7daf09c43e3b2044aa290df9..6068b03c3058177261dbe9ff31a96d10f6405c7b 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-27,7
+27,6
@@
#include <map>
#include <string>
#include <map>
#include <string>
-#include <utility>
#include <vector>
#include <QObject>
#include <vector>
#include <QObject>
@@
-90,7
+89,7
@@
public:
void stop_capture();
std::vector< boost::shared_ptr<view::Signal> >
void stop_capture();
std::vector< boost::shared_ptr<view::Signal> >
- get_signals();
+ get_signals()
const
;
boost::shared_ptr<data::Logic> get_data();
boost::shared_ptr<data::Logic> get_data();
@@
-98,6
+97,9
@@
public:
std::map<const srd_probe*,
boost::shared_ptr<view::Signal> > probes);
std::map<const srd_probe*,
boost::shared_ptr<view::Signal> > probes);
+ std::vector< boost::shared_ptr<view::DecodeSignal> >
+ get_decode_signals() const;
+
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
@@
-170,7
+172,7
@@
private:
boost::shared_ptr<data::Analog> _analog_data;
boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
boost::shared_ptr<data::Analog> _analog_data;
boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
-
std::auto_ptr<boost::thread>
_sampling_thread;
+
boost::thread
_sampling_thread;
signals:
void capture_state_changed(int state);
signals:
void capture_state_changed(int state);