Virtual session: Workaround for SR_CONF_CAPTUREFILE (#944)

[libsigrok.git] / src / session_driver.c

diff --git a/src/session_driver.c b/src/session_driver.c
index 3aabffa2ecbd59cb11596386a7c44b2404ae3852..684a7e539122418695be981fcc4fa21a9692172e 100644 (file)
--- a/src/session_driver.c
+++ b/src/session_driver.c
@@ -31,7 +31,7 @@
 
 /* size of payloads sent across the session bus */
 /** @cond PRIVATE */
-#define CHUNKSIZE (512 * 1024)
+#define CHUNKSIZE (4 * 1024 * 1024)
 /** @endcond */
 
 SR_PRIV struct sr_dev_driver session_driver_info;
@@ -44,7 +44,7 @@ struct session_vdev {
        int bytes_read;
        uint64_t samplerate;
        int unitsize;
-       int num_channels;
+       int num_logic_channels;
        int num_analog_channels;
        int cur_analog_channel;
        GArray *analog_channels;
@@ -66,7 +66,10 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
        struct session_vdev *vdev;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_logic logic;
-       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 zip_stat zs;
        int ret, got_data;
        char capturefile[16];
@@ -114,12 +117,24 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
                                sr_dbg("Opened %s.", capturefile);
                        } else if (vdev->cur_analog_channel < vdev->num_analog_channels) {
                                vdev->capturefile = g_strdup_printf("analog-1-%d",
-                                               vdev->num_channels + vdev->cur_analog_channel + 1);
+                                               vdev->num_logic_channels + vdev->cur_analog_channel + 1);
                                vdev->cur_analog_channel++;
                                vdev->cur_chunk = 0;
                                return TRUE;
                        } else {
                                /* We got all the chunks, finish up. */
+                               g_free(vdev->capturefile);
+
+                               /* If the file has logic channels, the initial value for
+                                * capturefile is set by stream_session_data() - however only
+                                * once. In order to not mess this mechanism up, we simulate
+                                * this here if needed. For purely analog files, capturefile
+                                * is not set.
+                                */
+                               if (vdev->num_logic_channels)
+                                       vdev->capturefile = g_strdup("logic-1");
+                               else
+                                       vdev->capturefile = NULL;
                                return FALSE;
                        }
                }
@@ -137,15 +152,17 @@ static gboolean stream_session_data(struct sr_dev_inst *sdi)
        if (ret > 0) {
                got_data = TRUE;
                if (vdev->cur_analog_channel != 0) {
-                       packet.type = SR_DF_ANALOG_OLD;
+                       packet.type = SR_DF_ANALOG;
                        packet.payload = &analog;
-                       analog.channels = g_slist_prepend(NULL,
+                       /* TODO: Use proper 'digits' value for this device (and its modes). */
+                       sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
+                       analog.meaning->channels = g_slist_prepend(NULL,
                                        g_array_index(vdev->analog_channels,
                                                struct sr_channel *, vdev->cur_analog_channel - 1));
                        analog.num_samples = ret / sizeof(float);
-                       analog.mq = SR_MQ_VOLTAGE;
-                       analog.unit = SR_UNIT_VOLT;
-                       analog.mqflags = SR_MQFLAG_DC;
+                       analog.meaning->mq = SR_MQ_VOLTAGE;
+                       analog.meaning->unit = SR_UNIT_VOLT;
+                       analog.meaning->mqflags = SR_MQFLAG_DC;
                        analog.data = (float *) buf;
                } else {
                        if (ret % vdev->unitsize != 0)
@@ -301,7 +318,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                vdev->unitsize = g_variant_get_uint64(data);
                break;
        case SR_CONF_NUM_LOGIC_CHANNELS:
-               vdev->num_channels = g_variant_get_int32(data);
+               vdev->num_logic_channels = g_variant_get_int32(data);
                break;
        case SR_CONF_NUM_ANALOG_CHANNELS:
                vdev->num_analog_channels = g_variant_get_int32(data);