pv::data::DecoderStack: Set _row for each annotation.

For each annotation, keep track of the "annotation row" it belongs to.

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index f08e349240571cabf18f64259ca205daaef8bcb1..d209e1a9b19e1f783f46baa0b8b9bb5a9320dd65 100644 (file)
--- 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;
 
 {
        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);
        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();
 }
 
        d->new_decode_data();
 }