X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=c2135ab3383564b007c70c3484d0d59155b4eaeb;hp=55b199a3380bfee054f1152000c7c87c380b55c9;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=038a14278afb24e10cd59991c2cafd97264fd3a5

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 55b199a..c2135ab 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -55,7 +55,6 @@ using std::pair;
 using std::set;
 using std::shared_ptr;
 using std::string;
-using std::thread;
 using std::unordered_set;
 using std::vector;
 
@@ -69,12 +68,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),
@@ -240,13 +239,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();
@@ -258,8 +257,6 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 				const float *adata =
 					asegment->get_samples(start_sample_, start_sample_ + packet_len);
 
-				// The srzip format currently only supports packets with one
-				// analog channel. See zip_append_analog() in srzip.c
 				auto analog = context->create_analog_packet(
 					vector<shared_ptr<sigrok::Channel> >{achannel},
 					(float *)adata, packet_len,