fix required library versions; fix use of shared_ptr by redirect_box; fix double delete of redirects; make delete event work only on button release, in general

git-svn-id: svn://localhost/ardour2/trunk@1193 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 8 deletions

diff --git a/gtk2_ardour/redirect_box.h b/gtk2_ardour/redirect_box.h
index 4b872ed0bf..7ab7d03cac 100644
--- a/gtk2_ardour/redirect_box.h
+++ b/gtk2_ardour/redirect_box.h
@@ -151,17 +151,13 @@ class RedirectBox : public Gtk::HBox
 	bool ignore_delete;
 
 	bool redirect_button_press_event (GdkEventButton *);
+	bool redirect_button_release_event (GdkEventButton *);
 	void redisplay_redirects (void* src);
 	void add_redirect_to_display (boost::shared_ptr<ARDOUR::Redirect>);
 	void row_deleted (const Gtk::TreeModel::Path& path);
-	void show_redirect_name (void*, boost::weak_ptr<ARDOUR::Redirect>);
-
-	/* these are handlers for Redirect signals, so they take Redirect*
-	   directly, rather than shared_ptr<Redirect>
-	*/
-
-	void show_redirect_active (boost::weak_ptr<ARDOUR::Redirect>, void *);
-
+	void show_redirect_active_r (ARDOUR::Redirect*, void *, boost::weak_ptr<ARDOUR::Redirect>);
+	void show_redirect_active (boost::weak_ptr<ARDOUR::Redirect>);
+	void show_redirect_name (void* src, boost::weak_ptr<ARDOUR::Redirect>);
 	string redirect_name (boost::weak_ptr<ARDOUR::Redirect>);
 
 	void remove_redirect_gui (boost::shared_ptr<ARDOUR::Redirect>);