summaryrefslogtreecommitdiffstats
path: root/src/serialisation
diff options
context:
space:
mode:
Diffstat (limited to 'src/serialisation')
-rw-r--r--src/serialisation/Parser.cpp65
-rw-r--r--src/serialisation/Serialiser.cpp27
-rw-r--r--src/serialisation/serialisation.cpp10
-rw-r--r--src/serialisation/wscript4
4 files changed, 52 insertions, 54 deletions
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index 3033f538..f124722c 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -26,9 +26,9 @@
#include "ingen/Interface.hpp"
#include "ingen/serialisation/Parser.hpp"
-#include "ingen/shared/URIMap.hpp"
-#include "ingen/shared/URIs.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/URIMap.hpp"
+#include "ingen/URIs.hpp"
+#include "ingen/World.hpp"
#include "raul/Atom.hpp"
#include "raul/log.hpp"
#include "serd/serd.h"
@@ -42,7 +42,6 @@
using namespace std;
using namespace Raul;
-using namespace Ingen::Shared;
typedef set<Sord::Node> RDFNodes;
@@ -95,9 +94,9 @@ skip_property(const Sord::Node& predicate)
}
static Resource::Properties
-get_properties(Ingen::Shared::World* world,
- Sord::Model& model,
- const Sord::Node& subject)
+get_properties(Ingen::World* world,
+ Sord::Model& model,
+ const Sord::Node& subject)
{
SerdChunk out = { NULL, 0 };
LV2_URID_Map* map = &world->uri_map().urid_map_feature()->urid_map;
@@ -136,11 +135,11 @@ get_properties(Ingen::Shared::World* world,
typedef std::pair<Path, Resource::Properties> PortRecord;
static int
-get_port(Ingen::Shared::World* world,
- Sord::Model& model,
- const Sord::Node& subject,
- const Raul::Path& parent,
- PortRecord& record)
+get_port(Ingen::World* world,
+ Sord::Model& model,
+ const Sord::Node& subject,
+ const Raul::Path& parent,
+ PortRecord& record)
{
const URIs& uris = world->uris();
@@ -172,7 +171,7 @@ get_port(Ingen::Shared::World* world,
static boost::optional<Raul::Path>
parse(
- Shared::World* world,
+ World* world,
Interface* target,
Sord::Model& model,
Glib::ustring document_uri,
@@ -183,7 +182,7 @@ parse(
static boost::optional<Raul::Path>
parse_patch(
- Shared::World* world,
+ World* world,
Interface* target,
Sord::Model& model,
const Sord::Node& subject,
@@ -193,7 +192,7 @@ parse_patch(
static boost::optional<Raul::Path>
parse_node(
- Shared::World* world,
+ World* world,
Interface* target,
Sord::Model& model,
const Sord::Node& subject,
@@ -202,7 +201,7 @@ parse_node(
static bool
parse_properties(
- Shared::World* world,
+ World* world,
Interface* target,
Sord::Model& model,
const Sord::Node& subject,
@@ -211,14 +210,14 @@ parse_properties(
static bool
parse_edges(
- Shared::World* world,
+ World* world,
Interface* target,
Sord::Model& model,
const Sord::Node& subject,
const Raul::Path& patch);
static boost::optional<Path>
-parse_node(Ingen::Shared::World* world,
+parse_node(Ingen::World* world,
Ingen::Interface* target,
Sord::Model& model,
const Sord::Node& subject,
@@ -281,7 +280,7 @@ parse_node(Ingen::Shared::World* world,
}
static boost::optional<Path>
-parse_patch(Ingen::Shared::World* world,
+parse_patch(Ingen::World* world,
Ingen::Interface* target,
Sord::Model& model,
const Sord::Node& subject_node,
@@ -402,11 +401,11 @@ parse_patch(Ingen::Shared::World* world,
}
static bool
-parse_edge(Ingen::Shared::World* world,
- Ingen::Interface* target,
- Sord::Model& model,
- const Sord::Node& subject,
- const Raul::Path& parent)
+parse_edge(Ingen::World* world,
+ Ingen::Interface* target,
+ Sord::Model& model,
+ const Sord::Node& subject,
+ const Raul::Path& parent)
{
const Sord::URI ingen_tail(*world->rdf_world(), NS_INGEN "tail");
const Sord::URI ingen_head(*world->rdf_world(), NS_INGEN "head");
@@ -444,11 +443,11 @@ parse_edge(Ingen::Shared::World* world,
}
static bool
-parse_edges(Ingen::Shared::World* world,
- Ingen::Interface* target,
- Sord::Model& model,
- const Sord::Node& subject,
- const Raul::Path& parent)
+parse_edges(Ingen::World* world,
+ Ingen::Interface* target,
+ Sord::Model& model,
+ const Sord::Node& subject,
+ const Raul::Path& parent)
{
const Sord::URI ingen_edge(*world->rdf_world(), NS_INGEN "edge");
const Sord::Node nil;
@@ -461,7 +460,7 @@ parse_edges(Ingen::Shared::World* world,
}
static bool
-parse_properties(Ingen::Shared::World* world,
+parse_properties(Ingen::World* world,
Ingen::Interface* target,
Sord::Model& model,
const Sord::Node& subject,
@@ -480,7 +479,7 @@ parse_properties(Ingen::Shared::World* world,
}
static boost::optional<Path>
-parse(Ingen::Shared::World* world,
+parse(Ingen::World* world,
Ingen::Interface* target,
Sord::Model& model,
Glib::ustring document_uri,
@@ -562,7 +561,7 @@ parse(Ingen::Shared::World* world,
* @return whether or not load was successful.
*/
bool
-Parser::parse_file(Ingen::Shared::World* world,
+Parser::parse_file(Ingen::World* world,
Ingen::Interface* target,
Glib::ustring path,
boost::optional<Raul::Path> parent,
@@ -617,7 +616,7 @@ Parser::parse_file(Ingen::Shared::World* world,
}
bool
-Parser::parse_string(Ingen::Shared::World* world,
+Parser::parse_string(Ingen::World* world,
Ingen::Interface* target,
const Glib::ustring& str,
const Glib::ustring& base_uri,
diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp
index d0ed16ca..c1842022 100644
--- a/src/serialisation/Serialiser.cpp
+++ b/src/serialisation/Serialiser.cpp
@@ -32,10 +32,10 @@
#include "ingen/Plugin.hpp"
#include "ingen/Resource.hpp"
#include "ingen/serialisation/Serialiser.hpp"
-#include "ingen/shared/Store.hpp"
-#include "ingen/shared/URIMap.hpp"
-#include "ingen/shared/URIs.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/Store.hpp"
+#include "ingen/URIMap.hpp"
+#include "ingen/URIs.hpp"
+#include "ingen/World.hpp"
#include "lv2/lv2plug.in/ns/ext/state/state.h"
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
#include "raul/Path.hpp"
@@ -49,13 +49,12 @@ using namespace std;
using namespace Raul;
using namespace Sord;
using namespace Ingen;
-using namespace Ingen::Shared;
namespace Ingen {
namespace Serialisation {
struct Serialiser::Impl {
- explicit Impl(Shared::World& world)
+ explicit Impl(World& world)
: _root_path("/")
, _world(world)
, _model(NULL)
@@ -99,16 +98,16 @@ struct Serialiser::Impl {
std::string finish();
- Raul::Path _root_path;
- SharedPtr<Shared::Store> _store;
- Mode _mode;
- std::string _base_uri;
- Shared::World& _world;
- Sord::Model* _model;
- Sratom* _sratom;
+ Raul::Path _root_path;
+ SharedPtr<Store> _store;
+ Mode _mode;
+ std::string _base_uri;
+ World& _world;
+ Sord::Model* _model;
+ Sratom* _sratom;
};
-Serialiser::Serialiser(Shared::World& world)
+Serialiser::Serialiser(World& world)
: me(new Impl(world))
{}
diff --git a/src/serialisation/serialisation.cpp b/src/serialisation/serialisation.cpp
index b425e4ad..3c650dc6 100644
--- a/src/serialisation/serialisation.cpp
+++ b/src/serialisation/serialisation.cpp
@@ -14,16 +14,16 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ingen/shared/Module.hpp"
-#include "ingen/shared/World.hpp"
+#include "ingen/Module.hpp"
+#include "ingen/World.hpp"
#include "ingen/serialisation/Parser.hpp"
#include "ingen/serialisation/Serialiser.hpp"
using namespace Ingen;
-struct IngenSerialisationModule : public Ingen::Shared::Module {
- virtual void load(Ingen::Shared::World* world) {
+struct IngenSerialisationModule : public Ingen::Module {
+ virtual void load(Ingen::World* world) {
world->set_parser(SharedPtr<Serialisation::Parser>(
new Serialisation::Parser()));
world->set_serialiser(SharedPtr<Serialisation::Serialiser>(
@@ -33,7 +33,7 @@ struct IngenSerialisationModule : public Ingen::Shared::Module {
extern "C" {
-Ingen::Shared::Module*
+Ingen::Module*
ingen_module_load() {
return new IngenSerialisationModule();
}
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index 23924970..190b1aee 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -11,7 +11,7 @@ def build(bld):
name = 'libingen_serialisation',
target = 'ingen_serialisation',
install_path = '${LIBDIR}',
- use = 'libingen_shared')
+ use = 'libingen')
autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV RAUL SORD SRATOM')
if bld.env['BUILD_TESTS']:
@@ -24,7 +24,7 @@ def build(bld):
name = 'libingen_serialisation_profiled',
target = 'ingen_serialisation_profiled',
install_path = '',
- use = 'libingen_shared_profiled',
+ use = 'libingen_profiled',
lib = bld.env['INGEN_TEST_LIBS'],
cxxflags = bld.env['INGEN_TEST_CXXFLAGS'])
autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV RAUL SORD SRATOM')
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 17:51:06 +0000