X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=3c5d899f2ce71a410a5e8845dbecbb703d2389e1;hp=b0f33f4a7a2ae674f2253ca16bedf11362475dfb;hb=472a80c58cfdbd37cb00b5ba2ef4bcd923f9b54b;hpb=9daf2d80edb259028e26301d49d02752a115d6f6

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index b0f33f4a..3c5d899f 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -55,13 +55,11 @@ using std::pair;
 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::ChannelType;
 using sigrok::ConfigKey;
 using sigrok::Error;
 using sigrok::OutputFormat;
@@ -69,12 +67,12 @@ using sigrok::OutputFlag;
 
 namespace pv {
 
-const size_t StoreSession::BlockSize = 1024 * 1024;
+const size_t StoreSession::BlockSize = 10 * 1024 * 1024;
 
-StoreSession::StoreSession(const std::string &file_name,
+StoreSession::StoreSession(const string &file_name,
 	const shared_ptr<OutputFormat> &output_format,
 	const map<string, VariantBase> &options,
-	const std::pair<uint64_t, uint64_t> sample_range,
+	const pair<uint64_t, uint64_t> sample_range,
 	const Session &session) :
 	file_name_(file_name),
 	output_format_(output_format),
@@ -116,7 +114,7 @@ bool StoreSession::start()
 		if (!signal->enabled())
 			continue;
 
-		if (signal->type() == ChannelType::LOGIC) {
+		if (signal->type() == data::SignalBase::LogicChannel) {
 			// All logic channels share the same data segments
 			shared_ptr<data::Logic> ldata = signal->logic_data();
 
@@ -132,7 +130,7 @@ bool StoreSession::start()
 			any_segment = lsegment;
 		}
 
-		if (signal->type() == ChannelType::ANALOG) {
+		if (signal->type() == data::SignalBase::AnalogChannel) {
 			// Each analog channel has its own segments
 			shared_ptr<data::Analog> adata = signal->analog_data();
 
@@ -240,13 +238,13 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 	unit_count_ = sample_count_ >> progress_scale;
 
 	const unsigned int samples_per_block =
-		std::min(asamples_per_block, lsamples_per_block);
+		min(asamples_per_block, lsamples_per_block);
 
 	while (!interrupt_ && sample_count_) {
 		progress_updated();
 
 		const uint64_t packet_len =
-			std::min((uint64_t)samples_per_block, sample_count_);
+			min((uint64_t)samples_per_block, sample_count_);
 
 		try {
 			const auto context = session_.device_manager().context();