Ported Annotation to new srd_proto_data_annotation structure

diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp
index 339b46afb0b36fb11600fae64d87c6b7038461fb..797b428ae781354afe66b71a2860a89ef408a72e 100644 (file)
--- a/pv/view/decode/annotation.cpp
+++ b/pv/view/decode/annotation.cpp
@@ -53,10 +53,14 @@ const QColor Annotation::Colours[7] = {
 
 Annotation::Annotation(const srd_proto_data *const pdata) :
        _start_sample(pdata->start_sample),
-       _end_sample(pdata->end_sample),
-       _format(pdata->ann_format)
+       _end_sample(pdata->end_sample)
 {
-       const char *const *annotations = (char**)pdata->data;
+       assert(pdata);
+       const srd_proto_data_annotation *const pda =
+               (const srd_proto_data_annotation*)pdata->data;
+       assert(pda);
+
+       const char *const *annotations = (char**)pda->ann_text;
        while(*annotations) {
                _annotations.push_back(QString(*annotations));
                annotations++;