projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
README: Explicitly state meaning of year ranges in copyright statements
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 5b9630631a1fe9c1e104e9f8437745c49d2c61ba..fc26a23d784b0f5b2c11fecf993e01358f582428 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-72,13
+72,10
@@
SigSession::capture_state SigSession::get_capture_state() const
}
void SigSession::start_capture(struct sr_dev_inst *sdi,
}
void SigSession::start_capture(struct sr_dev_inst *sdi,
- uint64_t record_length
, uint64_t sample_rate
)
+ uint64_t record_length)
{
stop_capture();
{
stop_capture();
- lock_guard<mutex> lock(_sampling_mutex);
- _sample_rate = sample_rate;
-
_sampling_thread.reset(new boost::thread(
&SigSession::sample_thread_proc, this, sdi,
record_length));
_sampling_thread.reset(new boost::thread(
&SigSession::sample_thread_proc, this, sdi,
record_length));
@@
-159,17
+156,6
@@
void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
return;
}
return;
}
- // Set the samplerate
- {
- lock_guard<mutex> lock(_sampling_mutex);
- if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
- &_sample_rate) != SR_OK) {
- qDebug() << "Failed to configure samplerate.";
- sr_session_destroy();
- return;
- }
- }
-
if (sr_session_start() != SR_OK) {
qDebug() << "Failed to start session.";
return;
if (sr_session_start() != SR_OK) {
qDebug() << "Failed to start session.";
return;
@@
-186,6
+172,7
@@
void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
void SigSession::feed_in_header(const sr_dev_inst *sdi)
{
shared_ptr<view::Signal> signal;
void SigSession::feed_in_header(const sr_dev_inst *sdi)
{
shared_ptr<view::Signal> signal;
+ uint64_t *sample_rate;
unsigned int logic_probe_count = 0;
unsigned int analog_probe_count = 0;
unsigned int logic_probe_count = 0;
unsigned int analog_probe_count = 0;
@@
-206,19
+193,23
@@
void SigSession::feed_in_header(const sr_dev_inst *sdi)
}
}
}
}
+ // Read out the sample rate
+ assert(sdi->driver);
+ assert(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
+ (const void**)&sample_rate, sdi) == SR_OK);
+
// Create data containers for the coming data snapshots
{
lock_guard<mutex> data_lock(_data_mutex);
// Create data containers for the coming data snapshots
{
lock_guard<mutex> data_lock(_data_mutex);
- lock_guard<mutex> sampling_lock(_sampling_mutex);
if (logic_probe_count != 0) {
_logic_data.reset(new data::Logic(
if (logic_probe_count != 0) {
_logic_data.reset(new data::Logic(
- logic_probe_count,
_
sample_rate));
+ logic_probe_count,
*
sample_rate));
assert(_logic_data);
}
if (analog_probe_count != 0) {
assert(_logic_data);
}
if (analog_probe_count != 0) {
- _analog_data.reset(new data::Analog(
_
sample_rate));
+ _analog_data.reset(new data::Analog(
*
sample_rate));
assert(_analog_data);
}
}
assert(_analog_data);
}
}
@@
-260,6
+251,8
@@
void SigSession::feed_in_header(const sr_dev_inst *sdi)
void SigSession::feed_in_meta(const sr_dev_inst *sdi,
const sr_datafeed_meta &meta)
{
void SigSession::feed_in_meta(const sr_dev_inst *sdi,
const sr_datafeed_meta &meta)
{
+ (void)sdi;
+
for (const GSList *l = meta.config; l; l = l->next) {
const sr_config *const src = (const sr_config*)l->data;
switch (src->key) {
for (const GSList *l = meta.config; l; l = l->next) {
const sr_config *const src = (const sr_config*)l->data;
switch (src->key) {