For MSVC, 'using namespace whatever' doesn't help us to differentiate between ambiguo...

[ardour.git] / gtk2_ardour / bundle_manager.cc

diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index 9916f805810f65741e3e59a7befdff44608e27e7..234a603cbb6fd37cb047e237e076dfc26aa3392a 100644 (file)
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -27,14 +27,14 @@
 
 #include "ardour/session.h"
 #include "ardour/user_bundle.h"
-#include "ardour/audioengine.h"
 #include "bundle_manager.h"
 #include "gui_thread.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "utils.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
 BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr<Bundle> bundle)
        : PortMatrix (parent, session, DataType::NIL)
@@ -59,8 +59,8 @@ BundleEditorMatrix::setup_ports (int dim)
                /* when we gather, allow the matrix to contain bundles with duplicate port sets,
                   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,11 +82,15 @@ 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;
        }
-       
+
        for (Bundle::PortList::const_iterator i = pl.begin(); i != pl.end(); ++i) {
                if (!c[OURS].bundle->port_attached_to_channel (c[OURS].channel, *i)) {
                        return PortMatrixNode::NOT_ASSOCIATED;
@@ -97,13 +101,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 +116,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 +162,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 +220,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
@@ -283,7 +287,7 @@ BundleManager::BundleManager (Session* session)
        edit_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::EDIT, Gtk::ICON_SIZE_BUTTON)));
        edit_button.signal_clicked().connect (sigc::mem_fun (*this, &BundleManager::edit_clicked));
        buttons->pack_start (edit_button, false, false);
-       delete_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::DELETE, Gtk::ICON_SIZE_BUTTON)));
+       delete_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::StockID(GTK_STOCK_DELETE), Gtk::ICON_SIZE_BUTTON)));
        delete_button.signal_clicked().connect (sigc::mem_fun (*this, &BundleManager::delete_clicked));
        buttons->pack_start (delete_button, false, false);
 
@@ -306,6 +310,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 +377,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
@@ -401,7 +408,7 @@ BundleManager::row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColum
        if (!i) {
                return;
        }
-       
+
        boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
        BundleEditor e (_session, b);
        e.run ();
@@ -417,7 +424,6 @@ NameChannelDialog::NameChannelDialog ()
 NameChannelDialog::NameChannelDialog (boost::shared_ptr<Bundle> b, uint32_t c)
        : ArdourDialog (_("Rename Channel")),
          _bundle (b),
-         _channel (c),
          _adding (false)
 {
        _name.set_text (b->channel_name (c));