diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/lv2_inspect.c | 184 | ||||
| -rw-r--r-- | utils/lv2_jack_host.c | 44 | ||||
| -rw-r--r-- | utils/lv2_list.c | 8 |
3 files changed, 118 insertions, 118 deletions
diff --git a/utils/lv2_inspect.c b/utils/lv2_inspect.c index 46176f5..48d2935 100644 --- a/utils/lv2_inspect.c +++ b/utils/lv2_inspect.c @@ -24,23 +24,23 @@ #include "lilv-config.h" -LilvValue* event_class = NULL; -LilvValue* control_class = NULL; -LilvValue* in_group_pred = NULL; -LilvValue* role_pred = NULL; -LilvValue* preset_pred = NULL; -LilvValue* title_pred = NULL; -LilvValue* supports_event_pred = NULL; +LilvNode* event_class = NULL; +LilvNode* control_class = NULL; +LilvNode* in_group_pred = NULL; +LilvNode* role_pred = NULL; +LilvNode* preset_pred = NULL; +LilvNode* title_pred = NULL; +LilvNode* supports_event_pred = NULL; void print_group(const LilvPlugin* p, - const LilvValue* group, - LilvValue* type, - LilvValue* symbol) + const LilvNode* group, + LilvNode* type, + LilvNode* symbol) { - printf("\n\tGroup %s:\n", lilv_value_as_string(group)); - printf("\t\tType: %s\n", lilv_value_as_string(type)); - printf("\t\tSymbol: %s\n", lilv_value_as_string(symbol)); + printf("\n\tGroup %s:\n", lilv_node_as_string(group)); + printf("\t\tType: %s\n", lilv_node_as_string(type)); + printf("\t\tSymbol: %s\n", lilv_node_as_string(symbol)); } void @@ -61,28 +61,28 @@ print_port(const LilvPlugin* p, bool first = true; - const LilvValues* classes = lilv_port_get_classes(p, port); + const LilvNodes* classes = lilv_port_get_classes(p, port); printf("\t\tType: "); - LILV_FOREACH(values, i, classes) { - const LilvValue* value = lilv_values_get(classes, i); + LILV_FOREACH(nodes, i, classes) { + const LilvNode* value = lilv_nodes_get(classes, i); if (!first) { printf("\n\t\t "); } - printf("%s", lilv_value_as_uri(value)); + printf("%s", lilv_node_as_uri(value)); first = false; } if (lilv_port_is_a(p, port, event_class)) { - LilvValues* supported = lilv_port_get_value( + LilvNodes* supported = lilv_port_get_value( p, port, supports_event_pred); - if (lilv_values_size(supported) > 0) { + if (lilv_nodes_size(supported) > 0) { printf("\n\t\tSupported events:\n"); - LILV_FOREACH(values, i, supported) { - const LilvValue* value = lilv_values_get(supported, i); - printf("\t\t\t%s\n", lilv_value_as_uri(value)); + LILV_FOREACH(nodes, i, supported) { + const LilvNode* value = lilv_nodes_get(supported, i); + printf("\t\t\t%s\n", lilv_node_as_uri(value)); } } - lilv_values_free(supported); + lilv_nodes_free(supported); } LilvScalePoints* points = lilv_port_get_scale_points(p, port); @@ -91,31 +91,31 @@ print_port(const LilvPlugin* p, LILV_FOREACH(scale_points, i, points) { const LilvScalePoint* p = lilv_scale_points_get(points, i); printf("\t\t\t%s = \"%s\"\n", - lilv_value_as_string(lilv_scale_point_get_value(p)), - lilv_value_as_string(lilv_scale_point_get_label(p))); + lilv_node_as_string(lilv_scale_point_get_value(p)), + lilv_node_as_string(lilv_scale_point_get_label(p))); } lilv_scale_points_free(points); - const LilvValue* sym = lilv_port_get_symbol(p, port); - printf("\n\t\tSymbol: %s\n", lilv_value_as_string(sym)); + const LilvNode* sym = lilv_port_get_symbol(p, port); + printf("\n\t\tSymbol: %s\n", lilv_node_as_string(sym)); - LilvValue* name = lilv_port_get_name(p, port); - printf("\t\tName: %s\n", lilv_value_as_string(name)); - lilv_value_free(name); + LilvNode* name = lilv_port_get_name(p, port); + printf("\t\tName: %s\n", lilv_node_as_string(name)); + lilv_node_free(name); - LilvValues* groups = lilv_port_get_value(p, port, in_group_pred); - if (lilv_values_size(groups) > 0) + LilvNodes* groups = lilv_port_get_value(p, port, in_group_pred); + if (lilv_nodes_size(groups) > 0) printf("\t\tGroup: %s\n", - lilv_value_as_string( - lilv_values_get(groups, lilv_values_begin(groups)))); - lilv_values_free(groups); + lilv_node_as_string( + lilv_nodes_get(groups, lilv_nodes_begin(groups)))); + lilv_nodes_free(groups); - LilvValues* roles = lilv_port_get_value(p, port, role_pred); - if (lilv_values_size(roles) > 0) + LilvNodes* roles = lilv_port_get_value(p, port, role_pred); + if (lilv_nodes_size(roles) > 0) printf("\t\tRole: %s\n", - lilv_value_as_string( - lilv_values_get(roles, lilv_values_begin(roles)))); - lilv_values_free(roles); + lilv_node_as_string( + lilv_nodes_get(roles, lilv_nodes_begin(roles)))); + lilv_nodes_free(roles); if (lilv_port_is_a(p, port, control_class)) { if (!isnan(mins[index])) @@ -126,57 +126,57 @@ print_port(const LilvPlugin* p, printf("\t\tDefault: %f\n", defaults[index]); } - LilvValues* properties = lilv_port_get_properties(p, port); - if (lilv_values_size(properties) > 0) + LilvNodes* properties = lilv_port_get_properties(p, port); + if (lilv_nodes_size(properties) > 0) printf("\t\tProperties: "); first = true; - LILV_FOREACH(values, i, properties) { + LILV_FOREACH(nodes, i, properties) { if (!first) { printf("\t\t "); } - printf("%s\n", lilv_value_as_uri(lilv_values_get(properties, i))); + printf("%s\n", lilv_node_as_uri(lilv_nodes_get(properties, i))); first = false; } - if (lilv_values_size(properties) > 0) + if (lilv_nodes_size(properties) > 0) printf("\n"); - lilv_values_free(properties); + lilv_nodes_free(properties); } void print_plugin(const LilvPlugin* p) { - LilvValue* val = NULL; + LilvNode* val = NULL; - printf("%s\n\n", lilv_value_as_uri(lilv_plugin_get_uri(p))); + printf("%s\n\n", lilv_node_as_uri(lilv_plugin_get_uri(p))); val = lilv_plugin_get_name(p); if (val) { - printf("\tName: %s\n", lilv_value_as_string(val)); - lilv_value_free(val); + printf("\tName: %s\n", lilv_node_as_string(val)); + lilv_node_free(val); } const LilvPluginClass* pclass = lilv_plugin_get_class(p); - const LilvValue* class_label = lilv_plugin_class_get_label(pclass); + const LilvNode* class_label = lilv_plugin_class_get_label(pclass); if (class_label) { - printf("\tClass: %s\n", lilv_value_as_string(class_label)); + printf("\tClass: %s\n", lilv_node_as_string(class_label)); } val = lilv_plugin_get_author_name(p); if (val) { - printf("\tAuthor: %s\n", lilv_value_as_string(val)); - lilv_value_free(val); + printf("\tAuthor: %s\n", lilv_node_as_string(val)); + lilv_node_free(val); } val = lilv_plugin_get_author_email(p); if (val) { - printf("\tAuthor Email: %s\n", lilv_value_as_uri(val)); - lilv_value_free(val); + printf("\tAuthor Email: %s\n", lilv_node_as_uri(val)); + lilv_node_free(val); } val = lilv_plugin_get_author_homepage(p); if (val) { - printf("\tAuthor Homepage: %s\n", lilv_value_as_uri(val)); - lilv_value_free(val); + printf("\tAuthor Homepage: %s\n", lilv_node_as_uri(val)); + lilv_node_free(val); } if (lilv_plugin_has_latency(p)) { @@ -187,66 +187,66 @@ print_plugin(const LilvPlugin* p) } printf("\tBundle: %s\n", - lilv_value_as_uri(lilv_plugin_get_bundle_uri(p))); + lilv_node_as_uri(lilv_plugin_get_bundle_uri(p))); - const LilvValue* binary_uri = lilv_plugin_get_library_uri(p); + const LilvNode* binary_uri = lilv_plugin_get_library_uri(p); if (binary_uri) { printf("\tBinary: %s\n", - lilv_value_as_uri(lilv_plugin_get_library_uri(p))); + lilv_node_as_uri(lilv_plugin_get_library_uri(p))); } LilvUIs* uis = lilv_plugin_get_uis(p); - if (lilv_values_size(uis) > 0) { + if (lilv_nodes_size(uis) > 0) { printf("\tUI: "); LILV_FOREACH(uis, i, uis) { const LilvUI* ui = lilv_uis_get(uis, i); - printf("%s\n", lilv_value_as_uri(lilv_ui_get_uri(ui))); + printf("%s\n", lilv_node_as_uri(lilv_ui_get_uri(ui))); - const char* binary = lilv_value_as_uri(lilv_ui_get_binary_uri(ui)); + const char* binary = lilv_node_as_uri(lilv_ui_get_binary_uri(ui)); - const LilvValues* types = lilv_ui_get_classes(ui); - LILV_FOREACH(values, i, types) { + const LilvNodes* types = lilv_ui_get_classes(ui); + LILV_FOREACH(nodes, i, types) { printf("\t Class: %s\n", - lilv_value_as_uri(lilv_values_get(types, i))); + lilv_node_as_uri(lilv_nodes_get(types, i))); } if (binary) printf("\t Binary: %s\n", binary); printf("\t Bundle: %s\n", - lilv_value_as_uri(lilv_ui_get_bundle_uri(ui))); + lilv_node_as_uri(lilv_ui_get_bundle_uri(ui))); } } lilv_uis_free(uis); printf("\tData URIs: "); - const LilvValues* data_uris = lilv_plugin_get_data_uris(p); + const LilvNodes* data_uris = lilv_plugin_get_data_uris(p); bool first = true; - LILV_FOREACH(values, i, data_uris) { + LILV_FOREACH(nodes, i, data_uris) { if (!first) { printf("\n\t "); } - printf("%s", lilv_value_as_uri(lilv_values_get(data_uris, i))); + printf("%s", lilv_node_as_uri(lilv_nodes_get(data_uris, i))); first = false; } printf("\n"); /* Required Features */ - LilvValues* features = lilv_plugin_get_required_features(p); + LilvNodes* features = lilv_plugin_get_required_features(p); if (features) printf("\tRequired Features: "); first = true; - LILV_FOREACH(values, i, features) { + LILV_FOREACH(nodes, i, features) { if (!first) { printf("\n\t "); } - printf("%s", lilv_value_as_uri(lilv_values_get(features, i))); + printf("%s", lilv_node_as_uri(lilv_nodes_get(features, i))); first = false; } if (features) printf("\n"); - lilv_values_free(features); + lilv_nodes_free(features); /* Optional Features */ @@ -254,28 +254,28 @@ print_plugin(const LilvPlugin* p) if (features) printf("\tOptional Features: "); first = true; - LILV_FOREACH(values, i, features) { + LILV_FOREACH(nodes, i, features) { if (!first) { printf("\n\t "); } - printf("%s", lilv_value_as_uri(lilv_values_get(features, i))); + printf("%s", lilv_node_as_uri(lilv_nodes_get(features, i))); first = false; } if (features) printf("\n"); - lilv_values_free(features); + lilv_nodes_free(features); /* Presets */ - LilvValues* presets = lilv_plugin_get_value(p, preset_pred); + LilvNodes* presets = lilv_plugin_get_value(p, preset_pred); if (presets) printf("\tPresets: \n"); - LILV_FOREACH(values, i, presets) { - LilvValues* titles = lilv_plugin_get_value_for_subject( - p, lilv_values_get(presets, i), title_pred); + LILV_FOREACH(nodes, i, presets) { + LilvNodes* titles = lilv_plugin_get_value_for_subject( + p, lilv_nodes_get(presets, i), title_pred); if (titles) { - const LilvValue* title = lilv_values_get(titles, lilv_values_begin(titles)); - printf("\t %s\n", lilv_value_as_string(title)); + const LilvNode* title = lilv_nodes_get(titles, lilv_nodes_begin(titles)); + printf("\t %s\n", lilv_node_as_string(title)); } } @@ -356,7 +356,7 @@ main(int argc, char** argv) } const LilvPlugins* plugins = lilv_world_get_all_plugins(world); - LilvValue* uri = lilv_new_uri(world, argv[1]); + LilvNode* uri = lilv_new_uri(world, argv[1]); const LilvPlugin* p = lilv_plugins_get_by_uri(plugins, uri); @@ -368,15 +368,15 @@ main(int argc, char** argv) ret = (p != NULL ? 0 : -1); - lilv_value_free(uri); + lilv_node_free(uri); done: - lilv_value_free(title_pred); - lilv_value_free(role_pred); - lilv_value_free(preset_pred); - lilv_value_free(in_group_pred); - lilv_value_free(event_class); - lilv_value_free(control_class); + lilv_node_free(title_pred); + lilv_node_free(role_pred); + lilv_node_free(preset_pred); + lilv_node_free(in_group_pred); + lilv_node_free(event_class); + lilv_node_free(control_class); lilv_world_free(world); return ret; } diff --git a/utils/lv2_jack_host.c b/utils/lv2_jack_host.c index 24e1c1a..8a388f3 100644 --- a/utils/lv2_jack_host.c +++ b/utils/lv2_jack_host.c @@ -66,13 +66,13 @@ struct JackHost { LilvInstance* instance; /**< Plugin "instance" (loaded shared lib) */ uint32_t num_ports; /**< Size of the two following arrays: */ struct Port* ports; /**< Port array of size num_ports */ - LilvValue* input_class; /**< Input port class (URI) */ - LilvValue* output_class; /**< Output port class (URI) */ - LilvValue* control_class; /**< Control port class (URI) */ - LilvValue* audio_class; /**< Audio port class (URI) */ - LilvValue* event_class; /**< Event port class (URI) */ - LilvValue* midi_class; /**< MIDI event class (URI) */ - LilvValue* optional; /**< lv2:connectionOptional port property */ + LilvNode* input_class; /**< Input port class (URI) */ + LilvNode* output_class; /**< Output port class (URI) */ + LilvNode* control_class; /**< Control port class (URI) */ + LilvNode* audio_class; /**< Audio port class (URI) */ + LilvNode* event_class; /**< Event port class (URI) */ + LilvNode* midi_class; /**< MIDI event class (URI) */ + LilvNode* optional; /**< lv2:connectionOptional port property */ }; /** URI map feature, for event types (we use only MIDI) */ @@ -126,8 +126,8 @@ create_port(struct JackHost* host, lilv_instance_connect_port(host->instance, port_index, NULL); /* Get the port symbol for console printing */ - const LilvValue* symbol = lilv_port_get_symbol(host->plugin, port->lilv_port); - const char* symbol_str = lilv_value_as_string(symbol); + const LilvNode* symbol = lilv_port_get_symbol(host->plugin, port->lilv_port); + const char* symbol_str = lilv_node_as_string(symbol); enum JackPortFlags jack_flags = 0; if (lilv_port_is_a(host->plugin, port->lilv_port, host->input_class)) { @@ -253,7 +253,7 @@ jack_session_cb(jack_session_event_t* event, void* arg) char cmd[256]; snprintf(cmd, sizeof(cmd), "lv2_jack_host %s %s", - lilv_value_as_uri(lilv_plugin_get_uri(host->plugin)), + lilv_node_as_uri(lilv_plugin_get_uri(host->plugin)), event->client_uuid); event->command_line = strdup(cmd); @@ -334,9 +334,9 @@ main(int argc, char** argv) printf("Plugin: %s\n", plugin_uri_str); - LilvValue* plugin_uri = lilv_new_uri(world, plugin_uri_str); + LilvNode* plugin_uri = lilv_new_uri(world, plugin_uri_str); host.plugin = lilv_plugins_get_by_uri(plugins, plugin_uri); - lilv_value_free(plugin_uri); + lilv_node_free(plugin_uri); if (!host.plugin) { fprintf(stderr, "Failed to find plugin %s.\n", plugin_uri_str); @@ -345,8 +345,8 @@ main(int argc, char** argv) } /* Get the plugin's name */ - LilvValue* name = lilv_plugin_get_name(host.plugin); - const char* name_str = lilv_value_as_string(name); + LilvNode* name = lilv_plugin_get_name(host.plugin); + const char* name_str = lilv_node_as_string(name); /* Truncate plugin name to suit JACK (if necessary) */ char* jack_name = NULL; @@ -372,7 +372,7 @@ main(int argc, char** argv) } free(jack_name); - lilv_value_free(name); + lilv_node_free(name); if (!host.jack_client) die("Failed to connect to JACK.\n"); @@ -436,13 +436,13 @@ main(int argc, char** argv) /* Clean up */ free(host.ports); - lilv_value_free(host.input_class); - lilv_value_free(host.output_class); - lilv_value_free(host.control_class); - lilv_value_free(host.audio_class); - lilv_value_free(host.event_class); - lilv_value_free(host.midi_class); - lilv_value_free(host.optional); + lilv_node_free(host.input_class); + lilv_node_free(host.output_class); + lilv_node_free(host.control_class); + lilv_node_free(host.audio_class); + lilv_node_free(host.event_class); + lilv_node_free(host.midi_class); + lilv_node_free(host.optional); lilv_world_free(world); #ifdef LILV_JACK_SESSION diff --git a/utils/lv2_list.c b/utils/lv2_list.c index 471c1bd..c8db8aa 100644 --- a/utils/lv2_list.c +++ b/utils/lv2_list.c @@ -28,11 +28,11 @@ list_plugins(const LilvPlugins* list, bool show_names) LILV_FOREACH(plugins, i, list) { const LilvPlugin* p = lilv_plugins_get(list, i); if (show_names) { - LilvValue* n = lilv_plugin_get_name(p); - printf("%s\n", lilv_value_as_string(n)); - lilv_value_free(n); + LilvNode* n = lilv_plugin_get_name(p); + printf("%s\n", lilv_node_as_string(n)); + lilv_node_free(n); } else { - printf("%s\n", lilv_value_as_uri(lilv_plugin_get_uri(p))); + printf("%s\n", lilv_node_as_uri(lilv_plugin_get_uri(p))); } } } |