SR_DF_ANALOG_OLD and sr_datafeed_analog_old renames.

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

diff --git a/src/output/analog.c b/src/output/analog.c
index 9d6f56a3e6f9f70570d3a6a19205a9b2437f2d69..e2667fd84fec9a82b8d75ef7141d5359570bc63b 100644 (file)
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -277,7 +278,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                GString **out)
 {
        struct context *ctx;
-       const struct sr_datafeed_analog *analog;
+       const struct sr_datafeed_analog_old *analog_old;
        const struct sr_datafeed_analog2 *analog2;
        struct sr_channel *ch;
        GSList *l;
@@ -298,23 +299,25 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
        case SR_DF_FRAME_END:
                *out = g_string_new("FRAME-END\n");
                break;
-       case SR_DF_ANALOG:
-               analog = packet->payload;
-               fdata = (float *)analog->data;
+       case SR_DF_ANALOG_OLD:
+               analog_old = packet->payload;
+               fdata = (float *)analog_old->data;
                *out = g_string_sized_new(512);
-               num_channels = g_slist_length(analog->channels);
-               for (si = 0; si < analog->num_samples; si++) {
-                       for (l = analog->channels, c = 0; l; l = l->next, c++) {
+               num_channels = g_slist_length(analog_old->channels);
+               for (si = 0; si < analog_old->num_samples; si++) {
+                       for (l = analog_old->channels, c = 0; l; l = l->next, c++) {
                                ch = l->data;
                                g_string_append_printf(*out, "%s: ", ch->name);
-                               fancyprint(analog->unit, analog->mqflags,
+                               fancyprint(analog_old->unit, analog_old->mqflags,
                                                fdata[si * num_channels + c], *out);
                        }
                }
                break;
        case SR_DF_ANALOG2:
                analog2 = packet->payload;
-               if (!(fdata = g_try_malloc(analog2->num_samples * sizeof(float))))
+               num_channels = g_slist_length(analog2->meaning->channels);
+               if (!(fdata = g_try_malloc(
+                                               analog2->num_samples * num_channels * sizeof(float))))
                        return SR_ERR_MALLOC;
                if ((ret = sr_analog_to_float(analog2, fdata)) != SR_OK)
                        return ret;
@@ -329,7 +332,6 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                        digits = 6;
                }
                sr_analog_unit_to_string(analog2, &suffix);
-               num_channels = g_slist_length(analog2->meaning->channels);
                for (i = 0; i < analog2->num_samples; i++) {
                        for (l = analog2->meaning->channels, c = 0; l; l = l->next, c++) {
                                ch = l->data;