projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved DevInst into the pv::device namespace
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 499814cadbb4c223294382aa520c19d80bc9a091..6b2e75999c06da96430924d8674fd64c90ccd422 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-1,7
+1,7
@@
/*
* This file is part of the PulseView project.
*
/*
* This file is part of the PulseView project.
*
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012
-14
Joel Holdsworth <joel@airwebreathe.org.uk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-26,6
+26,7
@@
#include <boost/thread.hpp>
#include <map>
#include <boost/thread.hpp>
#include <map>
+#include <set>
#include <string>
#include <vector>
#include <string>
#include <vector>
@@
-46,10
+47,16
@@
class Analog;
class AnalogSnapshot;
class Logic;
class LogicSnapshot;
class AnalogSnapshot;
class Logic;
class LogicSnapshot;
+class SignalData;
+}
+
+namespace device {
+class DevInst;
}
namespace view {
}
namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
class Signal;
}
class Signal;
}
@@
-69,47
+76,48
@@
public:
~SigSession();
~SigSession();
-
struct sr_dev_inst*
get_device() const;
+
boost::shared_ptr<device::DevInst>
get_device() const;
/**
* Sets device instance that will be used in the next capture session.
*/
/**
* Sets device instance that will be used in the next capture session.
*/
- void set_device(
struct sr_dev_inst *sdi
);
+ void set_device(
boost::shared_ptr<device::DevInst> dev_inst
);
- void release_device(
struct sr_dev_inst *sdi
);
+ void release_device(
boost::shared_ptr<device::DevInst> dev_inst
);
void load_file(const std::string &name,
boost::function<void (const QString)> error_handler);
capture_state get_capture_state() const;
void load_file(const std::string &name,
boost::function<void (const QString)> error_handler);
capture_state get_capture_state() const;
- void start_capture(uint64_t record_length,
- boost::function<void (const QString)> error_handler);
+ void start_capture(boost::function<void (const QString)> error_handler);
void stop_capture();
void stop_capture();
+ std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+
std::vector< boost::shared_ptr<view::Signal> >
get_signals() const;
std::vector< boost::shared_ptr<view::Signal> >
get_signals() const;
- boost::shared_ptr<data::Logic> get_data();
-
- bool add_decoder(srd_decoder *const dec,
- std::map<const srd_probe*,
- boost::shared_ptr<view::Signal> > 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);
- void update_signals(
const sr_dev_inst *const sdi
);
+ void update_signals(
boost::shared_ptr<device::DevInst> dev_inst
);
bool is_trigger_enabled() const;
bool is_trigger_enabled() const;
+ boost::shared_ptr<view::Signal> signal_from_probe(
+ const sr_probe *probe) const;
+
void read_sample_rate(const sr_dev_inst *const sdi);
private:
void read_sample_rate(const sr_dev_inst *const sdi);
private:
@@
-134,8
+142,7
@@
private:
void load_input_thread_proc(const std::string name, sr_input *in,
boost::function<void (const QString)> error_handler);
void load_input_thread_proc(const std::string name, sr_input *in,
boost::function<void (const QString)> error_handler);
- void sample_thread_proc(struct sr_dev_inst *sdi,
- uint64_t record_length,
+ void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
boost::function<void (const QString)> error_handler);
void feed_in_header(const sr_dev_inst *sdi);
boost::function<void (const QString)> error_handler);
void feed_in_header(const sr_dev_inst *sdi);
@@
-159,9
+166,9
@@
private:
/**
* The device instance that will be used in the next capture session.
*/
/**
* The device instance that will be used in the next capture session.
*/
-
struct sr_dev_inst *_sdi
;
+
boost::shared_ptr<device::DevInst> _dev_inst
;
- 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;
@@
-172,8
+179,8
@@
private:
mutable boost::mutex _data_mutex;
boost::shared_ptr<data::Logic> _logic_data;
boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
mutable boost::mutex _data_mutex;
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::map< const sr_probe*, boost::shared_ptr<data::AnalogSnapshot> >
+
_cur_analog_snapshots
;
boost::thread _sampling_thread;
boost::thread _sampling_thread;