Use test_search_path to find test data in xpath test

[ardour.git] / gtk2_ardour / bundle_manager.cc

diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index 2e85b6a0300aceb9a627e3e084142e941744056f..c7754f69cccf3541b9d8919e334c16cb5dd5bbca 100644 (file)
--- 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"
@@ -60,7 +59,7 @@ BundleEditorMatrix::setup_ports (int dim)
                   otherwise in some cases the basic system IO ports may be hidden, making
                   the bundle editor useless */
 
-               _ports[OTHER].gather (_session, DataType::NIL, _bundle->ports_are_inputs(), true);
+               _ports[OTHER].gather (_session, DataType::NIL, _bundle->ports_are_inputs(), true, show_only_bundles ());
                _ports[OTHER].remove_bundle (_bundle);
                _ports[OTHER].resume_signals ();
        }
@@ -82,6 +81,10 @@ BundleEditorMatrix::set_state (BundleChannel c[2], bool s)
 PortMatrixNode::State
 BundleEditorMatrix::get_state (BundleChannel c[2]) const
 {
+       if (c[0].bundle->nchannels() == ChanCount::ZERO || c[1].bundle->nchannels() == ChanCount::ZERO) {
+               return PortMatrixNode::NOT_ASSOCIATED;
+       }
+
        Bundle::PortList const& pl = c[OTHER].bundle->channel_ports (c[OTHER].channel);
        if (pl.empty ()) {
                return PortMatrixNode::NOT_ASSOCIATED;
@@ -97,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
@@ -112,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;
@@ -159,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;
@@ -218,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
@@ -306,6 +309,9 @@ BundleManager::BundleManager (Session* session)
                sigc::mem_fun (*this, &BundleManager::row_activated)
                );
 
+       Gtk::Button* close_but = add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
+       close_but->signal_clicked ().connect (sigc::mem_fun (*this, &Gtk::Window::hide));
+
        set_button_sensitivity ();
 
        show_all ();
@@ -370,7 +376,7 @@ BundleManager::add_bundle (boost::shared_ptr<Bundle> b)
        (*i)[_list_model_columns.name] = u->name ();
        (*i)[_list_model_columns.bundle] = u;
 
-       u->Changed.connect (bundle_connections, invalidator (*this), ui_bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
+       u->Changed.connect (bundle_connections, invalidator (*this), boost::bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
 }
 
 void