From: Uwe Hermann <redacted>
Date: Sat, 14 May 2016 14:24:23 +0000 (+0200)
Subject: output/wav: Drop support for SR_DF_ANALOG_OLD.
X-Git-Tag: libsigrok-0.5.0~310
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=c1634386178730fa7b3814272c49cb89d55a0766;p=libsigrok.git

output/wav: Drop support for SR_DF_ANALOG_OLD.
---

diff --git a/src/output/wav.c b/src/output/wav.c
index f991cbfd..b266b203 100644
--- a/src/output/wav.c
+++ b/src/output/wav.c
@@ -237,7 +237,6 @@ 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_analog *analog;
 	const struct sr_config *src;
 	struct sr_channel *ch;
@@ -262,7 +261,6 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 			outc->samplerate = g_variant_get_uint64(src->data);
 		}
 		break;
-	case SR_DF_ANALOG_OLD:
 	case SR_DF_ANALOG:
 		if (!outc->header_done) {
 			*out = gen_header(o);
@@ -270,25 +268,16 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 		} else
 			*out = g_string_sized_new(512);
 
-		analog_old = packet->payload;
 		analog = packet->payload;
-
-		if (packet->type == SR_DF_ANALOG_OLD) {
-			num_samples = analog_old->num_samples;
-			channels = analog_old->channels;
-			num_channels = g_slist_length(analog_old->channels);
-			data = analog_old->data;
-		} else {
-			num_samples = analog->num_samples;
-			channels = analog->meaning->channels;
-			num_channels = g_slist_length(analog->meaning->channels);
-			if (!(data = g_try_realloc(outc->fdata, sizeof(float) * num_samples * num_channels)))
-				return SR_ERR_MALLOC;
-			outc->fdata = data;
-			ret = sr_analog_to_float(analog, data);
-			if (ret != SR_OK)
-				return ret;
-		}
+		num_samples = analog->num_samples;
+		channels = analog->meaning->channels;
+		num_channels = g_slist_length(analog->meaning->channels);
+		if (!(data = g_try_realloc(outc->fdata, sizeof(float) * num_samples * num_channels)))
+			return SR_ERR_MALLOC;
+		outc->fdata = data;
+		ret = sr_analog_to_float(analog, data);
+		if (ret != SR_OK)
+			return ret;
 
 		if (num_samples == 0)
 			return SR_OK;
@@ -300,7 +289,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 		}
 
 		if (num_samples > outc->chanbuf_size) {
-			if (realloc_chanbufs(o, analog_old->num_samples) != SR_OK)
+			if (realloc_chanbufs(o, analog->num_samples) != SR_OK)
 				return SR_ERR_MALLOC;
 		}