diff options
| author | David Robillard <d@drobilla.net> | 2011-04-29 02:03:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-04-29 02:03:23 +0000 |
| commit | 8bc9aca63644d63de3ccccbb4752e79d3d3c7854 (patch) | |
| tree | 7f8e4be2eab57edc3d422ad5a8d34c6ed6473b9d /src/gui/NodeMenu.cpp | |
| parent | 77d22f06129e91f51e37c09c71c0917a0136dd7d (diff) | |
| download | ingen-8bc9aca63644d63de3ccccbb4752e79d3d3c7854.tar.gz ingen-8bc9aca63644d63de3ccccbb4752e79d3d3c7854.tar.bz2 ingen-8bc9aca63644d63de3ccccbb4752e79d3d3c7854.zip | |
Don't hide pointers behind typedefs.
Use const appropriately in API (makes it clear from the type whether objects should be freed or not).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3222 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/NodeMenu.cpp')
| -rw-r--r-- | src/gui/NodeMenu.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index 0c5c88fb..871ccaf9 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -86,23 +86,23 @@ NodeMenu::init(SharedPtr<NodeModel> node) #ifdef HAVE_LILV if (plugin && plugin->type() == PluginModel::LV2) { - LilvValue preset_pred = lilv_value_new_uri( + LilvValue* preset_pred = lilv_value_new_uri( plugin->lilv_world(), "http://lv2plug.in/ns/dev/presets#hasPreset"); - LilvValue title_pred = lilv_value_new_uri( + LilvValue* title_pred = lilv_value_new_uri( plugin->lilv_world(), "http://dublincore.org/documents/dcmi-namespace/title"); - LilvValues presets = lilv_plugin_get_value( + LilvValues* presets = lilv_plugin_get_value( plugin->lilv_plugin(), preset_pred); if (presets) { _presets_menu = Gtk::manage(new Gtk::Menu()); LILV_FOREACH(values, i, presets) { - LilvValue uri = lilv_values_get(presets, i); - LilvValues titles = lilv_plugin_get_value_for_subject( + const LilvValue* uri = lilv_values_get(presets, i); + LilvValues* titles = lilv_plugin_get_value_for_subject( plugin->lilv_plugin(), uri, title_pred); if (titles) { - LilvValue title = lilv_values_get_first(titles); + const LilvValue* title = lilv_values_get_first(titles); _presets_menu->items().push_back( Gtk::Menu_Helpers::MenuElem( lilv_value_as_string(title), @@ -182,30 +182,30 @@ NodeMenu::on_preset_activated(const std::string& uri) const NodeModel* const node = (NodeModel*)_object.get(); const PluginModel* const plugin = dynamic_cast<const PluginModel*>(node->plugin()); - LilvValue port_pred = lilv_value_new_uri( + LilvValue* port_pred = lilv_value_new_uri( plugin->lilv_world(), "http://lv2plug.in/ns/lv2core#port"); - LilvValue symbol_pred = lilv_value_new_uri( + LilvValue* symbol_pred = lilv_value_new_uri( plugin->lilv_world(), "http://lv2plug.in/ns/lv2core#symbol"); - LilvValue value_pred = lilv_value_new_uri( + LilvValue* value_pred = lilv_value_new_uri( plugin->lilv_world(), "http://lv2plug.in/ns/ext/presets#value"); - LilvValue subject = lilv_value_new_uri(plugin->lilv_world(), uri.c_str()); - LilvValues ports = lilv_plugin_get_value_for_subject( + LilvValue* subject = lilv_value_new_uri(plugin->lilv_world(), uri.c_str()); + LilvValues* ports = lilv_plugin_get_value_for_subject( plugin->lilv_plugin(), subject, port_pred); App::instance().engine()->bundle_begin(); LILV_FOREACH(values, i, ports) { - LilvValue uri = lilv_values_get(ports, i); - LilvValues values = lilv_plugin_get_value_for_subject( + const LilvValue* uri = lilv_values_get(ports, i); + LilvValues* values = lilv_plugin_get_value_for_subject( plugin->lilv_plugin(), uri, value_pred); - LilvValues symbols = lilv_plugin_get_value_for_subject( + LilvValues* symbols = lilv_plugin_get_value_for_subject( plugin->lilv_plugin(), uri, symbol_pred); if (values && symbols) { - LilvValue val = lilv_values_get_first(values); - LilvValue sym = lilv_values_get_first(symbols); + const LilvValue* val = lilv_values_get_first(values); + const LilvValue* sym = lilv_values_get_first(symbols); App::instance().engine()->set_property( node->path().base() + lilv_value_as_string(sym), App::instance().uris().ingen_value, |