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

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index d209e1a..645b92f 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -242,8 +242,9 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 	using pv::data::decode::Annotation;
 
 	GSList *l, *ll;
-	int row, ann_class;
+	int row, ann_class, idx = 0;
 	struct srd_decoder_annotation_row *ann_row;
+	struct srd_decoder *decc;
 
 	assert(pdata);
 	assert(decoder);
@@ -254,10 +255,15 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 
 	Annotation a = Annotation(pdata);
 
-	const shared_ptr<decode::Decoder> &dec = *d->stack().begin();
+	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 = dec->decoder()->annotation_rows, row = 0; l;
-			l = l->next, row++)
+	for (l = decc->annotation_rows, row = 0; l; l = l->next, row++)
 	{
 		ann_row = (struct srd_decoder_annotation_row *)l->data;