From 9da093217352daa1fb61a6f2daf5195640e286a7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 16 Mar 2012 04:13:23 +0000 Subject: Merge ClientInterface and ServerInterface. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4067 a436a847-0d15-0410-975c-d299462d15a1 --- src/serialisation/Parser.cpp | 50 ++++++++++++++++++++-------------------- src/serialisation/Serialiser.cpp | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/serialisation') diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp index 120de4b1..9acd460c 100644 --- a/src/serialisation/Parser.cpp +++ b/src/serialisation/Parser.cpp @@ -33,7 +33,7 @@ #include "serd/serd.h" #include "sord/sordmm.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/World.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/shared/URIs.hpp" @@ -158,17 +158,17 @@ get_port(Ingen::Shared::World* world, static boost::optional parse( Shared::World* world, - CommonInterface* target, + Interface* target, Sord::Model& model, Glib::ustring document_uri, - boost::optional parent = boost::optional(), - boost::optional symbol = boost::optional(), - boost::optional data = boost::optional()); + boost::optional parent = boost::optional(), + boost::optional symbol = boost::optional(), + boost::optional data = boost::optional()); static boost::optional parse_patch( Shared::World* world, - CommonInterface* target, + Interface* target, Sord::Model& model, const Sord::Node& subject, boost::optional parent = boost::optional(), @@ -179,7 +179,7 @@ parse_patch( static boost::optional parse_node( Shared::World* world, - CommonInterface* target, + Interface* target, Sord::Model& model, const Sord::Node& subject, const Raul::Path& path, @@ -188,24 +188,24 @@ parse_node( static bool parse_properties( - Shared::World* world, - CommonInterface* target, - Sord::Model& model, - const Sord::Node& subject, - const Raul::URI& uri, + Shared::World* world, + Interface* target, + Sord::Model& model, + const Sord::Node& subject, + const Raul::URI& uri, boost::optional data = boost::optional()); static bool parse_connections( Shared::World* world, - CommonInterface* target, + Interface* target, Sord::Model& model, const Sord::Node& subject, const Raul::Path& patch); static boost::optional parse_node(Ingen::Shared::World* world, - Ingen::CommonInterface* target, + Ingen::Interface* target, Sord::Model& model, const Sord::Node& subject, const Raul::Path& path, @@ -264,7 +264,7 @@ parse_node(Ingen::Shared::World* world, static boost::optional parse_patch(Ingen::Shared::World* world, - Ingen::CommonInterface* target, + Ingen::Interface* target, Sord::Model& model, const Sord::Node& subject_node, boost::optional parent, @@ -382,11 +382,11 @@ parse_patch(Ingen::Shared::World* world, } static bool -parse_connections(Ingen::Shared::World* world, - Ingen::CommonInterface* target, - Sord::Model& model, - const Sord::Node& subject, - const Raul::Path& parent) +parse_connections(Ingen::Shared::World* world, + Ingen::Interface* target, + Sord::Model& model, + const Sord::Node& subject, + const Raul::Path& parent) { Sord::URI ingen_connection(*world->rdf_world(), NS_INGEN "connection"); Sord::URI ingen_source(*world->rdf_world(), NS_INGEN "source"); @@ -432,7 +432,7 @@ parse_connections(Ingen::Shared::World* world, static bool parse_properties(Ingen::Shared::World* world, - Ingen::CommonInterface* target, + Ingen::Interface* target, Sord::Model& model, const Sord::Node& subject, const Raul::URI& uri, @@ -460,7 +460,7 @@ parse_properties(Ingen::Shared::World* world, static boost::optional parse(Ingen::Shared::World* world, - Ingen::CommonInterface* target, + Ingen::Interface* target, Sord::Model& model, Glib::ustring document_uri, boost::optional parent, @@ -539,12 +539,12 @@ Parser::Parser(Ingen::Shared::World& world) { } -/** Parse a patch from RDF into a CommonInterface (engine or client). +/** Parse a patch from RDF into a Interface (engine or client). * @return whether or not load was successful. */ bool Parser::parse_file(Ingen::Shared::World* world, - Ingen::CommonInterface* target, + Ingen::Interface* target, Glib::ustring path, boost::optional parent, boost::optional symbol, @@ -598,7 +598,7 @@ Parser::parse_file(Ingen::Shared::World* world, bool Parser::parse_string(Ingen::Shared::World* world, - Ingen::CommonInterface* target, + Ingen::Interface* target, const Glib::ustring& str, const Glib::ustring& base_uri, boost::optional parent, diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index f86c84a5..2ea07af3 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -48,7 +48,7 @@ #include "ingen/Patch.hpp" #include "ingen/Plugin.hpp" #include "ingen/Port.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/shared/LV2URIMap.hpp" #include "ingen/shared/ResourceImpl.hpp" #include "ingen/shared/Store.hpp" -- cgit v1.2.1