summaryrefslogtreecommitdiffstats
path: root/src/gui/PatchCanvas.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-29 02:03:23 +0000
committerDavid Robillard <d@drobilla.net>2011-04-29 02:03:23 +0000
commit8bc9aca63644d63de3ccccbb4752e79d3d3c7854 (patch)
tree7f8e4be2eab57edc3d422ad5a8d34c6ed6473b9d /src/gui/PatchCanvas.cpp
parent77d22f06129e91f51e37c09c71c0917a0136dd7d (diff)
downloadingen-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/PatchCanvas.cpp')
-rw-r--r--src/gui/PatchCanvas.cpp31
1 files changed, 17 insertions, 14 deletions
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index e8532007..bf48b121 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -196,13 +196,15 @@ PatchCanvas::build_menus()
*/
size_t
PatchCanvas::build_plugin_class_menu(
- Gtk::Menu* menu,
- LilvPluginClass plugin_class, LilvPluginClasses classes, const LV2Children& children,
- std::set<const char*>& ancestors)
+ Gtk::Menu* menu,
+ const LilvPluginClass* plugin_class,
+ const LilvPluginClasses* classes,
+ const LV2Children& children,
+ std::set<const char*>& ancestors)
{
- size_t num_items = 0;
- LilvValue class_uri = lilv_plugin_class_get_uri(plugin_class);
- const char* class_uri_str = lilv_value_as_string(class_uri);
+ size_t num_items = 0;
+ const LilvValue* class_uri = lilv_plugin_class_get_uri(plugin_class);
+ const char* class_uri_str = lilv_value_as_string(class_uri);
const std::pair<LV2Children::const_iterator, LV2Children::const_iterator> kids
= children.equal_range(class_uri_str);
@@ -213,7 +215,7 @@ PatchCanvas::build_plugin_class_menu(
// Add submenus
ancestors.insert(class_uri_str);
for (LV2Children::const_iterator i = kids.first; i != kids.second; ++i) {
- LilvPluginClass c = i->second;
+ const LilvPluginClass* c = i->second;
const char* sub_label_str = lilv_value_as_string(lilv_plugin_class_get_label(c));
const char* sub_uri_str = lilv_value_as_string(lilv_plugin_class_get_uri(c));
if (ancestors.find(sub_uri_str) != ancestors.end()) {
@@ -259,13 +261,14 @@ PatchCanvas::build_plugin_menu()
_menu->reorder_child(*plugin_menu_item, 5);
}
- LilvPluginClass lv2_plugin = lilv_world_get_plugin_class(PluginModel::lilv_world());
- LilvPluginClasses classes = lilv_world_get_plugin_classes(PluginModel::lilv_world());
+ const LilvWorld* world = PluginModel::lilv_world();
+ const LilvPluginClass* lv2_plugin = lilv_world_get_plugin_class(world);
+ const LilvPluginClasses* classes = lilv_world_get_plugin_classes(world);
LV2Children children;
LILV_FOREACH(plugin_classes, i, classes) {
- LilvPluginClass c = lilv_plugin_classes_get(classes, i);
- LilvValue p = lilv_plugin_class_get_parent_uri(c);
+ const LilvPluginClass* c = lilv_plugin_classes_get(classes, i);
+ const LilvValue* p = lilv_plugin_class_get_parent_uri(c);
if (!p)
p = lilv_plugin_class_get_uri(lv2_plugin);
children.insert(make_pair(lilv_value_as_string(p), c));
@@ -351,9 +354,9 @@ PatchCanvas::add_plugin(SharedPtr<PluginModel> p)
return;
}
- LilvPluginClass pc = lilv_plugin_get_class(p->lilv_plugin());
- LilvValue class_uri = lilv_plugin_class_get_uri(pc);
- const char* class_uri_str = lilv_value_as_string(class_uri);
+ const LilvPluginClass* pc = lilv_plugin_get_class(p->lilv_plugin());
+ const LilvValue* class_uri = lilv_plugin_class_get_uri(pc);
+ const char* class_uri_str = lilv_value_as_string(class_uri);
Glib::RefPtr<Gdk::Pixbuf> icon = App::instance().icon_from_path(
PluginModel::get_lv2_icon_path(p->lilv_plugin()), 16);