]> sigrok.org Git - sigrok-test.git/commitdiff
Replace ann_format with ann_class.
authorUwe Hermann <redacted>
Mon, 15 Sep 2014 18:28:21 +0000 (20:28 +0200)
committerUwe Hermann <redacted>
Mon, 15 Sep 2014 18:28:21 +0000 (20:28 +0200)
The naming has been changed to "annotation class" a while ago.

decoder/runtc.c

index 364e43f284e89bb4f6e2de5081ea15fe49796f64..f58e0046a23d8f5ba29880b76a445147ac4a1f49 100644 (file)
@@ -252,14 +252,14 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data)
                /* This is not the PD selected for output. */
                return;
 
-       if (op->class_idx != -1 && op->class_idx != pda->ann_format)
+       if (op->class_idx != -1 && op->class_idx != pda->ann_class)
                /*
                 * This output takes a specific annotation class,
                 * but not the one that just came in.
                 */
                return;
 
-       dec_ann = g_slist_nth_data(dec->annotations, pda->ann_format);
+       dec_ann = g_slist_nth_data(dec->annotations, pda->ann_class);
        line = g_string_sized_new(256);
        g_string_printf(line, "%" PRIu64 "-%" PRIu64 " %s: %s:",
                        pdata->start_sample, pdata->end_sample,