BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

input/wav: Convert to SR_DF_ANALOG.

This commit is contained in:
Uwe Hermann 2016-05-14 16:20:55 +02:00
parent 716d6dfcac
commit 0f33aaef54
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/input/wav.c
View File

@ -184,7 +184,10 @@ static int find_data_chunk(GString *buf, int initial_offset)
static void send_chunk(const struct sr_input *in, int offset, int num_samples) static void send_chunk(const struct sr_input *in, int offset, int num_samples)
{ {
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_analog_old analog; struct sr_datafeed_analog analog;
struct sr_analog_encoding encoding;
struct sr_analog_meaning meaning;
struct sr_analog_spec spec;
struct context *inc; struct context *inc;
float fdata[CHUNK_SIZE]; float fdata[CHUNK_SIZE];
int total_samples, samplenum; int total_samples, samplenum;
@ -223,14 +226,16 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
s += inc->unitsize; s += inc->unitsize;
d += inc->unitsize; d += inc->unitsize;
} }
packet.type = SR_DF_ANALOG_OLD;
sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
packet.type = SR_DF_ANALOG;
packet.payload = &analog; packet.payload = &analog;
analog.channels = in->sdi->channels;
analog.num_samples = num_samples; analog.num_samples = num_samples;
analog.mq = 0;
analog.mqflags = 0;
analog.unit = 0;
analog.data = fdata; analog.data = fdata;
analog.meaning->channels = in->sdi->channels;
analog.meaning->mq = 0;
analog.meaning->mqflags = 0;
analog.meaning->unit = 0;
sr_session_send(in->sdi, &packet); sr_session_send(in->sdi, &packet);
} }