summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/HTTPClientReceiver.cpp2
-rw-r--r--src/client/HTTPClientReceiver.hpp2
-rw-r--r--src/client/HTTPEngineSender.cpp8
-rw-r--r--src/client/HTTPEngineSender.hpp4
-rw-r--r--src/client/NodeModel.cpp3
-rw-r--r--src/client/PluginModel.cpp7
-rw-r--r--src/client/PluginModel.hpp12
-rw-r--r--src/client/PluginUI.cpp2
-rw-r--r--src/client/wscript2
9 files changed, 15 insertions, 27 deletions
diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp
index 4ccf8a8a..bd16fe73 100644
--- a/src/client/HTTPClientReceiver.cpp
+++ b/src/client/HTTPClientReceiver.cpp
@@ -231,8 +231,6 @@ HTTPClientReceiver::message_callback(SoupSession* session, SoupMessage* msg, voi
void
HTTPClientReceiver::start(bool dump)
{
- Glib::Mutex::Lock lock(_world->rdf_world()->mutex());
-
if (!_world->parser())
_world->load("ingen_serialisation");
diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp
index 094eee65..5e09d2e4 100644
--- a/src/client/HTTPClientReceiver.hpp
+++ b/src/client/HTTPClientReceiver.hpp
@@ -21,7 +21,7 @@
#include <cstdlib>
#include <boost/utility.hpp>
#include <glibmm/thread.h>
-#include "redlandmm/World.hpp"
+#include "sord/sordmm.hpp"
#include "raul/Deletable.hpp"
#include "raul/SharedPtr.hpp"
#include "raul/Thread.hpp"
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index cc0d31a0..ed69d7e0 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -19,7 +19,7 @@
#include "raul/AtomRDF.hpp"
#include "raul/log.hpp"
-#include "redlandmm/Model.hpp"
+#include "sord/sordmm.hpp"
#include "module/World.hpp"
#include "HTTPEngineSender.hpp"
@@ -121,14 +121,14 @@ HTTPEngineSender::put(const URI& uri,
const string path = (uri.substr(0, 6) == "path:/") ? uri.substr(6) : uri.str();
const string full_uri = _engine_url.str() + "/" + path;
- Redland::Model model(_world);
+ Sord::Model model(_world);
for (Resource::Properties::const_iterator i = properties.begin(); i != properties.end(); ++i)
model.add_statement(
- Redland::Resource(_world, path),
+ Sord::Resource(_world, path),
AtomRDF::atom_to_node(model, i->first),
AtomRDF::atom_to_node(model, i->second));
- const string str = model.serialise_to_string("turtle");
+ const string str = model.write_to_string("turtle");
SoupMessage* msg = soup_message_new(SOUP_METHOD_PUT, full_uri.c_str());
assert(msg);
soup_message_set_request(msg, "application/x-turtle", SOUP_MEMORY_COPY, str.c_str(), str.length());
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index bd8d3e23..12ba98b5 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -23,7 +23,7 @@
#include <string>
#include "raul/Path.hpp"
-#include "redlandmm/World.hpp"
+#include "sord/sordmm.hpp"
#include "interface/EngineInterface.hpp"
@@ -116,7 +116,7 @@ public:
protected:
SoupSession* _session;
- Redland::World& _world;
+ Sord::World& _world;
const Raul::URI _engine_url;
int _client_port;
int32_t _id;
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 783f2425..8d8a5ece 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -185,9 +185,6 @@ NodeModel::default_port_value_range(SharedPtr<PortModel> port, float& min, float
if (_plugin && _plugin->type() == PluginModel::LV2) {
if (!_min_values) {
-
- Glib::Mutex::Lock lock(PluginModel::rdf_world()->mutex());
-
_num_values = slv2_plugin_get_num_ports(_plugin->slv2_plugin());
_min_values = new float[_num_values];
_max_values = new float[_num_values];
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 08e9dad6..5d35902b 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -37,7 +37,7 @@ SLV2World PluginModel::_slv2_world = NULL;
SLV2Plugins PluginModel::_slv2_plugins = NULL;
#endif
-Redland::World* PluginModel::_rdf_world = NULL;
+Sord::World* PluginModel::_rdf_world = NULL;
PluginModel::PluginModel(Shared::LV2URIMap& uris,
@@ -47,7 +47,6 @@ PluginModel::PluginModel(Shared::LV2URIMap& uris,
{
add_properties(properties);
- Glib::Mutex::Lock lock(_rdf_world->mutex());
assert(_rdf_world);
add_property("http://www.w3.org/1999/02/22-rdf-syntax-ns#type", this->type_uri());
#ifdef HAVE_SLV2
@@ -177,7 +176,6 @@ PluginModel::port_human_name(uint32_t index) const
{
#ifdef HAVE_SLV2
if (_slv2_plugin) {
- Glib::Mutex::Lock lock(_rdf_world->mutex());
SLV2Port port = slv2_plugin_get_port_by_index(_slv2_plugin, index);
SLV2Value name = slv2_port_get_name(_slv2_plugin, port);
string ret = slv2_value_as_string(name);
@@ -193,8 +191,6 @@ PluginModel::port_human_name(uint32_t index) const
bool
PluginModel::has_ui() const
{
- Glib::Mutex::Lock lock(_rdf_world->mutex());
-
SLV2Value gtk_gui_uri = slv2_value_new_uri(_slv2_world,
"http://lv2plug.in/ns/extensions/ui#GtkUI");
@@ -224,7 +220,6 @@ const string&
PluginModel::icon_path() const
{
if (_icon_path.empty() && _type == LV2) {
- Glib::Mutex::Lock lock(_rdf_world->mutex());
_icon_path = get_lv2_icon_path(_slv2_plugin);
}
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index c3a27713..3f647a7c 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -18,9 +18,11 @@
#ifndef INGEN_CLIENT_PLUGINMODEL_HPP
#define INGEN_CLIENT_PLUGINMODEL_HPP
+#include <sigc++/sigc++.h>
+
#include "ingen-config.h"
#include "raul/SharedPtr.hpp"
-#include "redlandmm/World.hpp"
+#include "sord/sordmm.hpp"
#ifdef HAVE_SLV2
#include "slv2/slv2.h"
#endif
@@ -67,12 +69,10 @@ public:
SLV2Plugin slv2_plugin() const { return _slv2_plugin; }
SLV2Port slv2_port(uint32_t index) {
- Glib::Mutex::Lock lock(_rdf_world->mutex());
return slv2_plugin_get_port_by_index(_slv2_plugin, index);
}
static void set_slv2_world(SLV2World world) {
- Glib::Mutex::Lock lock(_rdf_world->mutex());
_slv2_world = world;
_slv2_plugins = slv2_world_get_all_plugins(_slv2_world);
}
@@ -86,11 +86,11 @@ public:
static std::string get_lv2_icon_path(SLV2Plugin plugin);
#endif
- static void set_rdf_world(Redland::World& world) {
+ static void set_rdf_world(Sord::World& world) {
_rdf_world = &world;
}
- static Redland::World* rdf_world() { return _rdf_world; }
+ static Sord::World* rdf_world() { return _rdf_world; }
// Signals
sigc::signal<void> signal_changed;
@@ -111,7 +111,7 @@ private:
mutable std::string _icon_path;
#endif
- static Redland::World* _rdf_world;
+ static Sord::World* _rdf_world;
};
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 693976fb..5d21ea7e 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -118,7 +118,6 @@ PluginUI::PluginUI(Ingen::Shared::World* world,
PluginUI::~PluginUI()
{
if (_instance) {
- Glib::Mutex::Lock lock(PluginModel::rdf_world()->mutex());
slv2_ui_instance_free(_instance);
}
}
@@ -129,7 +128,6 @@ PluginUI::create(Ingen::Shared::World* world,
SharedPtr<NodeModel> node,
SLV2Plugin plugin)
{
- Glib::Mutex::Lock lock(PluginModel::rdf_world()->mutex());
SharedPtr<PluginUI> ret;
SLV2Value gtk_gui_uri = slv2_value_new_uri(world->slv2_world(),
diff --git a/src/client/wscript b/src/client/wscript
index de135888..2ab0be44 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -36,5 +36,5 @@ def build(bld):
obj.target = 'ingen_client'
obj.install_path = '${LIBDIR}'
obj.use = 'libingen_shared'
- autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM SOUP XML2 SIGCPP LIBLO SOUP')
+ autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL SORD SOUP XML2 SIGCPP LIBLO SOUP')
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 07:21:20 +0000