Adjust to GVariant-based sr_config_* functions

[libsigrok.git] / session_file.c

diff --git a/session_file.c b/session_file.c
index 108f00e6aba22023e262f5b77ed40d9c3cae3a89..c743e5c465a0b46fc901cfb6fcace7fdf5e568c2 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -135,7 +135,7 @@ SR_API int sr_session_load(const char *filename)
                if (!strncmp(sections[i], "device ", 7)) {
                        /* device section */
                        sdi = NULL;
-                       enabled_probes = 0;
+                       enabled_probes = total_probes = 0;
                        keys = g_key_file_get_keys(kf, sections[i], NULL, NULL);
                        for (j = 0; keys[j]; j++) {
                                val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
@@ -146,18 +146,23 @@ SR_API int sr_session_load(const char *filename)
                                                /* first device, init the driver */
                                                sdi->driver->init(NULL);
                                        sr_session_dev_add(sdi);
-                                       sdi->driver->config_set(SR_CONF_SESSIONFILE, filename, sdi);
-                                       sdi->driver->config_set(SR_CONF_CAPTUREFILE, val, sdi);
+                                       sdi->driver->config_set(SR_CONF_SESSIONFILE,
+                                                       g_variant_new_string(filename), sdi);
+                                       sdi->driver->config_set(SR_CONF_CAPTUREFILE,
+                                                       g_variant_new_string(val), sdi);
                                        g_ptr_array_add(capturefiles, val);
                                } else if (!strcmp(keys[j], "samplerate")) {
                                        sr_parse_sizestring(val, &tmp_u64);
-                                       sdi->driver->config_set(SR_CONF_SAMPLERATE, &tmp_u64, sdi);
+                                       sdi->driver->config_set(SR_CONF_SAMPLERATE,
+                                                       g_variant_new_uint64(tmp_u64), sdi);
                                } else if (!strcmp(keys[j], "unitsize")) {
                                        tmp_u64 = strtoull(val, NULL, 10);
-                                       sdi->driver->config_set(SR_CONF_CAPTURE_UNITSIZE, &tmp_u64, sdi);
+                                       sdi->driver->config_set(SR_CONF_CAPTURE_UNITSIZE,
+                                                       g_variant_new_uint64(tmp_u64), sdi);
                                } else if (!strcmp(keys[j], "total probes")) {
                                        total_probes = strtoull(val, NULL, 10);
-                                       sdi->driver->config_set(SR_CONF_CAPTURE_NUM_PROBES, &total_probes, sdi);
+                                       sdi->driver->config_set(SR_CONF_CAPTURE_NUM_PROBES,
+                                                       g_variant_new_uint64(total_probes), sdi);
                                        for (p = 0; p < total_probes; p++) {
                                                snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p);
                                                if (!(probe = sr_probe_new(p, SR_PROBE_LOGIC, TRUE,
@@ -179,8 +184,9 @@ SR_API int sr_session_load(const char *filename)
                        }
                        g_strfreev(keys);
                        /* Disable probes not specifically listed. */
-                       for (p = enabled_probes; p < total_probes; p++)
-                               sr_dev_probe_enable(sdi, p, FALSE);
+                       if (total_probes)
+                               for (p = enabled_probes; p < total_probes; p++)
+                                       sr_dev_probe_enable(sdi, p, FALSE);
                }
                devcnt++;
        }
@@ -207,12 +213,13 @@ SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
                unsigned char *buf, int unitsize, int units)
 {
        GSList *l;
+       GVariant *gvar;
        FILE *meta;
        struct sr_probe *probe;
        struct zip *zipfile;
        struct zip_source *versrc, *metasrc, *logicsrc;
        int tmpfile, ret, probecnt;
-       uint64_t *samplerate;
+       uint64_t samplerate;
        char version[1], rawname[16], metafile[32], *s;
 
        if (!filename) {
@@ -255,10 +262,12 @@ SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
        fprintf(meta, "total probes = %d\n", g_slist_length(sdi->probes));
        if (sr_dev_has_option(sdi, SR_CONF_SAMPLERATE)) {
                if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-                               (const void **)&samplerate, sdi) == SR_OK) {
-                       s = sr_samplerate_string(*samplerate);
+                               &gvar, sdi) == SR_OK) {
+                       samplerate = g_variant_get_uint64(gvar);
+                       s = sr_samplerate_string(samplerate);
                        fprintf(meta, "samplerate = %s\n", s);
                        g_free(s);
+                       g_variant_unref(gvar);
                }
        }
        probecnt = 1;