more solo model work, including a GUI fix for mute button state when the route is...

[ardour.git] / gtk2_ardour / bundle_manager.cc

diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index ff7cec26338000783bab9e7b5d2033e55643be2e..559bc7ed6c926188e711d9563230d91a5298c557 100644 (file)
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -24,24 +24,27 @@
 #include <gtkmm/table.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/alignment.h>
+
 #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 "utils.h"
 
 using namespace std;
 using namespace ARDOUR;
 
-BundleEditorMatrix::BundleEditorMatrix (
-       Gtk::Window* parent, Session& session, boost::shared_ptr<Bundle> bundle
-       )
-       : PortMatrix (parent, session, bundle->type()),
-         _bundle (bundle)
+BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr<Bundle> bundle)
+       : PortMatrix (parent, session, bundle->type())
+       , _bundle (bundle)
 {
        _port_group = boost::shared_ptr<PortGroup> (new PortGroup (""));
        _port_group->add_bundle (_bundle);
+
+       setup_all_ports ();
+       init ();
 }
 
 void
@@ -52,7 +55,12 @@ BundleEditorMatrix::setup_ports (int dim)
                _ports[OURS].add_group (_port_group);
        } else {
                _ports[OTHER].suspend_signals ();
-               _ports[OTHER].gather (_session, _bundle->ports_are_inputs());
+
+               /* 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, _bundle->ports_are_inputs(), true);
                _ports[OTHER].remove_bundle (_bundle);
                _ports[OTHER].resume_signals ();
        }
@@ -75,6 +83,10 @@ PortMatrixNode::State
 BundleEditorMatrix::get_state (BundleChannel c[2]) const
 {
        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;
@@ -162,7 +174,7 @@ BundleEditorMatrix::list_is_global (int dim) const
        return (dim == OTHER);
 }
 
-BundleEditor::BundleEditor (Session& session, boost::shared_ptr<UserBundle> bundle, bool add)
+BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bundle)
        : ArdourDialog (_("Edit Bundle")), _matrix (this, session, bundle), _bundle (bundle)
 {
        Gtk::Table* t = new Gtk::Table (3, 2);
@@ -220,13 +232,7 @@ BundleEditor::BundleEditor (Session& session, boost::shared_ptr<UserBundle> bund
        get_vbox()->pack_start (_matrix);
        get_vbox()->set_spacing (4);
 
-       add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-       if (add) {
-               add_button (Gtk::Stock::ADD, Gtk::RESPONSE_ACCEPT);
-       } else {
-               add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_ACCEPT);
-       }
-
+       add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
        show_all ();
 }
 
@@ -278,15 +284,19 @@ BundleEditor::on_map ()
 }
 
 
-BundleManager::BundleManager (Session& session)
-       : ArdourDialog (_("Bundle Manager")), _session (session), edit_button (_("Edit")), delete_button (_("Delete"))
+BundleManager::BundleManager (Session* session)
+       : ArdourDialog (_("Bundle Manager"))
+       , edit_button (_("Edit"))
+       , delete_button (_("Delete"))
 {
+       set_session (session);
+
        _list_model = Gtk::ListStore::create (_list_model_columns);
        _tree_view.set_model (_list_model);
        _tree_view.append_column (_("Name"), _list_model_columns.name);
        _tree_view.set_headers_visible (false);
 
-       boost::shared_ptr<BundleList> bundles = _session.bundles ();
+       boost::shared_ptr<BundleList> bundles = _session->bundles ();
        for (BundleList::iterator i = bundles->begin(); i != bundles->end(); ++i) {
                add_bundle (*i);
        }
@@ -320,6 +330,10 @@ BundleManager::BundleManager (Session& session)
                sigc::mem_fun (*this, &BundleManager::set_button_sensitivity)
                );
 
+       _tree_view.signal_row_activated().connect (
+               sigc::mem_fun (*this, &BundleManager::row_activated)
+               );
+
        set_button_sensitivity ();
 
        show_all ();
@@ -342,12 +356,11 @@ BundleManager::new_clicked ()
        /* Start off with a single channel */
        b->add_channel ("1");
 
-       BundleEditor e (_session, b, true);
+       _session->add_bundle (b);
+       add_bundle (b);
 
-       if (e.run () == Gtk::RESPONSE_ACCEPT) {
-               _session.add_bundle (b);
-               add_bundle (b);
-       }
+       BundleEditor e (_session, b);
+       e.run ();
 }
 
 void
@@ -356,10 +369,8 @@ BundleManager::edit_clicked ()
        Gtk::TreeModel::iterator i = _tree_view.get_selection()->get_selected();
        if (i) {
                boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
-               BundleEditor e (_session, b, false);
-               if (e.run () == Gtk::RESPONSE_ACCEPT) {
-                       _session.set_dirty ();
-               }
+               BundleEditor e (_session, b);
+               e.run ();
        }
 }
 
@@ -369,7 +380,7 @@ BundleManager::delete_clicked ()
        Gtk::TreeModel::iterator i = _tree_view.get_selection()->get_selected();
        if (i) {
                boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
-               _session.remove_bundle (b);
+               _session->remove_bundle (b);
                _list_model->erase (i);
        }
 }
@@ -386,7 +397,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 (sigc::bind (sigc::mem_fun (*this, &BundleManager::bundle_changed), u));
+       u->Changed.connect (bundle_connections, invalidator (*this), ui_bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
 }
 
 void
@@ -410,15 +421,28 @@ BundleManager::bundle_changed (Bundle::Change c, boost::shared_ptr<UserBundle> b
        }
 }
 
+void
+BundleManager::row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColumn*)
+{
+       Gtk::TreeModel::iterator i = _list_model->get_iter (p);
+       if (!i) {
+               return;
+       }
+       
+       boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
+       BundleEditor e (_session, b);
+       e.run ();
+}
+
 NameChannelDialog::NameChannelDialog ()
-       : ArdourDialog (_("Add channel")),
+       : ArdourDialog (_("Add Channel")),
          _adding (true)
 {
        setup ();
 }
 
 NameChannelDialog::NameChannelDialog (boost::shared_ptr<Bundle> b, uint32_t c)
-       : ArdourDialog (_("Rename channel")),
+       : ArdourDialog (_("Rename Channel")),
          _bundle (b),
          _channel (c),
          _adding (false)
@@ -435,6 +459,7 @@ NameChannelDialog::setup ()
 
        box->pack_start (*Gtk::manage (new Gtk::Label (_("Name"))));
        box->pack_start (_name);
+       _name.set_activates_default (true);
 
        get_vbox ()->pack_end (*box);
        box->show_all ();