X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=259472e55ceef57fba4482f26515adf321ca24cb;hb=d261dbbfcc73;hp=2883d0dc11bb47bf5362bef2a404a4c28e2e3ea7;hpb=bb7ef79377ae617e1275373e0b631beb7f909d73;p=libsigrok.git diff --git a/session_file.c b/session_file.c index 2883d0dc..259472e5 100644 --- a/session_file.c +++ b/session_file.c @@ -120,17 +120,17 @@ SR_API int sr_session_load(const char *filename) /* first device, init the plugin */ dev->plugin->init((char *)filename); sr_session_dev_add(dev); - dev->plugin->set_configuration(devcnt, SR_HWCAP_CAPTUREFILE, val); + dev->plugin->dev_config_set(devcnt, SR_HWCAP_CAPTUREFILE, val); g_ptr_array_add(capturefiles, val); } else if (!strcmp(keys[j], "samplerate")) { sr_parse_sizestring(val, &tmp_u64); - dev->plugin->set_configuration(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64); + dev->plugin->dev_config_set(devcnt, SR_HWCAP_SAMPLERATE, &tmp_u64); } else if (!strcmp(keys[j], "unitsize")) { tmp_u64 = strtoull(val, NULL, 10); - dev->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_UNITSIZE, &tmp_u64); + dev->plugin->dev_config_set(devcnt, SR_HWCAP_CAPTURE_UNITSIZE, &tmp_u64); } else if (!strcmp(keys[j], "total probes")) { total_probes = strtoull(val, NULL, 10); - dev->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes); + dev->plugin->dev_config_set(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes); for (p = 0; p < total_probes; p++) { snprintf(probename, SR_MAX_PROBENAME_LEN, "%" PRIu64, p); sr_dev_probe_add(dev, probename); @@ -227,7 +227,7 @@ int sr_session_save(const char *filename) fprintf(meta, "unitsize = %d\n", ds->ds_unitsize); fprintf(meta, "total probes = %d\n", g_slist_length(dev->probes)); if (sr_dev_has_hwcap(dev, SR_HWCAP_SAMPLERATE)) { - samplerate = *((uint64_t *) dev->plugin->get_dev_info( + samplerate = *((uint64_t *) dev->plugin->dev_info_get( dev->plugin_index, SR_DI_CUR_SAMPLERATE)); s = sr_samplerate_string(samplerate); fprintf(meta, "samplerate = %s\n", s);