X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_manager.cc;h=c7754f69cccf3541b9d8919e334c16cb5dd5bbca;hb=3f56abe099cd6978fbf2e1778debd74e771c95cd;hp=5940a624504c001fc179e05b2d625dde8eeaed85;hpb=78237f3ac3a7918417cd11b30d25c4afdf9b2108;p=ardour.git

diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index 5940a62450..c7754f69cc 100644
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -27,7 +27,6 @@
 
 #include "ardour/session.h"
 #include "ardour/user_bundle.h"
-#include "ardour/audioengine.h"
 #include "bundle_manager.h"
 #include "gui_thread.h"
 #include "i18n.h"
@@ -101,13 +100,13 @@ BundleEditorMatrix::get_state (BundleChannel c[2]) const
 }
 
 bool
-BundleEditorMatrix::can_add_channel (boost::shared_ptr<Bundle> b) const
+BundleEditorMatrix::can_add_channels (boost::shared_ptr<Bundle> b) const
 {
 	if (b == _bundle) {
 		return true;
 	}
 
-	return PortMatrix::can_add_channel (b);
+	return PortMatrix::can_add_channels (b);
 }
 
 void
@@ -116,7 +115,6 @@ BundleEditorMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
 	if (b == _bundle) {
 
 		NameChannelDialog d;
-		d.set_position (Gtk::WIN_POS_MOUSE);
 
 		if (d.run () != Gtk::RESPONSE_ACCEPT) {
 			return;
@@ -163,7 +161,6 @@ void
 BundleEditorMatrix::rename_channel (BundleChannel bc)
 {
 	NameChannelDialog d (bc.bundle, bc.channel);
-	d.set_position (Gtk::WIN_POS_MOUSE);
 
 	if (d.run () != Gtk::RESPONSE_ACCEPT) {
 		return;
@@ -222,6 +219,8 @@ BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bund
 
 	add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
 	show_all ();
+
+	signal_key_press_event().connect (sigc::mem_fun (_matrix, &BundleEditorMatrix::key_press));
 }
 
 void