projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use device::Devices to represent sigrok Devices
[pulseview.git]
/
pv
/
data
/
decoderstack.hpp
diff --git
a/pv/data/decoderstack.hpp
b/pv/data/decoderstack.hpp
index 979a56fa0699f306075609f1e5959cbd65056624..99df3887ce422a5a88f718d5c223c108023f65e3 100644
(file)
--- a/
pv/data/decoderstack.hpp
+++ b/
pv/data/decoderstack.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_H
-#define PULSEVIEW_PV_DATA_DECODERSTACK_H
+#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_H
PP
+#define PULSEVIEW_PV_DATA_DECODERSTACK_H
PP
#include "signaldata.hpp"
#include "signaldata.hpp"
@@
-50,7
+50,7
@@
struct TwoDecoderStack;
namespace pv {
namespace pv {
-class S
igS
ession;
+class Session;
namespace view {
class LogicSignal;
namespace view {
class LogicSignal;
@@
-58,7
+58,7
@@
class LogicSignal;
namespace data {
namespace data {
-class LogicS
napsho
t;
+class LogicS
egmen
t;
namespace decode {
class Annotation;
namespace decode {
class Annotation;
@@
-67,7
+67,7
@@
class Decoder;
class Logic;
class Logic;
-class DecoderStack : public QObject
, public SignalData
+class DecoderStack : public QObject
{
Q_OBJECT
{
Q_OBJECT
@@
-78,7
+78,7
@@
private:
static const unsigned int DecodeNotifyPeriod;
public:
static const unsigned int DecodeNotifyPeriod;
public:
- DecoderStack(pv::S
igS
ession &session_,
+ DecoderStack(pv::Session &session_,
const srd_decoder *const decoder);
virtual ~DecoderStack();
const srd_decoder *const decoder);
virtual ~DecoderStack();
@@
-87,6
+87,10
@@
public:
void push(std::shared_ptr<decode::Decoder> decoder);
void remove(int index);
void push(std::shared_ptr<decode::Decoder> decoder);
void remove(int index);
+ double samplerate() const;
+
+ double start_time() const;
+
int64_t samples_decoded() const;
std::vector<decode::Row> get_visible_rows() const;
int64_t samples_decoded() const;
std::vector<decode::Row> get_visible_rows() const;
@@
-103,7
+107,7
@@
public:
void clear();
void clear();
- uint64_t
get_
max_sample_count() const;
+ uint64_t max_sample_count() const;
void begin_decode();
void begin_decode();
@@
-129,7
+133,10
@@
Q_SIGNALS:
void new_decode_data();
private:
void new_decode_data();
private:
- pv::SigSession &session_;
+ pv::Session &session_;
+
+ double start_time_;
+ double samplerate_;
/**
* This mutex prevents more than one decode operation occuring
/**
* This mutex prevents more than one decode operation occuring
@@
-141,7
+148,7
@@
private:
std::list< std::shared_ptr<decode::Decoder> > stack_;
std::list< std::shared_ptr<decode::Decoder> > stack_;
- std::shared_ptr<pv::data::LogicS
napshot> snapsho
t_;
+ std::shared_ptr<pv::data::LogicS
egment> segmen
t_;
mutable std::mutex input_mutex_;
mutable std::condition_variable input_cond_;
mutable std::mutex input_mutex_;
mutable std::condition_variable input_cond_;
@@
-166,4
+173,4
@@
private:
} // namespace data
} // namespace pv
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
+#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
PP