projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manpage: Document the new 'b' keyboard shortcut.
[pulseview.git]
/
pv
/
data
/
decoderstack.hpp
diff --git
a/pv/data/decoderstack.hpp
b/pv/data/decoderstack.hpp
index 39e507e88c58a57cde8f605cfc01211b75ab1ea6..64ce13b01253398850cfa99a9921074090507980 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"
@@
-37,6
+37,7
@@
#include <pv/data/decode/row.hpp>
#include <pv/data/decode/rowdata.hpp>
#include <pv/data/decode/row.hpp>
#include <pv/data/decode/rowdata.hpp>
+#include <pv/util.hpp>
struct srd_decoder;
struct srd_decoder_annotation_row;
struct srd_decoder;
struct srd_decoder_annotation_row;
@@
-58,7
+59,7
@@
class LogicSignal;
namespace data {
namespace data {
-class LogicS
napsho
t;
+class LogicS
egmen
t;
namespace decode {
class Annotation;
namespace decode {
class Annotation;
@@
-89,7
+90,7
@@
public:
double samplerate() const;
double samplerate() const;
-
double
start_time() const;
+
const pv::util::Timestamp&
start_time() const;
int64_t samples_decoded() const;
int64_t samples_decoded() const;
@@
-107,7
+108,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();
@@
-135,7
+136,7
@@
Q_SIGNALS:
private:
pv::Session &session_;
private:
pv::Session &session_;
-
double
start_time_;
+
pv::util::Timestamp
start_time_;
double samplerate_;
/**
double samplerate_;
/**
@@
-148,7
+149,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_;
@@
-173,4
+174,4
@@
private:
} // namespace data
} // namespace pv
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
+#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
PP