From 9c7f679baa39d7772f9b66a65b48d37ba540fbba Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
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/patchage@152 a436a847-0d15-0410-975c-d299462d15a1
---
 src/Patchage.h | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/Patchage.h')

diff --git a/src/Patchage.h b/src/Patchage.h
index c7a3e0e..f303a46 100644
--- a/src/Patchage.h
+++ b/src/Patchage.h
@@ -19,6 +19,7 @@
 
 #include "config.h"
 #include <string>
+#include <boost/shared_ptr.hpp>
 #include <libgnomecanvasmm.h>
 
 using namespace std;
@@ -36,15 +37,16 @@ public:
 	Patchage(int argc, char** argv);
 	~Patchage();
 
-	PatchageFlowCanvas*   canvas()          { return m_canvas; }
-	StateManager*         state_manager()   { return m_state_manager; }
-	Gtk::Window*          window()          { return m_main_window; }
-	JackDriver*           jack_driver()     { return m_jack_driver; }
+	boost::shared_ptr<PatchageFlowCanvas> canvas() { return m_canvas; }
+	
+	StateManager* state_manager() { return m_state_manager; }
+	Gtk::Window*  window()        { return m_main_window; }
+	JackDriver*   jack_driver()   { return m_jack_driver; }
 #ifdef HAVE_ALSA
-	AlsaDriver*           alsa_driver()     { return m_alsa_driver; }
+	AlsaDriver*   alsa_driver()   { return m_alsa_driver; }
 #endif
 #ifdef HAVE_LASH
-	LashDriver*       lash_driver()     { return m_lash_driver; }
+	LashDriver*   lash_driver()   { return m_lash_driver; }
 #endif
 	
 	void attach();
@@ -85,7 +87,8 @@ protected:
 	void menu_alsa_disconnect();
 #endif
 
-	PatchageFlowCanvas* m_canvas;
+	boost::shared_ptr<PatchageFlowCanvas> m_canvas;
+
 	JackDriver*         m_jack_driver;
 	StateManager*       m_state_manager;
 
-- 
cgit v1.2.1