Fixes for connecting directly from a patch input to a patch output

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

1 files changed, 13 insertions, 12 deletions

diff --git a/src/libs/client/ConnectionModel.h b/src/libs/client/ConnectionModel.h
index ad517777..3a9f0007 100644
--- a/src/libs/client/ConnectionModel.h
+++ b/src/libs/client/ConnectionModel.h
@@ -20,14 +20,14 @@
 
 #include <string>
 #include "util/Path.h"
+#include "util/CountedPtr.h"
+#include "PortModel.h"
 #include <cassert>
 using std::string;
 using Om::Path;
 
 namespace LibOmClient {
 
-class PortModel;
-
 
 /** Class to represent a port->port connection in the engine.
  *
@@ -43,25 +43,26 @@ class ConnectionModel
 {
 public:
 	ConnectionModel(const Path& src_port, const Path& dst_port);
+	ConnectionModel(CountedPtr<PortModel> src, CountedPtr<PortModel> dst);
 
-	PortModel* src_port() const { return m_src_port; }
-	PortModel* dst_port() const { return m_dst_port; }
+	CountedPtr<PortModel> src_port() const { return _src_port; }
+	CountedPtr<PortModel> dst_port() const { return _dst_port; }
 
-	void set_src_port(PortModel* port) { m_src_port = port; m_src_port_path = ""; }
-	void set_dst_port(PortModel* port) { m_dst_port = port; m_dst_port_path = ""; }
+	void set_src_port(CountedPtr<PortModel> port) { _src_port = port; _src_port_path = port->path(); }
+	void set_dst_port(CountedPtr<PortModel> port) { _dst_port = port; _dst_port_path = port->path(); }
 
-	void src_port_path(const string& s) { m_src_port_path = s; }
-	void dst_port_path(const string& s) { m_dst_port_path = s; }
+	void src_port_path(const string& s) { _src_port_path = s; }
+	void dst_port_path(const string& s) { _dst_port_path = s; }
 	
 	const Path& src_port_path() const;
 	const Path& dst_port_path() const;
 	const Path  patch_path()    const;
 	
 private:
-	Path m_src_port_path;  ///< Only used if m_src_port == NULL
-	Path m_dst_port_path;  ///< Only used if m_dst_port == NULL
-	PortModel* m_src_port;
-	PortModel* m_dst_port;
+	Path                  _src_port_path; ///< Only used if _src_port == NULL
+	Path                  _dst_port_path; ///< Only used if _dst_port == NULL
+	CountedPtr<PortModel> _src_port;
+	CountedPtr<PortModel> _dst_port;
 };