SR_DF_ANALOG_OLD and sr_datafeed_analog_old renames.

[libsigrok.git] / src / output / analog.c

diff --git a/src/output/analog.c b/src/output/analog.c
index 4018ec888659f797231f48fbca4d97eb2df1be62..e2667fd84fec9a82b8d75ef7141d5359570bc63b 100644 (file)
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -278,7 +278,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                GString **out)
 {
        struct context *ctx;
-       const struct sr_datafeed_analog *analog;
+       const struct sr_datafeed_analog_old *analog_old;
        const struct sr_datafeed_analog2 *analog2;
        struct sr_channel *ch;
        GSList *l;
@@ -299,16 +299,16 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
        case SR_DF_FRAME_END:
                *out = g_string_new("FRAME-END\n");
                break;
-       case SR_DF_ANALOG:
-               analog = packet->payload;
-               fdata = (float *)analog->data;
+       case SR_DF_ANALOG_OLD:
+               analog_old = packet->payload;
+               fdata = (float *)analog_old->data;
                *out = g_string_sized_new(512);
-               num_channels = g_slist_length(analog->channels);
-               for (si = 0; si < analog->num_samples; si++) {
-                       for (l = analog->channels, c = 0; l; l = l->next, c++) {
+               num_channels = g_slist_length(analog_old->channels);
+               for (si = 0; si < analog_old->num_samples; si++) {
+                       for (l = analog_old->channels, c = 0; l; l = l->next, c++) {
                                ch = l->data;
                                g_string_append_printf(*out, "%s: ", ch->name);
-                               fancyprint(analog->unit, analog->mqflags,
+                               fancyprint(analog_old->unit, analog_old->mqflags,
                                                fdata[si * num_channels + c], *out);
                        }
                }