More generic Atom class.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5024 a436a847-0d15-0410-975c-d299462d15a1

17 files changed, 70 insertions, 70 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 5fcfb57d..1fb40495 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -242,7 +242,7 @@ App::property_change(const Raul::URI&  subject,
 	if (subject == uris().ingen_engine && key == uris().ingen_sampleRate) {
 		if (value.type() == forge().Int) {
 			log().info(Raul::fmt("Sample rate: %1%\n") % uris().forge.str(value));
-			_sample_rate = value.get_int32();
+			_sample_rate = value.get<int32_t>();
 		} else {
 			log().error("Engine sample rate property is not an integer\n");
 		}
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index c3c89258..53dd085f 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -282,9 +282,9 @@ GraphBox::set_graph(SPtr<const GraphModel> graph,
 	_alignment->show_all();
 
 	_menu_human_names->set_active(
-		_app->world()->conf().option("human-names").get_bool());
+		_app->world()->conf().option("human-names").get<int32_t>());
 	_menu_show_port_names->set_active(
-		_app->world()->conf().option("port-labels").get_bool());
+		_app->world()->conf().option("port-labels").get<int32_t>());
 
 	_enable_signal = true;
 }
@@ -422,10 +422,10 @@ GraphBox::event_save()
 	if (!document.is_valid() || document.type() != _app->uris().forge.URI) {
 		event_save_as();
 	} else {
-		_app->loader()->save_graph(_graph, document.get_uri());
+		_app->loader()->save_graph(_graph, document.ptr<char>());
 		_status_bar->push(
 			(boost::format("Saved %1% to %2%") % _graph->path().c_str()
-			 % document.get_uri()).str(),
+			 % document.ptr<char>()).str(),
 			STATUS_CONTEXT_GRAPH);
 	}
 }
@@ -467,9 +467,9 @@ GraphBox::event_save_as()
 		const Raul::Atom& document = _graph->get_property(uris.ingen_document);
 		const Raul::Atom& dir      = _app->world()->conf().option("graph-directory");
 		if (document.type() == uris.forge.URI)
-			dialog.set_uri(document.get_uri());
+			dialog.set_uri(document.ptr<char>());
 		else if (dir.is_valid())
-			dialog.set_current_folder(dir.get_string());
+			dialog.set_current_folder(dir.ptr<char>());
 
 		if (dialog.run() != Gtk::RESPONSE_OK)
 			break;
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 3d742e1d..6c391d23 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -156,8 +156,8 @@ GraphCanvas::GraphCanvas(App&                   app,
 	_menu_properties->signal_activate().connect(
 		sigc::mem_fun(this, &GraphCanvas::menu_properties));
 
-	show_human_names(app.world()->conf().option("human-names").get_bool());
-	show_port_names(app.world()->conf().option("port-labels").get_bool());
+	show_human_names(app.world()->conf().option("human-names").get<int32_t>());
+	show_port_names(app.world()->conf().option("port-labels").get<int32_t>());
 }
 
 void
@@ -771,12 +771,12 @@ GraphCanvas::paste()
 		Node::Properties::iterator x = props.find(uris.ingen_canvasX);
 		if (x != c.second->properties().end())
 			x->second = _app.forge().make(
-				x->second.get_float() + (20.0f * _paste_count));
+				x->second.get<float>() + (20.0f * _paste_count));
 
 		Node::Properties::iterator y = props.find(uris.ingen_canvasY);
 		if (y != c.second->properties().end())
 			y->second = _app.forge().make(
-				y->second.get_float() + (20.0f * _paste_count));
+				y->second.get<float>() + (20.0f * _paste_count));
 
 		builder.build(c.second);
 		_pastees.insert(c.first);
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index 402da865..bdd4abd8 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -124,7 +124,7 @@ GraphPortModule::show_human_names(bool b)
 	const URIs&       uris = app().uris();
 	const Raul::Atom& name = _model->get_property(uris.lv2_name);
 	if (b && name.type() == uris.forge.String) {
-		set_name(name.get_string());
+		set_name(name.ptr<char>());
 	} else {
 		set_name(_model->symbol().c_str());
 	}
