Session: Removed signals_mutex(), and made signals() return a copy not a reference

[pulseview.git] / pv / storesession.cpp

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index aa2902375e02bd84e479d382b20e1ab32e4e3951..da2f963be9eb99609786800e9c45ad3ece294040 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -20,6 +20,9 @@
 
 #include <cassert>
 
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 #include "storesession.hpp"
 
 #include <pv/devicemanager.hpp>
@@ -55,6 +58,7 @@ using Glib::VariantBase;
 using sigrok::ConfigKey;
 using sigrok::Error;
 using sigrok::OutputFormat;
+using sigrok::OutputFlag;
 
 namespace pv {
 
@@ -91,8 +95,7 @@ const QString& StoreSession::error() const
 
 bool StoreSession::start()
 {
-       shared_lock<shared_mutex> lock(session_.signals_mutex());
-       const unordered_set< shared_ptr<view::Signal> > &sigs(session_.signals());
+       const unordered_set< shared_ptr<view::Signal> > sigs(session_.signals());
 
        // Add enabled channels to the data set
        set< shared_ptr<data::SignalData> > data_set;
@@ -140,8 +143,9 @@ bool StoreSession::start()
 
                map<string, Glib::VariantBase> options = options_;
 
-               output_stream_.open(file_name_, ios_base::binary |
-                       ios_base::trunc | ios_base::out);
+               if (!output_format_->test_flag(OutputFlag::INTERNAL_IO_HANDLING))
+                       output_stream_.open(file_name_, ios_base::binary |
+                                       ios_base::trunc | ios_base::out);
 
                output_ = output_format_->create_output(file_name_, device, options);
                auto meta = context->create_meta_packet(