projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure to use QT4 even if QT5 is available
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 2fb2a1c8af8e6ad109d1fd52d67ef51e2c36f85b..499814cadbb4c223294382aa520c19d80bc9a091 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>
@@
-94,13
+93,16
@@
public:
boost::shared_ptr<data::Logic> get_data();
boost::shared_ptr<data::Logic> get_data();
-
void
add_decoder(srd_decoder *const dec,
+
bool
add_decoder(srd_decoder *const dec,
std::map<const srd_probe*,
std::map<const srd_probe*,
- boost::shared_ptr<view::Signal> > probes);
+ boost::shared_ptr<view::Signal> > probes,
+ GHashTable *options);
std::vector< boost::shared_ptr<view::DecodeSignal> >
get_decode_signals() const;
std::vector< boost::shared_ptr<view::DecodeSignal> >
get_decode_signals() const;
+ void remove_decode_signal(view::DecodeSignal *signal);
+
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
@@
-173,7
+175,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);