Closer...

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

3 files changed, 17 insertions, 39 deletions

diff --git a/src/common/interface/ClientInterface.hpp b/src/common/interface/ClientInterface.hpp
index 9b0cbffb..399085e4 100644
--- a/src/common/interface/ClientInterface.hpp
+++ b/src/common/interface/ClientInterface.hpp
@@ -22,19 +22,18 @@
 #include <string>
 #include <inttypes.h>
 #include <raul/Atom.hpp>
+#include "interface/CommonInterface.hpp"
 
 namespace Ingen {
 namespace Shared {
 
-class EngineInterface;
-
 
 /** The (only) interface the engine uses to communicate with clients.
  * Purely virtual (except for the destructor).
  *
  * \ingroup interface
  */
-class ClientInterface
+class ClientInterface : public CommonInterface
 {
 public:
 	
@@ -76,8 +75,6 @@ public:
 	                        const std::string& symbol,
 	                        const std::string& name) = 0;
 	
-	virtual void new_patch(const std::string& path, uint32_t poly) = 0;
-	
 	virtual void new_node(const std::string& plugin_uri,
 	                      const std::string& node_path,
 	                      bool               is_polyphonic,
@@ -105,16 +102,6 @@ public:
 	
 	virtual void object_destroyed(const std::string& path) = 0;
 	
-	virtual void connect(const std::string& src_port_path,
-	                     const std::string& dst_port_path) = 0;
-	
-	virtual void disconnect(const std::string& src_port_path,
-	                        const std::string& dst_port_path) = 0;
-	
-	virtual void variable_change(const std::string& subject_path,
-	                             const std::string& predicate,
-	                             const Raul::Atom&  value) = 0;
-	
 	virtual void control_change(const std::string& port_path,
 	                            float              value) = 0;
 	
diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp
index da147e9f..5f8fc1f5 100644
--- a/src/common/interface/CommonInterface.hpp
+++ b/src/common/interface/CommonInterface.hpp
@@ -53,6 +53,10 @@ public:
 	virtual void disconnect(const std::string& src_port_path,
 	                        const std::string& dst_port_path) = 0;
 	
+	virtual void set_variable(const std::string& subject_path,
+	                          const std::string& predicate,
+	                          const Raul::Atom&  value) = 0;
+	
 protected:
 	CommonInterface() {}
 };
diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp
index a6481a7d..ead27bc5 100644
--- a/src/common/interface/EngineInterface.hpp
+++ b/src/common/interface/EngineInterface.hpp
@@ -58,23 +58,20 @@ public:
 	
 	// Object commands
 	
-	virtual void new_patch(const std::string& path,
-	                       uint32_t           poly) = 0;
+	virtual void new_node(const std::string& path,
+	                      const std::string& plugin_uri,
+	                      bool               polyphonic) = 0;
 	
-	virtual void create_port(const std::string& path,
-	                         const std::string& data_type,
-	                         bool               is_output) = 0;
-	
-	virtual void create_node(const std::string& path,
-	                         const std::string& plugin_uri,
-	                         bool               polyphonic) = 0;
+	virtual void new_port(const std::string& path,
+	                      const std::string& data_type,
+	                      bool               is_output) = 0;
 	
 	/** DEPRECATED */
-	virtual void create_node(const std::string& path,
-	                         const std::string& plugin_type,
-	                         const std::string& library_name,
-	                         const std::string& plugin_label,
-	                         bool               polyphonic) = 0;
+	virtual void new_node(const std::string& path,
+	                      const std::string& plugin_type,
+	                      const std::string& library_name,
+	                      const std::string& plugin_label,
+	                      bool               polyphonic) = 0;
 	
 	virtual void rename(const std::string& old_path,
 	                    const std::string& new_symbol) = 0;
@@ -91,12 +88,6 @@ public:
 	
 	virtual void disable_patch(const std::string& patch_path) = 0;
 	
-	virtual void connect(const std::string& src_port_path,
-	                     const std::string& dst_port_path) = 0;
-	
-	virtual void disconnect(const std::string& src_port_path,
-	                        const std::string& dst_port_path) = 0;
-	
 	virtual void disconnect_all(const std::string& parent_patch_path,
 	                            const std::string& path) = 0;
 	
@@ -132,10 +123,6 @@ public:
 	
 	virtual void midi_learn(const std::string& node_path) = 0;
 	
-	virtual void set_variable(const std::string& subject_path,
-	                          const std::string& predicate,
-	                          const Raul::Atom&  value) = 0;
-	
 	// Requests
 	
 	virtual void ping() = 0;