X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=20fa19fef41d744d6da784620884a84256bdc30f;hb=78b0af3ebcbeab50e1c1634af729c0a7f97fb435;hp=d58fd4981d3f5830f8c3c64b92f95d7347da92a4;hpb=c1035a1452fa2aec5414975e83e531c10504b80c;p=pulseview.git

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index d58fd49..20fa19f 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -45,8 +45,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 +59,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 +93,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()) {
@@ -127,7 +133,7 @@ bool StoreSession::start()
 		auto context = session_.session()->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.