From 91d5cb109563c67bdad5f3ebeaafc8e1e8f7e14a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 3 Oct 2006 22:24:22 +0000 Subject: 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 --- src/progs/ingenuity/PatchCanvas.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'src/progs/ingenuity/PatchCanvas.h') diff --git a/src/progs/ingenuity/PatchCanvas.h b/src/progs/ingenuity/PatchCanvas.h index c6abeeb0..15312367 100644 --- a/src/progs/ingenuity/PatchCanvas.h +++ b/src/progs/ingenuity/PatchCanvas.h @@ -18,11 +18,14 @@ #define OMPATCHBAYAREA_H #include +#include #include +#include #include "util/CountedPtr.h" #include "util/Path.h" #include "ConnectionModel.h" #include "PatchModel.h" +#include "NodeModule.h" using std::string; using namespace LibFlowCanvas; @@ -48,8 +51,14 @@ class PatchCanvas : public LibFlowCanvas::FlowCanvas public: PatchCanvas(CountedPtr patch, int width, int height); - NodeModule* find_module(const string& name) - { return (NodeModule*)FlowCanvas::get_module(name); } + virtual ~PatchCanvas() {} + + boost::shared_ptr find_module(const string& name) { + return boost::dynamic_pointer_cast( + FlowCanvas::get_module(name)); + } + + void build(); void add_node(CountedPtr nm); void remove_node(CountedPtr nm); @@ -74,12 +83,13 @@ private: MetadataMap get_initial_data(); - void build_canvas(); - bool canvas_event(GdkEvent* event); - void connect(const LibFlowCanvas::Port* src_port, const LibFlowCanvas::Port* dst_port); - void disconnect(const LibFlowCanvas::Port* src_port, const LibFlowCanvas::Port* dst_port); + void connect(boost::shared_ptr src, + boost::shared_ptr dst); + + void disconnect(boost::shared_ptr src, + boost::shared_ptr dst); CountedPtr m_patch; -- cgit v1.2.1