From: Bert Vermeulen <redacted>
Date: Mon, 13 Feb 2012 13:00:47 +0000 (+0100)
Subject: sr: rename all sr_device_* functions to sr_dev_*
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=91a22b68c7e8334de0e3d248a327c5a020f53e3c;hp=1ba0a561f44bfd2c80d95bc25584b8de35dd5743;p=sigrok-gtk.git

sr: rename all sr_device_* functions to sr_dev_*
---

diff --git a/devselect.c b/devselect.c
index 8ac0541..3a6771c 100644
--- a/devselect.c
+++ b/devselect.c
@@ -107,8 +107,8 @@ void dev_select_rescan(GtkAction *action, GtkWindow *parent)
 
 	/* Scan for new devices and update our list */
 	/* TODO: Fix this in libsigrok first. */
-	/*sr_device_scan();*/
-	devices = sr_device_list();
+	/*sr_dev_scan();*/
+	devices = sr_dev_list();
 	for (l = devices; l; l = l->next) {
 		device = l->data;
 		sdi = GET_DEVICE_INSTANCE(device);
diff --git a/toolbar.c b/toolbar.c
index b3c6479..73fec3e 100644
--- a/toolbar.c
+++ b/toolbar.c
@@ -214,7 +214,7 @@ static void probe_toggled(GtkCellRenderer *cel, gchar *path,
 	gtk_tree_model_get_iter_from_string(probes, &iter, path);
 	gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, 
 					PROBE_ENABLED, &en, -1);
-	probe = sr_device_probe_find(device, i);
+	probe = sr_dev_probe_find(device, i);
 	probe->enabled = !en;
 	gtk_list_store_set(GTK_LIST_STORE(probes), &iter, 
 					PROBE_ENABLED, probe->enabled, -1);
@@ -231,7 +231,7 @@ static void probe_named(GtkCellRendererText *cel, gchar *path, gchar *text,
 
 	gtk_tree_model_get_iter_from_string(probes, &iter, path);
 	gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, -1);
-	sr_device_probe_name(device, i, text);
+	sr_dev_probe_name(device, i, text);
 	gtk_list_store_set(GTK_LIST_STORE(probes), &iter, PROBE_NAME, text, -1);
 }
 
@@ -246,7 +246,7 @@ static void probe_trigger_set(GtkCellRendererText *cel, gchar *path,
 
 	gtk_tree_model_get_iter_from_string(probes, &iter, path);
 	gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, -1);
-	sr_device_trigger_set(device, i, text);
+	sr_dev_trigger_set(device, i, text);
 	gtk_list_store_set(GTK_LIST_STORE(probes), &iter, 
 					PROBE_TRIGGER, text, -1);
 }
@@ -368,7 +368,7 @@ static void capture_run(GtkAction *action, GObject *parent)
 			 * convert to samples based on the samplerate.
 			 */
 			limit_samples = 0;
-			if (sr_device_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
+			if (sr_dev_has_hwcap(device, SR_HWCAP_SAMPLERATE)) {
 				guint64 tmp_u64;
 				tmp_u64 = *((uint64_t *) device->plugin->get_device_info(
 							device->plugin_index,