X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=92f64f5ba12a328b56bad5728ec8db14c3000b82;hb=ef2986c0f3e0ce3346a28d86348d8cc1746e9b66;hp=6ecde13aff92a5594eb3a0f931687e5fa7170d9d;hpb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b;p=pulseview.git

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 6ecde13..92f64f5 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -27,15 +27,17 @@
 #include <pv/data/logicsegment.hpp>
 #include <pv/view/signal.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using boost::shared_lock;
 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;
@@ -45,16 +47,22 @@ using std::string;
 using std::thread;
 using std::vector;
 
+using Glib::VariantBase;
+
 using sigrok::ConfigKey;
 using sigrok::Error;
+using sigrok::OutputFormat;
 
 namespace pv {
 
 const size_t StoreSession::BlockSize = 1024 * 1024;
 
 StoreSession::StoreSession(const std::string &file_name,
-	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),
@@ -121,11 +129,21 @@ bool StoreSession::start()
 	// Begin storing
 	try {
 		auto context = session_.session()->context();
-		auto output_format = context->output_formats()["srzip"];
 		auto device = session_.device();
-		output_ = output_format->create_output(device,
-			{{"filename",
-				Glib::Variant<Glib::ustring>::create(file_name_)}});
+
+		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())}});
@@ -188,7 +206,9 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
 		try {
 			auto context = session_.session()->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;
@@ -204,6 +224,7 @@ void StoreSession::store_proc(shared_ptr<data::LogicSegment> segment)
 	progress_updated();
 
 	output_.reset();
+	output_stream_.close();
 
 	delete[] data;
 }