SR_DF_ANALOG2 and sr_datafeed_analog2 renames.

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

diff --git a/src/output/wav.c b/src/output/wav.c
index 212574da5abb8fb45009d85ec29794b0dcbb0328..507e0e77b53700ad2e9ac71cac01b3730a008e34 100644 (file)
--- a/src/output/wav.c
+++ b/src/output/wav.c
@@ -237,7 +237,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
        struct out_context *outc;
        const struct sr_datafeed_meta *meta;
        const struct sr_datafeed_analog_old *analog_old;
-       const struct sr_datafeed_analog2 *analog2;
+       const struct sr_datafeed_analog *analog;
        const struct sr_config *src;
        struct sr_channel *ch;
        GSList *l;
@@ -262,7 +262,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                }
                break;
        case SR_DF_ANALOG_OLD:
-       case SR_DF_ANALOG2:
+       case SR_DF_ANALOG:
                if (!outc->header_done) {
                        *out = gen_header(o);
                        outc->header_done = TRUE;
@@ -270,7 +270,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                        *out = g_string_sized_new(512);
 
                analog_old = packet->payload;
-               analog2 = packet->payload;
+               analog = packet->payload;
 
                if (packet->type == SR_DF_ANALOG_OLD) {
                        num_samples = analog_old->num_samples;
@@ -278,11 +278,11 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                        num_channels = g_slist_length(analog_old->channels);
                        data = analog_old->data;
                } else {
-                       num_samples = analog2->num_samples;
-                       channels = analog2->meaning->channels;
-                       num_channels = g_slist_length(analog2->meaning->channels);
+                       num_samples = analog->num_samples;
+                       channels = analog->meaning->channels;
+                       num_channels = g_slist_length(analog->meaning->channels);
                        data = g_malloc(sizeof(float) * num_samples * num_channels);
-                       ret = sr_analog_to_float(analog2, data);
+                       ret = sr_analog_to_float(analog, data);
                        if (ret != SR_OK)
                                return ret;
                }