Exposed View::_session with accessor function

[pulseview.git] / sigsession.h

diff --git a/sigsession.h b/sigsession.h
index 851ca963ec0db1843077c8c45d6fb0080b6d14b0..f6b1d8e4951e0e021b2f3e76851ce525af44a888 100644 (file)
--- a/sigsession.h
+++ b/sigsession.h
@@ -45,18 +45,21 @@ public:
 
        ~SigSession();
 
-       void loadFile(const std::string &name);
+       void load_file(const std::string &name);
 
-       void start_capture(struct sr_dev_inst* sdi, uint64_t sample_rate);
+       void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
+               uint64_t sample_rate);
 
        std::vector< boost::shared_ptr<Signal> >&
                get_signals();
 
+       boost::shared_ptr<LogicData> get_data();
+
 private:
-       void dataFeedIn(const struct sr_dev_inst *sdi,
+       void data_feed_in(const struct sr_dev_inst *sdi,
                struct sr_datafeed_packet *packet);
 
-       static void dataFeedInProc(const struct sr_dev_inst *sdi,
+       static void data_feed_in_proc(const struct sr_dev_inst *sdi,
                struct sr_datafeed_packet *packet);
 
 private:
@@ -65,13 +68,13 @@ private:
        boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
 
 signals:
-       void dataUpdated();
+       void data_updated();
 
 private:
        // TODO: This should not be necessary. Multiple concurrent
        // sessions should should be supported and it should be
        // possible to associate a pointer with a sr_session.
-       static SigSession *session;
+       static SigSession *_session;
 };
 
 #endif // SIGSESSION_H