From: Robin Gareus <robin@gareus.org>
Date: Sat, 23 Mar 2019 00:45:29 +0000 (+0100)
Subject: Use weak-pointer for Controllable learning
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=16fe286ed97e89a6768e0eb1e983ab55cc396eaf;p=ardour.git

Use weak-pointer for Controllable learning
---

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index 69a58b4d0e..de1dab71a3 100644
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -30,8 +30,8 @@ using namespace PBD;
 using namespace std;
 
 PBD::Signal1<void,Controllable*> Controllable::Destroyed;
-PBD::Signal1<bool,Controllable*> Controllable::StartLearning;
-PBD::Signal1<void,Controllable*> Controllable::StopLearning;
+PBD::Signal1<bool, boost::weak_ptr<PBD::Controllable> > Controllable::StartLearning;
+PBD::Signal1<void, boost::weak_ptr<PBD::Controllable> > Controllable::StopLearning;
 PBD::Signal1<void, boost::weak_ptr<PBD::Controllable> > Controllable::GUIFocusChanged;
 
 const std::string Controllable::xml_node_name = X_("Controllable");
diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h
index dbbea5dc5f..1cc4cdf083 100644
--- a/libs/pbd/pbd/controllable.h
+++ b/libs/pbd/pbd/controllable.h
@@ -123,8 +123,8 @@ public:
 
 	PBD::Signal0<void> LearningFinished;
 
-	static PBD::Signal1<bool,PBD::Controllable*> StartLearning;
-	static PBD::Signal1<void,PBD::Controllable*> StopLearning;
+	static PBD::Signal1<bool, boost::weak_ptr<PBD::Controllable> > StartLearning;
+	static PBD::Signal1<void, boost::weak_ptr<PBD::Controllable> > StopLearning;
 
 	static PBD::Signal1<void,Controllable*> Destroyed;
 
diff --git a/libs/widgets/binding_proxy.cc b/libs/widgets/binding_proxy.cc
index 85119ab1c0..98f4443ad2 100644
--- a/libs/widgets/binding_proxy.cc
+++ b/libs/widgets/binding_proxy.cc
@@ -91,7 +91,7 @@ bool
 BindingProxy::button_press_handler (GdkEventButton *ev)
 {
 	if ( controllable && is_bind_action(ev) ) {
-		if (Controllable::StartLearning (controllable.get())) {
+		if (Controllable::StartLearning (controllable)) {
 			string prompt = _("operate controller now");
 			if (prompter == 0) {
 				prompter = new PopUp (Gtk::WIN_POS_MOUSE, 30000, false);
@@ -121,7 +121,7 @@ BindingProxy::prompter_hiding (GdkEventAny* /*ev*/)
 {
 	learning_connection.disconnect ();
 	if (controllable) {
-		Controllable::StopLearning (controllable.get());
+		Controllable::StopLearning (controllable);
 	}
 	return false;
 }