]> sigrok.org Git - pulseview.git/blobdiff - pv/storesession.cpp
LogicSignal: Tidied up forward declarations
[pulseview.git] / pv / storesession.cpp
index d58fd4981d3f5830f8c3c64b92f95d7347da92a4..1dad2d8052e360e5f3b9ff70e4edf4da04d9b7dd 100644 (file)
@@ -22,6 +22,7 @@
 
 #include "storesession.hpp"
 
+#include <pv/devicemanager.hpp>
 #include <pv/session.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
@@ -45,8 +46,11 @@ using std::set;
 using std::shared_ptr;
 using std::string;
 using std::thread;
+using std::unordered_set;
 using std::vector;
 
+using Glib::VariantBase;
+
 using sigrok::ConfigKey;
 using sigrok::Error;
 using sigrok::OutputFormat;
@@ -56,9 +60,11 @@ namespace pv {
 const size_t StoreSession::BlockSize = 1024 * 1024;
 
 StoreSession::StoreSession(const std::string &file_name,
-       const shared_ptr<OutputFormat> &output_format, const Session &session) :
+       const shared_ptr<OutputFormat> &output_format,
+       const map<string, VariantBase> &options, const Session &session) :
        file_name_(file_name),
        output_format_(output_format),
+       options_(options),
        session_(session),
        interrupt_(false),
        units_stored_(0),
@@ -88,7 +94,8 @@ bool StoreSession::start()
                session_.get_data();
 
        shared_lock<shared_mutex> lock(session_.signals_mutex());
-       const vector< shared_ptr<view::Signal> > &sigs(session_.signals());
+       const unordered_set< shared_ptr<view::Signal> > &sigs(
+               session_.signals());
 
        // Check we have logic data
        if (data_set.empty() || sigs.empty()) {
@@ -124,10 +131,10 @@ bool StoreSession::start()
 
        // Begin storing
        try {
-               auto context = session_.session()->context();
+               const auto context = session_.device_manager().context();
                auto device = session_.device();
 
-               map<string, Glib::VariantBase> options;
+               map<string, Glib::VariantBase> options = options_;
 
                // If the output has the capability to write files, use it.
                // Otherwise, open the output stream.
@@ -200,7 +207,7 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
                size_t length = end_sample - start_sample;
 
                try {
-                       auto context = session_.session()->context();
+                       const auto context = session_.device_manager().context();
                        auto logic = context->create_logic_packet(data, length, unit_size);
                        const string data = output_->receive(logic);
                        if (output_stream_.is_open())