X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=d209e1a9b19e1f783f46baa0b8b9bb5a9320dd65;hb=6d8b05622f1e422c7193656c9eac3ebae5b6b934;hp=f08e349240571cabf18f64259ca205daaef8bcb1;hpb=3f53457656c72dc870f603677843613b708b4ea1;p=pulseview.git

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index f08e3492..d209e1a9 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -241,13 +241,35 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
 	using pv::data::decode::Annotation;
 
+	GSList *l, *ll;
+	int row, ann_class;
+	struct srd_decoder_annotation_row *ann_row;
+
 	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);
+
+	const shared_ptr<decode::Decoder> &dec = *d->stack().begin();
+
+	for (l = dec->decoder()->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();
 }