if (sr_parse_sizestring(text, &tmp_u64) != SR_OK)
return;
- ret = dev->plugin->dev_config_set(dev->plugin_index,
+ ret = dev->driver->dev_config_set(dev->driver_index,
cap, &tmp_u64);
break;
case SR_T_CHAR:
- ret = dev->plugin->dev_config_set(dev->plugin_index, cap, text);
+ ret = dev->driver->dev_config_set(dev->driver_index, cap, text);
break;
/* SR_T_BOOL will be handled by prop_toggled */
}
DEV_PROP_TYPE, &type, -1);
val = !gtk_cell_renderer_toggle_get_active(cel);
- ret = dev->plugin->dev_config_set(dev->plugin_index, cap,
+ ret = dev->driver->dev_config_set(dev->driver_index, cap,
GINT_TO_POINTER(val));
if (!ret)
G_TYPE_BOOLEAN, G_TYPE_STRING,
G_TYPE_BOOLEAN);
gtk_tree_view_set_model(GTK_TREE_VIEW(tv), GTK_TREE_MODEL(props));
- int *hwcaps = dev->plugin->hwcap_get_all();
+ const int *hwcaps = dev->driver->hwcap_get_all();
int cap;
GtkTreeIter iter;
for (cap = 0; hwcaps[cap]; cap++) {
- struct sr_hwcap_option *hwo;
+ const struct sr_hwcap_option *hwo;
if (!(hwo = sr_hw_hwcap_get(hwcaps[cap])))
continue;
gtk_list_store_append(props, &iter);
gtk_tree_model_get_iter_from_string(probes, &iter, path);
gtk_tree_model_get(probes, &iter, PROBE_NUMBER, &i, -1);
- sr_dev_probe_name(dev, i, text);
+ sr_dev_probe_name_set(dev, i, text);
gtk_list_store_set(GTK_LIST_STORE(probes), &iter, PROBE_NAME, text, -1);
}
}
if (time_msec) {
- if (sr_hw_has_hwcap(dev->plugin, SR_HWCAP_LIMIT_MSEC)) {
- if (dev->plugin->dev_config_set(dev->plugin_index,
+ if (sr_driver_hwcap_exists(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
+ if (dev->driver->dev_config_set(dev->driver_index,
SR_HWCAP_LIMIT_MSEC,
&time_msec) != SR_OK) {
g_critical("Failed to configure time limit.");
limit_samples = 0;
if (sr_dev_has_hwcap(dev, SR_HWCAP_SAMPLERATE)) {
guint64 tmp_u64;
- tmp_u64 = *((uint64_t *)dev->plugin->dev_info_get(
- dev->plugin_index,
+ tmp_u64 = *((uint64_t *)dev->driver->dev_info_get(
+ dev->driver_index,
SR_DI_CUR_SAMPLERATE));
limit_samples = tmp_u64 * time_msec / (uint64_t) 1000;
}
return;
}
- if (dev->plugin->dev_config_set(dev->plugin_index,
+ if (dev->driver->dev_config_set(dev->driver_index,
SR_HWCAP_LIMIT_SAMPLES,
&limit_samples) != SR_OK) {
g_critical("Failed to configure time-based sample limit.");
}
}
if (limit_samples) {
- if (dev->plugin->dev_config_set(dev->plugin_index,
+ if (dev->driver->dev_config_set(dev->driver_index,
SR_HWCAP_LIMIT_SAMPLES,
&limit_samples) != SR_OK) {
g_critical("Failed to configure sample limit.");
}
}
- if (dev->plugin->dev_config_set(dev->plugin_index,
+ if (dev->driver->dev_config_set(dev->driver_index,
SR_HWCAP_PROBECONFIG, (char *)dev->probes) != SR_OK) {
printf("Failed to configure probes.\n");
sr_session_destroy();
"Exit the program", G_CALLBACK(gtk_main_quit) },
{"ViewMenu", NULL, "_View", NULL, NULL, NULL},
- {"ViewZoomIn", GTK_STOCK_ZOOM_IN, "Zoom _In", "<control>z", NULL,
+ {"ViewZoomIn", GTK_STOCK_ZOOM_IN, "Zoom _In", "plus", NULL,
G_CALLBACK(zoom_in)},
- {"ViewZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "<control><shift>Z",
+ {"ViewZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "minus",
NULL, G_CALLBACK(zoom_out)},
{"ViewZoomFit", GTK_STOCK_ZOOM_FIT, NULL, NULL,
NULL, G_CALLBACK(zoom_fit)},
{"HelpMenu", NULL, "_Help", NULL, NULL, NULL},
- {"HelpWiki", GTK_STOCK_ABOUT, "Sigrok _Wiki", NULL, NULL,
+ {"HelpWiki", GTK_STOCK_ABOUT, "sigrok _Wiki", NULL, NULL,
G_CALLBACK(help_wiki)},
{"HelpAbout", GTK_STOCK_ABOUT, "_About", NULL, NULL,
G_CALLBACK(help_about)},
toolbar = GTK_TOOLBAR(gtk_ui_manager_get_widget(ui, "/toolbar"));
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(toolbar), FALSE, TRUE, 0);
- /* Device selection GtkComboBox */
- GtkToolItem *toolitem = gtk_tool_item_new();
- GtkWidget *align = gtk_alignment_new(0.5, 0.5, 2, 0);
- GtkWidget *dev = dev_select_combo_box_new(parent);
-
- gtk_container_add(GTK_CONTAINER(align), dev);
- gtk_container_add(GTK_CONTAINER(toolitem), align);
- gtk_toolbar_insert(toolbar, toolitem, 0);
-
/* Time/Samples entry */
- toolitem = gtk_tool_item_new();
+ GtkToolItem *toolitem = gtk_tool_item_new();
GtkWidget *timesamples = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(timesamples), "100");
gtk_entry_set_alignment(GTK_ENTRY(timesamples), 1.0);
/* Time unit combo box */
toolitem = gtk_tool_item_new();
- align = gtk_alignment_new(0.5, 0.5, 2, 0);
+ GtkWidget *align = gtk_alignment_new(0.5, 0.5, 2, 0);
GtkWidget *timeunit = gtk_combo_box_new_text();
gtk_combo_box_append_text(GTK_COMBO_BOX(timeunit), "samples");
gtk_combo_box_append_text(GTK_COMBO_BOX(timeunit), "ms");
g_object_set_data(G_OBJECT(parent), "timesamples", timesamples);
g_object_set_data(G_OBJECT(parent), "timeunit", timeunit);
+ /* Device selection GtkComboBox */
+ toolitem = gtk_tool_item_new();
+ align = gtk_alignment_new(0.5, 0.5, 2, 0);
+ GtkWidget *dev = dev_select_combo_box_new(parent);
+
+ gtk_container_add(GTK_CONTAINER(align), dev);
+ gtk_container_add(GTK_CONTAINER(toolitem), align);
+ gtk_toolbar_insert(toolbar, toolitem, 0);
+
+
return GTK_WIDGET(vbox);
}