projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set the colour of ruler annotations to the correct palette colour
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 259356eef263b655a50c83ddb2da9604ac19cfa2..af01ec40a0a59b695bf639bbff367422bc56e306 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-30,14
+30,16
@@
#include <QObject>
#include <QObject>
-extern "C" {
#include <libsigrok/libsigrok.h>
#include <libsigrok/libsigrok.h>
-}
namespace pv {
namespace pv {
-class LogicData;
-class LogicDataSnapshot;
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+}
namespace view {
class Signal;
namespace view {
class Signal;
@@
-70,7
+72,7
@@
public:
std::vector< boost::shared_ptr<view::Signal> >
get_signals();
std::vector< boost::shared_ptr<view::Signal> >
get_signals();
- boost::shared_ptr<
LogicData
> get_data();
+ boost::shared_ptr<
data::Logic
> get_data();
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
@@
-81,6
+83,15
@@
private:
void sample_thread_proc(struct sr_dev_inst *sdi,
uint64_t record_length, uint64_t sample_rate);
void sample_thread_proc(struct sr_dev_inst *sdi,
uint64_t record_length, uint64_t sample_rate);
+ void feed_in_header(const sr_dev_inst *sdi);
+
+ void feed_in_meta(const sr_dev_inst *sdi,
+ const sr_datafeed_meta &meta);
+
+ void feed_in_logic(const sr_datafeed_logic &logic);
+
+ void feed_in_analog(const sr_datafeed_analog &analog);
+
void data_feed_in(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *packet);
void data_feed_in(const struct sr_dev_inst *sdi,
const struct sr_datafeed_packet *packet);
@@
-88,15
+99,17
@@
private:
const struct sr_datafeed_packet *packet);
private:
const struct sr_datafeed_packet *packet);
private:
- mutable boost::mutex _s
tate
_mutex;
+ mutable boost::mutex _s
ampling
_mutex;
capture_state _capture_state;
mutable boost::mutex _signals_mutex;
std::vector< boost::shared_ptr<view::Signal> > _signals;
mutable boost::mutex _data_mutex;
capture_state _capture_state;
mutable boost::mutex _signals_mutex;
std::vector< boost::shared_ptr<view::Signal> > _signals;
mutable boost::mutex _data_mutex;
- boost::shared_ptr<LogicData> _logic_data;
- boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+ boost::shared_ptr<data::Logic> _logic_data;
+ boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
+ boost::shared_ptr<data::Analog> _analog_data;
+ boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
std::auto_ptr<boost::thread> _sampling_thread;
std::auto_ptr<boost::thread> _sampling_thread;