X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session_file.c;h=c8939e5f300b6a4c4f885314f7afa1f8f87d56e4;hb=d078d2e5f3842b1915ffa9961654f3aa4ed88e17;hp=bd3548ab4f7799a78a9c7b0ccee1e98704c3ef02;hpb=2872d21ebc4e9554f685551e4915f193357f13d9;p=libsigrok.git

diff --git a/session_file.c b/session_file.c
index bd3548ab..c8939e5f 100644
--- a/session_file.c
+++ b/session_file.c
@@ -25,12 +25,12 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
 extern struct sr_session *session;
 extern struct sr_device_plugin session_driver;
 
-
-int session_load(const char *filename)
+int sr_session_load(const char *filename)
 {
 	GKeyFile *kf;
 	GPtrArray *capturefiles;
@@ -77,7 +77,7 @@ int session_load(const char *filename)
 		return SR_ERR;
 	}
 
-	session = session_new();
+	session = sr_session_new();
 
 	devcnt = 0;
 	capturefiles = g_ptr_array_new_with_free_func(g_free);
@@ -94,11 +94,11 @@ int session_load(const char *filename)
 			for (j = 0; keys[j]; j++) {
 				val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
 				if (!strcmp(keys[j], "capturefile")) {
-					device = device_new(&session_driver, devcnt, 0);
+					device = sr_device_new(&session_driver, devcnt, 0);
 					if (devcnt == 0)
 						/* first device, init the plugin */
 						device->plugin->init((char *)filename);
-					session_device_add(device);
+					sr_session_device_add(device);
 					device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTUREFILE, val);
 					g_ptr_array_add(capturefiles, val);
 				} else if (!strcmp(keys[j], "samplerate")) {
@@ -111,16 +111,16 @@ int session_load(const char *filename)
 					total_probes = strtoull(val, NULL, 10);
 					device->plugin->set_configuration(devcnt, SR_HWCAP_CAPTURE_NUM_PROBES, &total_probes);
 					for (p = 1; p <= total_probes; p++)
-						device_probe_add(device, NULL);
+						sr_device_probe_add(device, NULL);
 				} else if (!strncmp(keys[j], "probe", 5)) {
 					if (!device)
 						continue;
 					enabled_probes++;
 					tmp_u64 = strtoul(keys[j]+5, NULL, 10);
-					device_probe_name(device, tmp_u64, val);
+					sr_device_probe_name(device, tmp_u64, val);
 				} else if (!strncmp(keys[j], "trigger", 7)) {
 					probenum = strtoul(keys[j]+7, NULL, 10);
-					device_trigger_set(device, probenum, val);
+					sr_device_trigger_set(device, probenum, val);
 				}
 			}
 			g_strfreev(keys);
@@ -136,13 +136,13 @@ int session_load(const char *filename)
 	return SR_OK;
 }
 
-int session_save(char *filename)
+int sr_session_save(const char *filename)
 {
 	GSList *l, *p, *d;
 	FILE *meta;
 	struct sr_device *device;
 	struct sr_probe *probe;
-	struct datastore *ds;
+	struct sr_datastore *ds;
 	struct zip *zipfile;
 	struct zip_source *versrc, *metasrc, *logicsrc;
 	int bufcnt, devcnt, tmpfile, ret, error, probecnt;
@@ -189,7 +189,7 @@ int session_save(char *filename)
 			fprintf(meta, "capturefile = logic-%d\n", devcnt);
 			fprintf(meta, "unitsize = %d\n", ds->ds_unitsize);
 			fprintf(meta, "total probes = %d\n", g_slist_length(device->probes));
-			if (device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
+			if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
 				samplerate = *((uint64_t *) device->plugin->get_device_info(
 						device->plugin_index, SR_DI_CUR_SAMPLERATE));
 				s = sr_samplerate_string(samplerate);
@@ -242,4 +242,3 @@ int session_save(char *filename)
 
 	return SR_OK;
 }
-