Merge ClientInterface and ServerInterface.

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

2 files changed, 26 insertions, 26 deletions

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<Raul::Path>
 parse(
 	Shared::World*                        world,
-	CommonInterface*                      target,
+	Interface*                            target,
 	Sord::Model&                          model,
 	Glib::ustring                         document_uri,
-	boost::optional<Raul::Path>           parent    = boost::optional<Raul::Path>(),
-	boost::optional<Raul::Symbol>         symbol    = boost::optional<Raul::Symbol>(),
-	boost::optional<Resource::Properties> data      = boost::optional<Resource::Properties>());
+	boost::optional<Raul::Path>           parent = boost::optional<Raul::Path>(),
+	boost::optional<Raul::Symbol>         symbol = boost::optional<Raul::Symbol>(),
+	boost::optional<Resource::Properties> data   = boost::optional<Resource::Properties>());
 
 static boost::optional<Raul::Path>
 parse_patch(
 	Shared::World*                        world,
-	CommonInterface*                      target,
+	Interface*                            target,
 	Sord::Model&                          model,
 	const Sord::Node&                     subject,
 	boost::optional<Raul::Path>           parent = boost::optional<Raul::Path>(),
@@ -179,7 +179,7 @@ parse_patch(
 static boost::optional<Raul::Path>
 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<Resource::Properties> data = boost::optional<Resource::Properties>());
 
 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<Path>
 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<Path>
 parse_patch(Ingen::Shared::World*                    world,
-            Ingen::CommonInterface*                  target,
+            Ingen::Interface*                        target,
             Sord::Model&                             model,
             const Sord::Node&                        subject_node,
             boost::optional<Raul::Path>              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<Path>
 parse(Ingen::Shared::World*                    world,
-      Ingen::CommonInterface*                  target,
+      Ingen::Interface*                        target,
       Sord::Model&                             model,
       Glib::ustring                            document_uri,
       boost::optional<Raul::Path>              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<Raul::Path>              parent,
                    boost::optional<Raul::Symbol>            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<Raul::Path>              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"