diff options
| author | David Robillard <d@drobilla.net> | 2011-02-16 18:26:57 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-02-16 18:26:57 +0000 |
| commit | 2c1079446f0b06559a683a9f4b0192a4f7637770 (patch) | |
| tree | 0bb095529e4654cdf4633512fdaaa599ed3370f0 /src/gui | |
| parent | 0cb698a6d4652c54d49f599f1611e7c4a15d3778 (diff) | |
| download | ingen-2c1079446f0b06559a683a9f4b0192a4f7637770.tar.gz ingen-2c1079446f0b06559a683a9f4b0192a4f7637770.tar.bz2 ingen-2c1079446f0b06559a683a9f4b0192a4f7637770.zip | |
Drop redlandmm for sordmm.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2959 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/LoadRemotePatchWindow.cpp | 6 | ||||
| -rw-r--r-- | src/gui/NodeModule.cpp | 1 | ||||
| -rw-r--r-- | src/gui/PatchCanvas.cpp | 7 | ||||
| -rw-r--r-- | src/gui/wscript | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp index d03de05c..0ad4d5b5 100644 --- a/src/gui/LoadRemotePatchWindow.cpp +++ b/src/gui/LoadRemotePatchWindow.cpp @@ -67,17 +67,17 @@ LoadRemotePatchWindow::present(SharedPtr<PatchModel> patch, GraphObject::Propert cerr << "FIXME: load remote patch" << endl; #if 0 - Redland::Model model(*App::instance().world()->rdf_world(), + Sord::Model model(*App::instance().world()->rdf_world(), "http://rdf.drobilla.net/ingen_patches/index.ttl", "http://rdf.drobilla.net/ingen_patches/"); - Redland::Query query(*App::instance().world()->rdf_world(), Glib::ustring( + Sord::Query query(*App::instance().world()->rdf_world(), Glib::ustring( "SELECT DISTINCT ?name ?uri WHERE {" " ?uri a ingen:Patch ;" " doap:name ?name ." "}")); - SharedPtr<Redland::QueryResults> results(query.run(*App::instance().world()->rdf_world(), model)); + SharedPtr<Sord::QueryResults> results(query.run(*App::instance().world()->rdf_world(), model)); for (; !results->finished(); results->next()) { Gtk::TreeModel::iterator iter = _liststore->append(); (*iter)[_columns._col_name] = results->get("name").to_string(); diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 91f8cb50..44748aeb 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -120,7 +120,6 @@ NodeModule::show_human_names(bool b) const LV2URIMap& uris = App::instance().uris(); if (b && node()->plugin()) { - Glib::Mutex::Lock lock(App::instance().world()->rdf_world()->mutex()); const Raul::Atom& name_property = node()->get_property(uris.lv2_name); if (name_property.type() == Atom::STRING) set_name(name_property.get_string()); diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index ca63df6f..0e1c6fbc 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -245,12 +245,11 @@ PatchCanvas::build_plugin_menu() _menu->reorder_child(*plugin_menu_item, 5); } - Glib::Mutex::Lock lock(PluginModel::rdf_world()->mutex()); - SLV2PluginClass lv2_plugin = slv2_world_get_plugin_class(PluginModel::slv2_world()); - SLV2PluginClasses classes = slv2_world_get_plugin_classes(PluginModel::slv2_world()); + SLV2PluginClass lv2_plugin = slv2_world_get_plugin_class(PluginModel::slv2_world()); + SLV2PluginClasses classes = slv2_world_get_plugin_classes(PluginModel::slv2_world()); LV2Children children; - for (unsigned i=0; i < slv2_plugin_classes_size(classes); ++i) { + for (unsigned i = 0; i < slv2_plugin_classes_size(classes); ++i) { SLV2PluginClass c = slv2_plugin_classes_get_at(classes, i); SLV2Value p = slv2_plugin_class_get_parent_uri(c); if (!p) diff --git a/src/gui/wscript b/src/gui/wscript index 40c6a270..54919362 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -58,7 +58,7 @@ def build(bld): GNOMECANVASMM GTKMM RAUL - REDLANDMM + SORD SIGCPP LV2CORE SLV2 |