Added Pulses test case for LogicDataSnapshot

[pulseview.git] / sigsession.cpp

diff --git a/sigsession.cpp b/sigsession.cpp
index aecd21c2c3b5c5231c9407156edd24cad52acfc0..47d9585b999cfd9fe263a29097f3f24b7582481d 100644 (file)
--- a/sigsession.cpp
+++ b/sigsession.cpp
@@ -32,25 +32,25 @@ using namespace boost;
 using namespace std;
 
 // TODO: This should not be necessary
-SigSession* SigSession::session = NULL;
+SigSession* SigSession::_session = NULL;
 
 SigSession::SigSession()
 {
        // TODO: This should not be necessary
-       session = this;
+       _session = this;
 }
 
 SigSession::~SigSession()
 {
        // TODO: This should not be necessary
-       session = NULL;
+       _session = NULL;
 }
 
-void SigSession::loadFile(const std::string &name)
+void SigSession::load_file(const std::string &name)
 {
        if (sr_session_load(name.c_str()) == SR_OK) {
                /* sigrok session file */
-               sr_session_datafeed_callback_add(dataFeedInProc);
+               sr_session_datafeed_callback_add(data_feed_in_proc);
                sr_session_start();
                sr_session_run();
                sr_session_stop();
@@ -58,10 +58,10 @@ void SigSession::loadFile(const std::string &name)
 }
 
 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(dataFeedInProc);
+       sr_session_datafeed_callback_add(data_feed_in_proc);
 
        if (sr_session_dev_add(sdi) != SR_OK) {
                qDebug() << "Failed to use device.";
@@ -69,9 +69,8 @@ void SigSession::start_capture(struct sr_dev_inst *sdi,
                return;
        }
 
-       uint64_t limit_samples = 10000;
        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;
@@ -98,7 +97,12 @@ vector< shared_ptr<Signal> >& SigSession::get_signals()
        return _signals;
 }
 
-void SigSession::dataFeedIn(const struct sr_dev_inst *sdi,
+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)
 {
        assert(sdi);
@@ -163,14 +167,14 @@ void SigSession::dataFeedIn(const struct sr_dev_inst *sdi,
 
        case SR_DF_END:
                _cur_logic_snapshot.reset();
-               dataUpdated();
+               data_updated();
                break;
        }
 }
 
-void SigSession::dataFeedInProc(const struct sr_dev_inst *sdi,
+void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,
        struct sr_datafeed_packet *packet)
 {
-       assert(session);
-       session->dataFeedIn(sdi, packet);
+       assert(_session);
+       _session->data_feed_in(sdi, packet);
 }