removed (will replace) rgb_macros.h

[ardour.git] / gtk2_ardour / bundle_manager.cc

diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index a65f5bae353ecc6a92811dc054249413a9c6fbac..9916f805810f65741e3e59a7befdff44608e27e7 100644 (file)
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -37,7 +37,7 @@ using namespace std;
 using namespace ARDOUR;
 
 BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr<Bundle> bundle)
-       : PortMatrix (parent, session, bundle->type())
+       : PortMatrix (parent, session, DataType::NIL)
        , _bundle (bundle)
 {
        _port_group = boost::shared_ptr<PortGroup> (new PortGroup (""));
@@ -60,7 +60,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, _bundle->ports_are_inputs(), true);
+               _ports[OTHER].gather (_session, DataType::NIL, _bundle->ports_are_inputs(), true);
                _ports[OTHER].remove_bundle (_bundle);
                _ports[OTHER].resume_signals ();
        }
@@ -107,7 +107,7 @@ BundleEditorMatrix::can_add_channel (boost::shared_ptr<Bundle> b) const
 }
 
 void
-BundleEditorMatrix::add_channel (boost::shared_ptr<Bundle> b)
+BundleEditorMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
 {
        if (b == _bundle) {
 
@@ -118,12 +118,12 @@ BundleEditorMatrix::add_channel (boost::shared_ptr<Bundle> b)
                        return;
                }
 
-               _bundle->add_channel (d.get_name());
+               _bundle->add_channel (d.get_name(), t);
                setup_ports (OURS);
 
        } else {
 
-               PortMatrix::add_channel (b);
+               PortMatrix::add_channel (b, t);
 
        }
 }
@@ -174,6 +174,12 @@ BundleEditorMatrix::list_is_global (int dim) const
        return (dim == OTHER);
 }
 
+string
+BundleEditorMatrix::disassociation_verb () const
+{
+       return _("Disassociate");
+}
+
 BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bundle)
        : ArdourDialog (_("Edit Bundle")), _matrix (this, session, bundle), _bundle (bundle)
 {
@@ -206,28 +212,6 @@ BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bund
 
        _input_or_output.signal_changed().connect (sigc::mem_fun (*this, &BundleEditor::input_or_output_changed));
 
-       /* Type (audio or MIDI) */
-       a = new Gtk::Alignment (1, 0.5, 0, 1);
-       a->add (*Gtk::manage (new Gtk::Label (_("Type:"))));
-       t->attach (*Gtk::manage (a), 0, 1, 2, 3, Gtk::FILL, Gtk::FILL);
-       a = new Gtk::Alignment (0, 0.5, 0, 1);
-       a->add (_type);
-       t->attach (*Gtk::manage (a), 1, 2, 2, 3);
-
-       _type.append_text (_("Audio"));
-       _type.append_text (_("MIDI"));
-
-       switch (bundle->type ()) {
-       case DataType::AUDIO:
-               _type.set_active_text (_("Audio"));
-               break;
-       case DataType::MIDI:
-               _type.set_active_text (_("MIDI"));
-               break;
-       }
-
-       _type.signal_changed().connect (sigc::mem_fun (*this, &BundleEditor::type_changed));
-
        get_vbox()->pack_start (*Gtk::manage (t), false, false);
        get_vbox()->pack_start (_matrix);
        get_vbox()->set_spacing (4);
@@ -264,18 +248,6 @@ BundleEditor::input_or_output_changed ()
        _matrix.setup_all_ports ();
 }
 
-void
-BundleEditor::type_changed ()
-{
-       _bundle->remove_ports_from_channels ();
-
-       DataType const t = _type.get_active_text() == _("Audio") ?
-               DataType::AUDIO : DataType::MIDI;
-
-       _bundle->set_type (t);
-       _matrix.set_type (t);
-}
-
 void
 BundleEditor::on_map ()
 {
@@ -354,7 +326,8 @@ BundleManager::new_clicked ()
        boost::shared_ptr<UserBundle> b (new UserBundle (_("Bundle")));
 
        /* Start off with a single channel */
-       b->add_channel ("1");
+       /* XXX: allow user to specify type */
+       b->add_channel ("1", DataType::AUDIO);
 
        _session->add_bundle (b);
        add_bundle (b);
@@ -397,7 +370,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, ui_bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
+       u->Changed.connect (bundle_connections, invalidator (*this), ui_bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
 }
 
 void
@@ -435,14 +408,14 @@ BundleManager::row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColum
 }
 
 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)