X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=1a27e5654dd9e8e66ec96fb0d773a96ad83536f0;hp=ad106bb9f5882f79f72f965b2d2822ca7e7d958b;hb=53a69fd4e21c9a872a265626b00a20365c49076f;hpb=4764bc4d14069978282c9cf43aad03d7558aeb9f

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index ad106bb9..1a27e565 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -22,9 +22,11 @@
 
 #include "storesession.hpp"
 
+#include <pv/devicemanager.hpp>
 #include <pv/session.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
+#include <pv/devices/device.hpp>
 #include <pv/view/signal.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -34,8 +36,10 @@ using boost::shared_mutex;
 
 using std::deque;
 using std::dynamic_pointer_cast;
+using std::ios_base;
 using std::lock_guard;
 using std::make_pair;
+using std::map;
 using std::min;
 using std::mutex;
 using std::pair;
@@ -43,8 +47,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;
@@ -54,9 +61,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),
@@ -86,7 +95,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()) {
@@ -122,11 +132,22 @@ bool StoreSession::start()
 
 	// Begin storing
 	try {
-		auto context = session_.session()->context();
-		auto device = session_.device();
-		output_ = output_format_->create_output(device,
-			{{"filename",
-				Glib::Variant<Glib::ustring>::create(file_name_)}});
+		const auto context = session_.device_manager().context();
+		auto device = session_.device()->device();
+
+		map<string, Glib::VariantBase> options = options_;
+
+		// If the output has the capability to write files, use it.
+		// Otherwise, open the output stream.
+		const auto opt_list = output_format_->options();
+		if (opt_list.find("filename") != opt_list.end())
+			options["filename"] =
+				Glib::Variant<Glib::ustring>::create(file_name_);
+		else
+			output_stream_.open(file_name_, ios_base::binary |
+				ios_base::trunc | ios_base::out);
+
+		output_ = output_format_->create_output(device, options);
 		auto meta = context->create_meta_packet(
 			{{ConfigKey::SAMPLERATE, Glib::Variant<guint64>::create(
 				segment->samplerate())}});
@@ -187,9 +208,11 @@ 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);
-			output_->receive(logic);
+			const string data = output_->receive(logic);
+			if (output_stream_.is_open())
+				output_stream_ << data;
 		} catch (Error error) {
 			error_ = tr("Error while saving.");
 			break;
@@ -205,6 +228,7 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
 	progress_updated();
 
 	output_.reset();
+	output_stream_.close();
 
 	delete[] data;
 }