projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalData: Moved samplerate into Snapshot
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index c179b24a85701f548468ae244019444700af21e8..a764e452d3d82bc203f88e83cac34bf231fbb699 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-62,6
+62,8
@@
mutex DecoderStack::global_decode_mutex_;
DecoderStack::DecoderStack(pv::Session &session,
const srd_decoder *const dec) :
session_(session),
DecoderStack::DecoderStack(pv::Session &session,
const srd_decoder *const dec) :
session_(session),
+ start_time_(0),
+ samplerate_(0),
sample_count_(0),
frame_complete_(false),
samples_decoded_(0)
sample_count_(0),
frame_complete_(false),
samples_decoded_(0)
@@
-112,6
+114,16
@@
void DecoderStack::remove(int index)
stack_.erase(iter);
}
stack_.erase(iter);
}
+double DecoderStack::samplerate() const
+{
+ return samplerate_;
+}
+
+double DecoderStack::start_time() const
+{
+ return start_time_;
+}
+
int64_t DecoderStack::samples_decoded() const
{
lock_guard<mutex> decode_lock(output_mutex_);
int64_t DecoderStack::samples_decoded() const
{
lock_guard<mutex> decode_lock(output_mutex_);
@@
-245,14
+257,14
@@
void DecoderStack::begin_decode()
// Check we have a snapshot of data
const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
// Check we have a snapshot of data
const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
- data->
get
_snapshots();
+ data->
logic
_snapshots();
if (snapshots.empty())
return;
snapshot_ = snapshots.front();
// Get the samplerate and start time
if (snapshots.empty())
return;
snapshot_ = snapshots.front();
// Get the samplerate and start time
- start_time_ =
data->get_
start_time();
- samplerate_ =
data
->samplerate();
+ start_time_ =
snapshot_->
start_time();
+ samplerate_ =
snapshot_
->samplerate();
if (samplerate_ == 0.0)
samplerate_ = 1.0;
if (samplerate_ == 0.0)
samplerate_ = 1.0;