X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=9ad494e2be3e34a2fced82ea34a961f354358483;hp=5eaff586b6ff787a7fc6a9bb4308a3b2deac3132;hb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;hpb=d23445348bf04a698e062a3b917360313ecbcaad

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 5eaff586..9ad494e2 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -59,7 +59,7 @@ StoreSession::~StoreSession()
 	wait();
 }
 
-pair<uint64_t, uint64_t> StoreSession::progress() const
+pair<int, int> StoreSession::progress() const
 {
 	return make_pair(_units_stored.load(), _unit_count.load());
 }
@@ -110,26 +110,26 @@ bool StoreSession::start()
 	const shared_ptr<data::LogicSnapshot> snapshot(snapshots.front());
 	assert(snapshot);
 
-	// Make a list of probes
-	char **const probes = new char*[sigs.size() + 1];
+	// 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);
-		probes[i] = strdup(sig->get_name().toUtf8().constData());
+		channels[i] = strdup(sig->get_name().toUtf8().constData());
 	}
-	probes[sigs.size()] = NULL;
+	channels[sigs.size()] = NULL;
 
 	// Begin storing
-	if (sr_session_save_init(_file_name.c_str(),
-		data->samplerate(), probes) != SR_OK) {
+	if (sr_session_save_init(SigSession::_sr_session, _file_name.c_str(),
+		data->samplerate(), channels) != SR_OK) {
 		_error = tr("Error while saving.");
 		return false;
 	}
 
-	// Delete the probes array
+	// Delete the channels array
 	for (size_t i = 0; i <= sigs.size(); i++)
-		free(probes[i]);
-	delete[] probes;
+		free(channels[i]);
+	delete[] channels;
 
 	_thread = std::thread(&StoreSession::store_proc, this, snapshot);
 	return true;
@@ -150,7 +150,8 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
 {
 	assert(snapshot);
 
-	uint64_t start_sample = 0;
+	uint64_t start_sample = 0, sample_count;
+	unsigned progress_scale = 0;
 
 	/// TODO: Wrap this in a std::unique_ptr when we transition to C++11
 	uint8_t *const data = new uint8_t[BlockSize];
@@ -159,27 +160,34 @@ void StoreSession::store_proc(shared_ptr<data::LogicSnapshot> snapshot)
 	const int unit_size = snapshot->unit_size();
 	assert(unit_size != 0);
 
-	_unit_count = snapshot->get_sample_count();
+	sample_count = snapshot->get_sample_count();
+
+	// Qt needs the progress values to fit inside an int.  If they would
+	// not, scale the current and max values down until they do.
+	while ((sample_count >> progress_scale) > INT_MAX)
+		progress_scale ++;
+
+	_unit_count = sample_count >> progress_scale;
 
 	const unsigned int samples_per_block = BlockSize / unit_size;
 
-	while (!_interrupt && start_sample < _unit_count)
+	while (!_interrupt && start_sample < sample_count)
 	{
 		progress_updated();
 
 		const uint64_t end_sample = min(
-			start_sample + samples_per_block, _unit_count.load());
+			start_sample + samples_per_block, sample_count);
 		snapshot->get_samples(data, start_sample, end_sample);
 
-		if(sr_session_append(_file_name.c_str(), data, unit_size,
-			end_sample - start_sample) != SR_OK)
+		if(sr_session_append(SigSession::_sr_session, _file_name.c_str(), data,
+			unit_size, end_sample - start_sample) != SR_OK)
 		{
 			_error = tr("Error while saving.");
 			break;
 		}
 
 		start_sample = end_sample;
-		_units_stored = start_sample;
+		_units_stored = start_sample >> progress_scale;
 	}
 
 	_unit_count = 0;