projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b8132c7
)
Session: Query the device's sample rate when needed, not sooner
author
Soeren Apel
<soeren@apelpie.net>
Mon, 9 Oct 2017 15:47:19 +0000
(17:47 +0200)
committer
Soeren Apel
<soeren@apelpie.net>
Mon, 9 Oct 2017 15:47:19 +0000
(17:47 +0200)
pv/session.cpp
patch
|
blob
|
history
diff --git
a/pv/session.cpp
b/pv/session.cpp
index a44ceb99b669aec396c97d92c19c733a6f489698..07ee594d7c1ca0390e5af1cef6ca6d24c2f4b22e 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-952,7
+952,7
@@
void Session::free_unused_memory()
void Session::feed_in_header()
{
void Session::feed_in_header()
{
- cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+ // Nothing to do here for now
}
void Session::feed_in_meta(shared_ptr<Meta> meta)
}
void Session::feed_in_meta(shared_ptr<Meta> meta)
@@
-1023,6
+1023,9
@@
void Session::feed_in_frame_end()
void Session::feed_in_logic(shared_ptr<Logic> logic)
{
void Session::feed_in_logic(shared_ptr<Logic> logic)
{
+ if (!cur_samplerate_)
+ cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+
lock_guard<recursive_mutex> lock(data_mutex_);
if (!logic_data_) {
lock_guard<recursive_mutex> lock(data_mutex_);
if (!logic_data_) {
@@
-1055,6
+1058,9
@@
void Session::feed_in_logic(shared_ptr<Logic> logic)
void Session::feed_in_analog(shared_ptr<Analog> analog)
{
void Session::feed_in_analog(shared_ptr<Analog> analog)
{
+ if (!cur_samplerate_)
+ cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+
lock_guard<recursive_mutex> lock(data_mutex_);
const vector<shared_ptr<Channel>> channels = analog->channels();
lock_guard<recursive_mutex> lock(data_mutex_);
const vector<shared_ptr<Channel>> channels = analog->channels();