projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected project name in header comments
[pulseview.git]
/
sigsession.cpp
diff --git
a/sigsession.cpp
b/sigsession.cpp
index 21c5624bc40790ca410002e0b5320a70ff99ae2d..ac96833f842d5df0cdad4d470e26a8cc6b65144b 100644
(file)
--- a/
sigsession.cpp
+++ b/
sigsession.cpp
@@
-1,5
+1,5
@@
/*
/*
- * This file is part of the
sigrok
project.
+ * This file is part of the
PulseView
project.
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
@@
-58,7
+58,7
@@
void SigSession::load_file(const std::string &name)
}
void SigSession::start_capture(struct sr_dev_inst *sdi,
}
void SigSession::start_capture(struct sr_dev_inst *sdi,
- uint64_t sample_rate)
+ uint64_t
record_length, uint64_t
sample_rate)
{
sr_session_new();
sr_session_datafeed_callback_add(data_feed_in_proc);
{
sr_session_new();
sr_session_datafeed_callback_add(data_feed_in_proc);
@@
-69,9
+69,8
@@
void SigSession::start_capture(struct sr_dev_inst *sdi,
return;
}
return;
}
- uint64_t limit_samples = 10000;
if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
if (sr_dev_config_set(sdi, SR_HWCAP_LIMIT_SAMPLES,
- &
limit_samples
) != SR_OK) {
+ &
record_length
) != SR_OK) {
qDebug() << "Failed to configure time-based sample limit.";
sr_session_destroy();
return;
qDebug() << "Failed to configure time-based sample limit.";
sr_session_destroy();
return;
@@
-98,6
+97,11
@@
vector< shared_ptr<Signal> >& SigSession::get_signals()
return _signals;
}
return _signals;
}
+boost::shared_ptr<LogicData> SigSession::get_data()
+{
+ return _logic_data;
+}
+
void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet *packet)
{
void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet *packet)
{