X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession_file.c;h=b8a1cb60d8e098d2986319767db2760a982ec461;hb=f6c30de4b031ab9a8d838c1ad6ff4118b03c0dc4;hp=abe002d3a60cc3014140e31ddfee403ff21151cf;hpb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;p=libsigrok.git

diff --git a/src/session_file.c b/src/session_file.c
index abe002d3..b8a1cb60 100644
--- a/src/session_file.c
+++ b/src/session_file.c
@@ -49,7 +49,6 @@
 extern SR_PRIV struct sr_dev_driver session_driver;
 static int session_driver_initialized = 0;
 
-
 /** @private */
 SR_PRIV int sr_sessionfile_check(const char *filename)
 {
@@ -181,10 +180,11 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
 					sr_session_dev_add(*session, sdi);
 					(*session)->owned_devs = g_slist_append(
 							(*session)->owned_devs, sdi);
-					sdi->driver->config_set(SR_CONF_SESSIONFILE,
-							g_variant_new_string(filename), sdi, NULL);
-					sdi->driver->config_set(SR_CONF_CAPTUREFILE,
-							g_variant_new_string(val), sdi, NULL);
+
+					sr_config_set(sdi, NULL, SR_CONF_SESSIONFILE,
+							g_variant_new_string(filename));
+					sr_config_set(sdi, NULL, SR_CONF_CAPTUREFILE,
+							g_variant_new_string(val));
 					g_ptr_array_add(capturefiles, val);
 				} else if (!strcmp(keys[j], "samplerate")) {
 					if (!sdi) {
@@ -192,24 +192,24 @@ SR_API int sr_session_load(const char *filename, struct sr_session **session)
 						break;
 					}
 					sr_parse_sizestring(val, &tmp_u64);
-					sdi->driver->config_set(SR_CONF_SAMPLERATE,
-							g_variant_new_uint64(tmp_u64), sdi, NULL);
+					sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE,
+							g_variant_new_uint64(tmp_u64));
 				} else if (!strcmp(keys[j], "unitsize")) {
 					if (!sdi) {
 						ret = SR_ERR_DATA;
 						break;
 					}
 					tmp_u64 = strtoull(val, NULL, 10);
-					sdi->driver->config_set(SR_CONF_CAPTURE_UNITSIZE,
-							g_variant_new_uint64(tmp_u64), sdi, NULL);
+					sr_config_set(sdi, NULL, SR_CONF_CAPTURE_UNITSIZE,
+							g_variant_new_uint64(tmp_u64));
 				} else if (!strcmp(keys[j], "total probes")) {
 					if (!sdi) {
 						ret = SR_ERR_DATA;
 						break;
 					}
 					total_channels = strtoull(val, NULL, 10);
-					sdi->driver->config_set(SR_CONF_NUM_LOGIC_CHANNELS,
-							g_variant_new_uint64(total_channels), sdi, NULL);
+					sr_config_set(sdi, NULL, SR_CONF_NUM_LOGIC_CHANNELS,
+							g_variant_new_uint64(total_channels));
 					for (p = 0; p < total_channels; p++) {
 						snprintf(channelname, SR_MAX_CHANNELNAME_LEN, "%" PRIu64, p);
 						sr_channel_new(sdi, p, SR_CHANNEL_LOGIC, FALSE,