Header: Remove snap-to-grid behaviour

[pulseview.git] / pv / storesession.cpp

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 741d18a660d73dc628e08eec6a7c151d521cebf6..ef1c6aad2d245317988066b65c3299033d89ebca 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -29,6 +29,9 @@
 
 #include <libsigrok/libsigrok.hpp>
 
+using boost::shared_lock;
+using boost::shared_mutex;
+
 using std::deque;
 using std::dynamic_pointer_cast;
 using std::lock_guard;
@@ -79,8 +82,9 @@ bool StoreSession::start()
 {
        set< shared_ptr<data::SignalData> > data_set =
                _session.get_data();
-       const vector< shared_ptr<view::Signal> > sigs =
-               _session.get_signals();
+
+       shared_lock<shared_mutex> lock(_session.signals_mutex());
+       const vector< shared_ptr<view::Signal> > &sigs(_session.signals());
 
        // Check we have logic data
        if (data_set.empty() || sigs.empty()) {
@@ -95,7 +99,6 @@ bool StoreSession::start()
        }
 
        // Get the logic data
-       //shared_ptr<data::SignalData
        shared_ptr<data::Logic> data;
        if (!(data = dynamic_pointer_cast<data::Logic>(*data_set.begin()))) {
                _error = tr("PulseView currently only has support for "
@@ -117,9 +120,9 @@ bool StoreSession::start()
 
        // Begin storing
        try {
-               auto context = _session._sr_session->context();
+               auto context = _session.session()->context();
                auto output_format = context->output_formats()["srzip"];
-               auto device = _session.get_device();
+               auto device = _session.device();
                _output = output_format->create_output(device,
                        {{"filename",
                                Glib::Variant<Glib::ustring>::create(_file_name)}});
@@ -183,7 +186,7 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
                size_t length = end_sample - start_sample;
 
                try {
-                       auto context = _session._sr_session->context();
+                       auto context = _session.session()->context();
                        auto logic = context->create_logic_packet(data, length, unit_size);
                        _output->receive(logic);
                } catch (Error error) {