From ad07c414d557629251b2f4ea4078c22f241cc865 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 13 Feb 2010 22:07:26 +0000
Subject: Learn and remove bindings exclusively through property interface.

Note this commit breaks some aspects of OSC and HTTP control for now.


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2442 a436a847-0d15-0410-975c-d299462d15a1
---
 src/gui/ObjectMenu.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/gui/ObjectMenu.cpp')

diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 5151fadc..41505e99 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -15,6 +15,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <utility>
 #include <gtkmm.h>
 #include "interface/EngineInterface.hpp"
 #include "shared/LV2URIMap.hpp"
@@ -39,6 +40,7 @@ ObjectMenu::ObjectMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade:
 	, _properties_menuitem(NULL)
 {
 	xml->get_widget("object_learn_menuitem", _learn_menuitem);
+	xml->get_widget("object_unlearn_menuitem", _unlearn_menuitem);
 	xml->get_widget("object_polyphonic_menuitem", _polyphonic_menuitem);
 	xml->get_widget("object_disconnect_menuitem", _disconnect_menuitem);
 	xml->get_widget("object_rename_menuitem", _rename_menuitem);
@@ -62,6 +64,9 @@ ObjectMenu::init(SharedPtr<ObjectModel> object)
 	_learn_menuitem->signal_activate().connect(
 			sigc::mem_fun(this, &ObjectMenu::on_menu_learn));
 
+	_unlearn_menuitem->signal_activate().connect(
+			sigc::mem_fun(this, &ObjectMenu::on_menu_unlearn));
+
 	_disconnect_menuitem->signal_activate().connect(
 			sigc::mem_fun(this, &ObjectMenu::on_menu_disconnect));
 
@@ -78,6 +83,7 @@ ObjectMenu::init(SharedPtr<ObjectModel> object)
 	object->signal_property.connect(sigc::mem_fun(this, &ObjectMenu::property_changed));
 
 	_learn_menuitem->hide();
+	_unlearn_menuitem->hide();
 
 	_enable_signal = true;
 }
@@ -86,7 +92,20 @@ ObjectMenu::init(SharedPtr<ObjectModel> object)
 void
 ObjectMenu::on_menu_learn()
 {
-	App::instance().engine()->learn(_object->path());
+	App::instance().engine()->set_property(_object->path(),
+			App::instance().uris().ingen_controlBinding,
+			App::instance().uris().wildcard);
+}
+
+
+void
+ObjectMenu::on_menu_unlearn()
+{
+	Resource::Properties remove;
+	remove.insert(std::make_pair(
+			App::instance().uris().ingen_controlBinding,
+			App::instance().uris().wildcard));
+	App::instance().engine()->delta(_object->path(), remove, Resource::Properties());
 }
 
 
-- 
cgit v1.2.1