X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=2e90871cbcd3a6bda936e6efb863df1a21135c20;hp=d5355cba3bbe03c71aeb2bf27a2bc654f72479bb;hb=f65cd27bdbf70644052dd43dac4bbe9403f4dfee;hpb=e8d009288de28cb194bc7964f96677c2baf900c9

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index d5355cba..2e90871c 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -20,15 +20,18 @@
 
 #include <cassert>
 
-#include "storesession.h"
+#include "storesession.hpp"
 
-#include <pv/sigsession.h>
-#include <pv/data/logic.h>
-#include <pv/data/logicsnapshot.h>
-#include <pv/view/signal.h>
+#include <pv/session.hpp>
+#include <pv/data/logic.hpp>
+#include <pv/data/logicsnapshot.hpp>
+#include <pv/view/signal.hpp>
 
 #include <libsigrok/libsigrok.hpp>
 
+using boost::shared_lock;
+using boost::shared_mutex;
+
 using std::deque;
 using std::dynamic_pointer_cast;
 using std::lock_guard;
@@ -42,6 +45,7 @@ using std::string;
 using std::thread;
 using std::vector;
 
+using sigrok::ConfigKey;
 using sigrok::Error;
 
 namespace pv {
@@ -49,12 +53,12 @@ namespace pv {
 const size_t StoreSession::BlockSize = 1024 * 1024;
 
 StoreSession::StoreSession(const std::string &file_name,
-	const SigSession &session) :
-	_file_name(file_name),
-	_session(session),
-	_interrupt(false),
-	_units_stored(0),
-	_unit_count(0)
+	const Session &session) :
+	file_name_(file_name),
+	session_(session),
+	interrupt_(false),
+	units_stored_(0),
+	unit_count_(0)
 {
 }
 
@@ -65,39 +69,39 @@ StoreSession::~StoreSession()
 
 pair<int, int> StoreSession::progress() const
 {
-	return make_pair(_units_stored.load(), _unit_count.load());
+	return make_pair(units_stored_.load(), unit_count_.load());
 }
 
 const QString& StoreSession::error() const
 {
-	lock_guard<mutex> lock(_mutex);
-	return _error;
+	lock_guard<mutex> lock(mutex_);
+	return error_;
 }
 
 bool StoreSession::start()
 {
 	set< shared_ptr<data::SignalData> > data_set =
-		_session.get_data();
-	const vector< shared_ptr<view::Signal> > sigs =
-		_session.get_signals();
+		session_.get_data();
+
+	shared_lock<shared_mutex> lock(session_.signals_mutex());
+	const vector< shared_ptr<view::Signal> > &sigs(session_.signals());
 
 	// Check we have logic data
 	if (data_set.empty() || sigs.empty()) {
-		_error = tr("No data to save.");
+		error_ = tr("No data to save.");
 		return false;
 	}
 
 	if (data_set.size() > 1) {
-		_error = tr("PulseView currently only has support for "
+		error_ = tr("PulseView currently only has support for "
 			"storing a single data stream.");
 		return false;
 	}
 
 	// Get the logic data
-	//shared_ptr<data::SignalData
 	shared_ptr<data::Logic> data;
 	if (!(data = dynamic_pointer_cast<data::Logic>(*data_set.begin()))) {
-		_error = tr("PulseView currently only has support for "
+		error_ = tr("PulseView currently only has support for "
 			"storing a logic data.");
 		return false;
 	}
@@ -107,48 +111,43 @@ bool StoreSession::start()
 		data->get_snapshots();
 
 	if (snapshots.empty()) {
-		_error = tr("No snapshots to save.");
+		error_ = tr("No snapshots to save.");
 		return false;
 	}
 
 	const shared_ptr<data::LogicSnapshot> snapshot(snapshots.front());
 	assert(snapshot);
 
-	// Make a list of channels
-	char **const channels = new char*[sigs.size() + 1];
-	for (size_t i = 0; i < sigs.size(); i++) {
-		shared_ptr<view::Signal> sig(sigs[i]);
-		assert(sig);
-		channels[i] = strdup(sig->get_name().toUtf8().constData());
-	}
-	channels[sigs.size()] = NULL;
-
 	// Begin storing
 	try {
-		SigSession::_sr_session->begin_save(_file_name);
+		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_)}});
+		auto meta = context->create_meta_packet(
+			{{ConfigKey::SAMPLERATE,
+				Glib::Variant<guint64>::create(data->samplerate())}});
+		output_->receive(meta);
 	} catch (Error error) {
-		_error = tr("Error while saving.");
+		error_ = tr("Error while saving.");
 		return false;
 	}
 
-	// Delete the channels array
-	for (size_t i = 0; i <= sigs.size(); i++)
-		free(channels[i]);
-	delete[] channels;
-
-	_thread = std::thread(&StoreSession::store_proc, this, snapshot);
+	thread_ = std::thread(&StoreSession::store_proc, this, snapshot);
 	return true;
 }
 
 void StoreSession::wait()
 {
-	if (_thread.joinable())
-		_thread.join();
+	if (thread_.joinable())
+		thread_.join();
 }
 
 void StoreSession::cancel()
 {
-	_interrupt = true;
+	interrupt_ = true;
 }
 
 void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
@@ -172,11 +171,11 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
 	while ((sample_count >> progress_scale) > INT_MAX)
 		progress_scale ++;
 
-	_unit_count = sample_count >> progress_scale;
+	unit_count_ = sample_count >> progress_scale;
 
 	const unsigned int samples_per_block = BlockSize / unit_size;
 
-	while (!_interrupt && start_sample < sample_count)
+	while (!interrupt_ && start_sample < sample_count)
 	{
 		progress_updated();
 
@@ -187,19 +186,25 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
 		size_t length = end_sample - start_sample;
 
 		try {
-			SigSession::_sr_session->append(data, length, unit_size);
+			auto context = session_.session()->context();
+			auto logic = context->create_logic_packet(data, length, unit_size);
+			output_->receive(logic);
 		} catch (Error error) {
-			_error = tr("Error while saving.");
+			error_ = tr("Error while saving.");
 			break;
 		}
 
 		start_sample = end_sample;
-		_units_stored = start_sample >> progress_scale;
+		units_stored_ = start_sample >> progress_scale;
 	}
 
-	_unit_count = 0;
+	// Zeroing the progress variables indicates completion
+	units_stored_ = unit_count_ = 0;
+
 	progress_updated();
 
+	output_.reset();
+
 	delete[] data;
 }