X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=9d80e9b300e26782cc7873d8876ceb6f1372e892;hb=375b6216bdcae93f63538968be84fe514f8b90e5;hp=c2ae9116856161a94826db1adeadcfe9366d647b;hpb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2;p=pulseview.git

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index c2ae911..9d80e9b 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -35,8 +35,13 @@
 #include <pv/data/decode/annotation.h>
 #include <pv/view/logicsignal.h>
 
-using namespace boost;
-using namespace std;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::deque;
+using std::min;
+using std::list;
+using std::vector;
 
 namespace pv {
 namespace data {
@@ -167,13 +172,17 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
 		snapshots.front();
-	const int64_t sample_count = snapshot->get_sample_count() - 1;
+	const int64_t sample_count = snapshot->get_sample_count();
+	const unsigned int chunk_sample_count =
+		DecodeChunkLength / snapshot->unit_size();
+
+	// Clear error message upon every new session run
+	_error_message = QString();
 
 	// Create the session
 	srd_session_new(&session);
 	assert(session);
 
-
 	// Create the decoders
 	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, _stack)
 	{
@@ -202,13 +211,14 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 	srd_session_start(session);
 
 	for (int64_t i = 0;
-		!this_thread::interruption_requested() && i < sample_count;
-		i += DecodeChunkLength)
+		!boost::this_thread::interruption_requested() &&
+			i < sample_count;
+		i += chunk_sample_count)
 	{
 		lock_guard<mutex> decode_lock(_global_decode_mutex);
 
 		const int64_t chunk_end = min(
-			i + DecodeChunkLength, sample_count);
+			i + chunk_sample_count, sample_count);
 		snapshot->get_samples(chunk, i, chunk_end);
 
 		if (srd_session_send(session, i, i + sample_count,