@@ -142,21 +142,21 @@ GraphPortModule::property_changed(const Raul::URI& key, const Raul::Atom& value)
 	const URIs& uris = app().uris();
 	if (value.type() == uris.forge.Float) {
 		if (key == uris.ingen_canvasX) {
-			move_to(value.get_float(), get_y());
+			move_to(value.get<float>(), get_y());
 		} else if (key == uris.ingen_canvasY) {
-			move_to(get_x(), value.get_float());
+			move_to(get_x(), value.get<float>());
 		}
 	} else if (value.type() == uris.forge.String) {
 		if (key == uris.lv2_name &&
-		    app().world()->conf().option("human-names").get_bool()) {
-			set_name(value.get_string());
+		    app().world()->conf().option("human-names").get<int32_t>()) {
+			set_name(value.ptr<char>());
 		} else if (key == uris.lv2_symbol &&
-		           !app().world()->conf().option("human-names").get_bool()) {
-			set_name(value.get_string());
+		           !app().world()->conf().option("human-names").get<int32_t>()) {
+			set_name(value.ptr<char>());
 		}
 	} else if (value.type() == uris.forge.Bool) {
 		if (key == uris.ingen_polyphonic) {
-			set_stacked(value.get_bool());
+			set_stacked(value.get<int32_t>());
 		}
 	}
 }
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index ff38e707..9b9cf71c 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -202,7 +202,7 @@ GraphTreeWindow::graph_property_changed(const Raul::URI&  key,
 		Gtk::TreeModel::iterator i = find_graph(_graph_treestore->children(), graph);
 		if (i != _graph_treestore->children().end()) {
 			Gtk::TreeModel::Row row = *i;
-			row[_graph_tree_columns.enabled_col] = value.get_bool();
+			row[_graph_tree_columns.enabled_col] = value.get<int32_t>();
 		} else {
 			_app->log().error(Raul::fmt("Unable to find graph %1%\n")
 			                  % graph->path());
diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp
index 54e42372..a74a11bf 100644
--- a/src/gui/GraphView.cpp
+++ b/src/gui/GraphView.cpp
@@ -155,11 +155,11 @@ GraphView::property_changed(const Raul::URI& predicate, const Raul::Atom& value)
 	_enable_signal = false;
 	if (predicate == _app->uris().ingen_enabled) {
 		if (value.type() == _app->uris().forge.Bool) {
-			_process_but->set_active(value.get_bool());
+			_process_but->set_active(value.get<int32_t>());
 		}
 	} else if (predicate == _app->uris().ingen_polyphony) {
 		if (value.type() == _app->uris().forge.Int) {
-			_poly_spin->set_value(value.get_int32());
+			_poly_spin->set_value(value.get<int32_t>());
 		}
 	}
 	_enable_signal = true;
diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp
index 1229dd25..40b04aa0 100644
--- a/src/gui/LoadGraphWindow.cpp
+++ b/src/gui/LoadGraphWindow.cpp
@@ -128,7 +128,7 @@ LoadGraphWindow::on_show()
 {
 	const Raul::Atom& dir = _app->world()->conf().option("graph-directory");
 	if (dir.is_valid()) {
-		set_current_folder(dir.get_string());
+		set_current_folder(dir.ptr<char>());
 	}
 	Gtk::FileChooserDialog::on_show();
 }
@@ -180,9 +180,9 @@ LoadGraphWindow::ok_clicked()
 		for (auto u : uri_list) {
 			// Cascade
 			Raul::Atom& x = _initial_data.find(uris.ingen_canvasX)->second;
-			x = _app->forge().make(x.get_float() + 20.0f);
+			x = _app->forge().make(x.get<float>() + 20.0f);
 			Raul::Atom& y = _initial_data.find(uris.ingen_canvasY)->second;
-			y = _app->forge().make(y.get_float() + 20.0f);
+			y = _app->forge().make(y.get<float>() + 20.0f);
 
 			Raul::Symbol symbol(symbol_from_filename(u));
 			if (uri_list.size() == 1 && _symbol_entry->get_text() != "")
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 7b1ac5c7..c13b1882 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -274,7 +274,7 @@ LoadPluginWindow::set_row(Gtk::TreeModel::Row&         row,
 	const URIs&       uris = _app->uris();
 	const Raul::Atom& name = plugin->get_property(uris.doap_name);
 	if (name.is_valid() && name.type() == uris.forge.String)
-		row[_plugins_columns._col_name] = name.get_string();
+		row[_plugins_columns._col_name] = name.ptr<char>();
 
 	switch (plugin->type()) {
 	case Plugin::NIL:
@@ -413,9 +413,9 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
 
 		// Cascade next block
 		Raul::Atom& x = _initial_data.find(uris.ingen_canvasX)->second;
-		x = _app->forge().make(x.get_float() + 20.0f);
+		x = _app->forge().make(x.get<float>() + 20.0f);
 		Raul::Atom& y = _initial_data.find(uris.ingen_canvasY)->second;
-		y = _app->forge().make(y.get_float() + 20.0f);
+		y = _app->forge().make(y.get<float>() + 20.0f);
 	}
 }
 
@@ -452,7 +452,7 @@ LoadPluginWindow::filter_changed()
 		switch (criteria) {
 		case CriteriaColumns::Criteria::NAME:
 			if (name.is_valid() && name.type() == uris.forge.String)
-				field = name.get_string();
+				field = name.ptr<char>();
 			break;
 		case CriteriaColumns::Criteria::TYPE:
 			field = plugin->type_uri();
@@ -504,7 +504,7 @@ LoadPluginWindow::plugin_property_changed(const Raul::URI&  plugin,
 	if (predicate == uris.doap_name) {
 		Rows::const_iterator i = _rows.find(plugin);
 		if (i != _rows.end() && value.type() == uris.forge.String)
-			(*i->second)[_plugins_columns._col_name] = value.get_string();
+			(*i->second)[_plugins_columns._col_name] = value.ptr<char>();
 	}
 }
 
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 9fe43562..e55cf131 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -69,7 +69,7 @@ NodeMenu::init(App& app, SPtr<const Client::BlockModel> block)
 		const Raul::Atom& ui_embedded = block->get_property(
 			_app->uris().ingen_uiEmbedded);
 		_embed_gui_menuitem->set_active(
-			ui_embedded.is_valid() && ui_embedded.get_bool());
+			ui_embedded.is_valid() && ui_embedded.get<int32_t>());
 	} else {
 		_popup_gui_menuitem->hide();
 		_embed_gui_menuitem->hide();
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 1ddabdec..75e4b7c7 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -150,7 +150,7 @@ NodeModule::show_human_names(bool b)
 		if (b) {
 			const Raul::Atom& name_property = port->model()->get_property(uris.lv2_name);
 			if (name_property.type() == uris.forge.String) {
-				label = name_property.get_string();
+				label = name_property.ptr<char>();
 			} else {
 				Glib::ustring hn = block()->plugin_model()->port_human_name(
 						port->model()->index());
@@ -237,8 +237,8 @@ NodeModule::embed_gui(bool embed)
 void
 NodeModule::rename()
 {
-	if (app().world()->conf().option("port-labels").get_bool() &&
-	    !app().world()->conf().option("human-names").get_bool()) {
+	if (app().world()->conf().option("port-labels").get<int32_t>() &&
+	    !app().world()->conf().option("human-names").get<int32_t>()) {
 		set_label(_block->path().symbol());
 	}
 }
@@ -247,7 +247,7 @@ void
 NodeModule::new_port_view(SPtr<const PortModel> port)
 {
 	Port::create(app(), *this, port,
-	             app().world()->conf().option("human-names").get_bool());
+	             app().world()->conf().option("human-names").get<int32_t>());
 
 	port->signal_value_changed().connect(
 		sigc::bind<0>(sigc::mem_fun(this, &NodeModule::port_activity),
@@ -403,24 +403,24 @@ NodeModule::property_changed(const Raul::URI& key, const Raul::Atom& value)
 	const URIs& uris = app().uris();
 	if (value.type() == uris.forge.Float) {
 		if (key == uris.ingen_canvasX) {
-			move_to(value.get_float(), get_y());
+			move_to(value.get<float>(), get_y());
 		} else if (key == uris.ingen_canvasY) {
-			move_to(get_x(), value.get_float());
+			move_to(get_x(), value.get<float>());
 		}
 	} else if (value.type() == uris.forge.Bool) {
 		if (key == uris.ingen_polyphonic) {
-			set_stacked(value.get_bool());
+			set_stacked(value.get<int32_t>());
 		} else if (key == uris.ingen_uiEmbedded) {
-			if (value.get_bool() && !_gui_widget) {
+			if (value.get<int32_t>() && !_gui_widget) {
 				embed_gui(true);
-			} else if (!value.get_bool() && _gui_widget) {
+			} else if (!value.get<int32_t>() && _gui_widget) {
 				embed_gui(false);
 			}
 		}
 	} else if (value.type() == uris.forge.String) {
 		if (key == uris.lv2_name
-		    && app().world()->conf().option("human-names").get_bool()) {
-			set_label(value.get_string());
+		    && app().world()->conf().option("human-names").get<int32_t>()) {
+			set_label(value.ptr<char>());
 		}
 	}
 }
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index d963aa90..7ff25b2d 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -122,7 +122,7 @@ ObjectMenu::property_changed(const Raul::URI& predicate, const Raul::Atom& value
 	const URIs& uris = _app->uris();
 	_enable_signal = false;
 	if (predicate == uris.ingen_polyphonic && value.type() == uris.forge.Bool)
-		_polyphonic_menuitem->set_active(value.get_bool());
+		_polyphonic_menuitem->set_active(value.get<int32_t>());
 	_enable_signal = true;
 }
 
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 6a70114e..8ba42484 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -47,11 +47,11 @@ Port::create(App&                  app,
              bool                  flip)
 {
 	Glib::ustring label;
-	if (app.world()->conf().option("port-labels").get_bool()) {
+	if (app.world()->conf().option("port-labels").get<int32_t>()) {
 		if (human_name) {
 			const Raul::Atom& name = pm->get_property(app.uris().lv2_name);
 			if (name.type() == app.forge().String) {
-				label = name.get_string();
+				label = name.ptr<char>();
 			} else {
 				const SPtr<const BlockModel> parent(dynamic_ptr_cast<const BlockModel>(pm->parent()));
 				if (parent && parent->plugin_model())
@@ -144,8 +144,8 @@ Port::show_menu(GdkEventButton* ev)
 void
 Port::moved()
 {
-	if (_app.world()->conf().option("port-labels").get_bool() &&
-	    !_app.world()->conf().option("human-names").get_bool()) {
+	if (_app.world()->conf().option("port-labels").get<int32_t>() &&
+	    !_app.world()->conf().option("human-names").get<int32_t>()) {
 		set_label(model()->symbol().c_str());
 	}
 }
@@ -178,7 +178,7 @@ void
 Port::value_changed(const Raul::Atom& value)
 {
 	if (!_pressed && value.type() == _app.forge().Float) {
-		Ganv::Port::set_control_value(value.get_float());
+		Ganv::Port::set_control_value(value.get<float>());
 	}
 }
 
@@ -235,7 +235,7 @@ Port::build_uri_menu()
 	}
 
 	LilvNode* designation = lilv_new_uri(
-		world->lilv_world(), designation_atom.get_uri());
+		world->lilv_world(), designation_atom.ptr<char>());
 	LilvNode* rdfs_range = lilv_new_uri(
 		world->lilv_world(), LILV_NS_RDFS "range");
 
@@ -366,7 +366,7 @@ void
 Port::activity(const Raul::Atom& value)
 {
 	if (model()->is_a(_app.uris().lv2_AudioPort)) {
-		set_fill_color(peak_color(value.get_float()));
+		set_fill_color(peak_color(value.get<float>()));
 	} else {
 		_app.port_activity(this);
 	}
@@ -396,7 +396,7 @@ Port::property_changed(const Raul::URI& key, const Raul::Atom& value)
 {
 	const URIs& uris = _app.uris();
 	if (value.type() == uris.forge.Float) {
-		float val = value.get_float();
+		float val = value.get<float>();
 		if (key == uris.ingen_value && !_pressed) {
 			Ganv::Port::set_control_value(val);
 		} else if (key == uris.lv2_minimum) {
@@ -415,9 +415,9 @@ Port::property_changed(const Raul::URI& key, const Raul::Atom& value)
 			set_control_is_toggle(true);
 	} else if (key == uris.lv2_name) {
 		if (value.type() == uris.forge.String &&
-		    _app.world()->conf().option("port-labels").get_bool() &&
-		    _app.world()->conf().option("human-names").get_bool()) {
-			set_label(value.get_string());
+		    _app.world()->conf().option("port-labels").get<int32_t>() &&
+		    _app.world()->conf().option("human-names").get<int32_t>()) {
+			set_label(value.ptr<char>());
 		}
 	}
 }
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 76dff135..204ffcbc 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -155,8 +155,8 @@ PortMenu::on_menu_expose()
 	r.set_property(uris.lv2_name, _app->forge().alloc(label.c_str()));
 
 	// TODO: Pretty kludgey coordinates
-	const float block_x = block->get_property(uris.ingen_canvasX).get_float();
-	const float block_y = block->get_property(uris.ingen_canvasY).get_float();
+	const float block_x = block->get_property(uris.ingen_canvasX).get<float>();
+	const float block_y = block->get_property(uris.ingen_canvasY).get<float>();
 	const float x_off   = (label.length() * 16.0f) * (port->is_input() ? -1 : 1);
 	const float y_off   = port->index() * 32.0f;
 	r.set_property(uris.ingen_canvasX, _app->forge().make(block_x + x_off));
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index defe8235..10400a00 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -98,16 +98,16 @@ PortPropertiesWindow::property_changed(const Raul::URI&  key,
 	const URIs& uris = _app->uris();
 	if (value.type() == uris.forge.Float) {
 		if (key == uris.lv2_minimum)
-			_min_spinner->set_value(value.get_float());
+			_min_spinner->set_value(value.get<float>());
 		else if (key == uris.lv2_maximum)
-			_max_spinner->set_value(value.get_float());
+			_max_spinner->set_value(value.get<float>());
 	}
 }
 
 void
 PortPropertiesWindow::min_changed()
 {
-	const float val = _port_model->value().get_float();
+	const float val = _port_model->value().get<float>();
 	float       min = _min_spinner->get_value();
 	float       max = _max_spinner->get_value();
 
@@ -125,7 +125,7 @@ PortPropertiesWindow::min_changed()
 void
 PortPropertiesWindow::max_changed()
 {
-	const float val = _port_model->value().get_float();
+	const float val = _port_model->value().get<float>();
 	float       min = _min_spinner->get_value();
 	float       max = _max_spinner->get_value();
 
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 50fb0903..30e9649f 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -219,7 +219,7 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& va
 		widget->property_numeric() = true;
 		widget->set_range(INT_MIN, INT_MAX);
 		widget->set_increments(1, 10);
-		widget->set_value(value.get_int32());
+		widget->set_value(value.get<int32_t>());
 		widget->signal_value_changed().connect(sigc::bind(
 				sigc::mem_fun(this, &PropertiesWindow::value_edited),
 				uri));
@@ -229,7 +229,7 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& va
 		widget->property_numeric() = true;
 		widget->set_snap_to_ticks(false);
 		widget->set_range(DBL_MIN, DBL_MAX);
-		widget->set_value(value.get_float());
+		widget->set_value(value.get<float>());
 		widget->set_increments(0.1, 1.0);
 		widget->signal_value_changed().connect(sigc::bind(
 				sigc::mem_fun(this, &PropertiesWindow::value_edited),
@@ -237,20 +237,20 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& va
 		return widget;
 	} else if (value.type() == forge.Bool) {
 		Gtk::CheckButton* widget = manage(new Gtk::CheckButton());
-		widget->set_active(value.get_bool());
+		widget->set_active(value.get<int32_t>());
 		widget->signal_toggled().connect(sigc::bind(
 				sigc::mem_fun(this, &PropertiesWindow::value_edited),
 				uri));
 		return widget;
 	} else if (value.type() == forge.URI) {
 		Gtk::Entry* widget = manage(new Gtk::Entry());
-		widget->set_text(value.get_uri());
+		widget->set_text(value.ptr<char>());
 		widget->signal_changed().connect(sigc::bind(
 				sigc::mem_fun(this, &PropertiesWindow::value_edited),
 				uri));
 		return widget;
 	} else if (value.type() == forge.URID) {
-		const char* val_uri = _app->world()->uri_map().unmap_uri(value.get_int32());
+		const char* val_uri = _app->world()->uri_map().unmap_uri(value.get<int32_t>());
 		Gtk::Entry* widget = manage(new Gtk::Entry());
 		if (val_uri) {
 			widget->set_text(val_uri);
@@ -261,7 +261,7 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& va
 		return widget;
 	} else if (value.type() == forge.String) {
 		Gtk::Entry* widget = manage(new Gtk::Entry());
-		widget->set_text(value.get_string());
+		widget->set_text(value.ptr<char>());
 		widget->signal_changed().connect(sigc::bind(
 				sigc::mem_fun(this, &PropertiesWindow::value_edited),
 				uri));
diff --git a/src/gui/RDFS.cpp b/src/gui/RDFS.cpp
index 667e51fe..671ef69e 100644
--- a/src/gui/RDFS.cpp
+++ b/src/gui/RDFS.cpp
@@ -87,8 +87,8 @@ types(World* world, SPtr<const Client::ObjectModel> model)
 	URISet types;
 	PropRange range = model->properties().equal_range(world->uris().rdf_type);
 	for (PropIter t = range.first; t != range.second; ++t) {
-		types.insert(Raul::URI(t->second.get_uri()));
-		if (world->uris().ingen_Graph == t->second.get_uri()) {
+		types.insert(Raul::URI(t->second.ptr<char>()));
+		if (world->uris().ingen_Graph == t->second.ptr<char>()) {
 			// Add lv2:Plugin as a type for graphs so plugin properties show up
 			types.insert(world->uris().lv2_Plugin);
 		}
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index c6815fd7..86ca0172 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -65,7 +65,7 @@ RenameWindow::set_object(SPtr<const ObjectModel> object)
 	_symbol_entry->set_text(object->path().symbol());
 	const Raul::Atom& name_atom = object->get_property(_app->uris().lv2_name);
 	_label_entry->set_text(
-		(name_atom.type() == _app->forge().String) ? name_atom.get_string() : "");
+		(name_atom.type() == _app->forge().String) ? name_atom.ptr<char>() : "");
 }
 
 void
@@ -124,7 +124,7 @@ RenameWindow::ok_clicked()
 		}
 	}
 
-	if (!label.empty() && (!name_atom.is_valid() || label != name_atom.get_string())) {
+	if (!label.empty() && (!name_atom.is_valid() || label != name_atom.ptr<char>())) {
 		_app->interface()->set_property(Node::path_to_uri(path),
 		                                uris.lv2_name,
 		                                _app->forge().alloc(label));