output/wav: Drop support for SR_DF_ANALOG_OLD.
This commit is contained in:
parent
6cdb1da6c9
commit
c163438617
|
@ -237,7 +237,6 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
|
||||||
{
|
{
|
||||||
struct out_context *outc;
|
struct out_context *outc;
|
||||||
const struct sr_datafeed_meta *meta;
|
const struct sr_datafeed_meta *meta;
|
||||||
const struct sr_datafeed_analog_old *analog_old;
|
|
||||||
const struct sr_datafeed_analog *analog;
|
const struct sr_datafeed_analog *analog;
|
||||||
const struct sr_config *src;
|
const struct sr_config *src;
|
||||||
struct sr_channel *ch;
|
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);
|
outc->samplerate = g_variant_get_uint64(src->data);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SR_DF_ANALOG_OLD:
|
|
||||||
case SR_DF_ANALOG:
|
case SR_DF_ANALOG:
|
||||||
if (!outc->header_done) {
|
if (!outc->header_done) {
|
||||||
*out = gen_header(o);
|
*out = gen_header(o);
|
||||||
|
@ -270,15 +268,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
|
||||||
} else
|
} else
|
||||||
*out = g_string_sized_new(512);
|
*out = g_string_sized_new(512);
|
||||||
|
|
||||||
analog_old = packet->payload;
|
|
||||||
analog = 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;
|
num_samples = analog->num_samples;
|
||||||
channels = analog->meaning->channels;
|
channels = analog->meaning->channels;
|
||||||
num_channels = g_slist_length(analog->meaning->channels);
|
num_channels = g_slist_length(analog->meaning->channels);
|
||||||
|
@ -288,7 +278,6 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
|
||||||
ret = sr_analog_to_float(analog, data);
|
ret = sr_analog_to_float(analog, data);
|
||||||
if (ret != SR_OK)
|
if (ret != SR_OK)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
|
||||||
|
|
||||||
if (num_samples == 0)
|
if (num_samples == 0)
|
||||||
return SR_OK;
|
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 (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;
|
return SR_ERR_MALLOC;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue