shared_ptr bugfixes.

Updated Ingen to work with new FlowCanvas.
Updated Patchage to work with new(er) FlowCanvas.


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

1 files changed, 9 insertions, 4 deletions

diff --git a/src/progs/ingenuity/PatchPortModule.h b/src/progs/ingenuity/PatchPortModule.h
index 98bc1b1d..3cf55192 100644
--- a/src/progs/ingenuity/PatchPortModule.h
+++ b/src/progs/ingenuity/PatchPortModule.h
@@ -18,6 +18,7 @@
 #define OMPORTMODULE_H
 
 #include <string>
+#include <boost/enable_shared_from_this.hpp>
 #include <libgnomecanvasmm.h>
 #include <flowcanvas/Module.h>
 #include "util/Atom.h"
@@ -43,10 +44,12 @@ class Port;
  *
  * \ingroup Ingenuity
  */
-class PatchPortModule : public LibFlowCanvas::Module
+class PatchPortModule : public LibFlowCanvas::Module//, public boost::enable_shared_from_this<LibFlowCanvas::Module>
 {
 public:
-	PatchPortModule(PatchCanvas* canvas, CountedPtr<PortModel> port);
+	static boost::shared_ptr<PatchPortModule> create (boost::shared_ptr<PatchCanvas> canvas,
+	                                                  CountedPtr<PortModel>          port);
+
 	virtual ~PatchPortModule() {}
 	
 	virtual void store_location();
@@ -56,13 +59,15 @@ public:
 	CountedPtr<PortModel> port() const { return m_port; }
 
 protected:
+	PatchPortModule(boost::shared_ptr<PatchCanvas> canvas, CountedPtr<PortModel> port);
+
 	//virtual void on_double_click(GdkEventButton* ev) { show_control_window(); }
 	//virtual void on_middle_click(GdkEventButton* ev) { show_control_window(); }
 	
 	void metadata_update(const string& key, const Atom& value);
 
-	CountedPtr<PortModel> m_port;
-	Port*                 m_patch_port; ///< Port on this 'anonymous' module
+	CountedPtr<PortModel>   m_port;
+	boost::shared_ptr<Port> m_patch_port; ///< Port on this 'anonymous' module
 };