Fix various sample/time limit regressions.

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

diff --git a/src/input/wav.c b/src/input/wav.c
index a07fcd100ce51b2d09b22f523c5eae90d1f1acaf..243fd4ca2d984451a8cf68e889e187a03a607c31 100644 (file)
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -31,7 +31,7 @@
 #define LOG_PREFIX "input/wav"
 
 /* How many bytes at a time to process and send to the session bus. */
-#define CHUNK_SIZE 4096
+#define CHUNK_SIZE               4096
 
 /* Minimum size of header + 1 8-bit mono PCM sample. */
 #define MIN_DATA_CHUNK_OFFSET    45
@@ -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)
 {
        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;
        float fdata[CHUNK_SIZE];
        int total_samples, samplenum;
@@ -223,14 +226,17 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
                s += inc->unitsize;
                d += inc->unitsize;
        }
-       packet.type = SR_DF_ANALOG_OLD;
+
+       /* TODO: Use proper 'digits' value for this device (and its modes). */
+       sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
+       packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
-       analog.channels = in->sdi->channels;
        analog.num_samples = num_samples;
-       analog.mq = 0;
-       analog.mqflags = 0;
-       analog.unit = 0;
        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);
 }