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

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 9d80e9b..645b92f 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -190,7 +190,7 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 		if (!di)
 		{
-			_error_message = tr("Failed to initialise decoder");
+			_error_message = tr("Failed to create decoder instance");
 			srd_session_destroy(session);
 			return;
 		}
@@ -223,7 +223,7 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 		if (srd_session_send(session, i, i + sample_count,
 				chunk, chunk_end - i) != SRD_OK) {
-			_error_message = tr("Failed to initialise decoder");
+			_error_message = tr("Decoder reported an error");
 			break;
 		}
 
@@ -241,13 +241,41 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
 	using pv::data::decode::Annotation;
 
+	GSList *l, *ll;
+	int row, ann_class, idx = 0;
+	struct srd_decoder_annotation_row *ann_row;
+	struct srd_decoder *decc;
+
 	assert(pdata);
 	assert(decoder);
 
 	DecoderStack *const d = (DecoderStack*)decoder;
 
 	lock_guard<mutex> lock(d->_mutex);
-	d->_annotations.push_back(Annotation(pdata));
+
+	Annotation a = Annotation(pdata);
+
+	decc = pdata->pdo->di->decoder;
+	BOOST_FOREACH(const shared_ptr<decode::Decoder> &dec, d->stack()) {
+		if (dec->decoder() == decc)
+			break;
+		idx++;
+	}
+	a.set_pd_index(idx);
+
+	for (l = decc->annotation_rows, row = 0; l; l = l->next, row++)
+	{
+		ann_row = (struct srd_decoder_annotation_row *)l->data;
+
+		for (ll = ann_row->ann_classes, ann_class = 0; ll;
+					ll = ll->next, ann_class++)
+		{
+			if (GPOINTER_TO_INT(ll->data) == a.format())
+				a.set_row(row);
+		}
+	}
+
+	d->_annotations.push_back(a);
 
 	d->new_decode_data();
 }