X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_manager.cc;h=9916f805810f65741e3e59a7befdff44608e27e7;hb=6e0330a304e06311502f82ac1ebc969121695aa5;hp=dd6275145375d38ba3470267a98fae83bd9dbc45;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index dd62751453..9916f80581 100644 --- a/gtk2_ardour/bundle_manager.cc +++ b/gtk2_ardour/bundle_manager.cc @@ -24,24 +24,27 @@ #include #include #include + #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 - ) - : PortMatrix (parent, session, bundle->type()), - _bundle (bundle) +BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr bundle) + : PortMatrix (parent, session, DataType::NIL) + , _bundle (bundle) { _port_group = boost::shared_ptr (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, DataType::NIL, _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; @@ -95,7 +107,7 @@ BundleEditorMatrix::can_add_channel (boost::shared_ptr b) const } void -BundleEditorMatrix::add_channel (boost::shared_ptr b) +BundleEditorMatrix::add_channel (boost::shared_ptr b, DataType t) { if (b == _bundle) { @@ -106,12 +118,12 @@ BundleEditorMatrix::add_channel (boost::shared_ptr 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); } } @@ -162,7 +174,13 @@ BundleEditorMatrix::list_is_global (int dim) const return (dim == OTHER); } -BundleEditor::BundleEditor (Session& session, boost::shared_ptr bundle, bool add) +string +BundleEditorMatrix::disassociation_verb () const +{ + return _("Disassociate"); +} + +BundleEditor::BundleEditor (Session* session, boost::shared_ptr bundle) : ArdourDialog (_("Edit Bundle")), _matrix (this, session, bundle), _bundle (bundle) { Gtk::Table* t = new Gtk::Table (3, 2); @@ -194,39 +212,11 @@ BundleEditor::BundleEditor (Session& session, boost::shared_ptr 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); - 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 (); } @@ -258,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 () { @@ -278,15 +256,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 bundles = _session.bundles (); + boost::shared_ptr bundles = _session->bundles (); for (BundleList::iterator i = bundles->begin(); i != bundles->end(); ++i) { add_bundle (*i); } @@ -320,6 +302,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 (); @@ -340,14 +326,14 @@ BundleManager::new_clicked () boost::shared_ptr 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); - 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 +342,8 @@ BundleManager::edit_clicked () Gtk::TreeModel::iterator i = _tree_view.get_selection()->get_selected(); if (i) { boost::shared_ptr 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 +353,7 @@ BundleManager::delete_clicked () Gtk::TreeModel::iterator i = _tree_view.get_selection()->get_selected(); if (i) { boost::shared_ptr b = (*i)[_list_model_columns.bundle]; - _session.remove_bundle (b); + _session->remove_bundle (b); _list_model->erase (i); } } @@ -386,7 +370,7 @@ BundleManager::add_bundle (boost::shared_ptr 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 +394,28 @@ BundleManager::bundle_changed (Bundle::Change c, boost::shared_ptr 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 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 b, uint32_t c) - : ArdourDialog (_("Rename channel")), + : ArdourDialog (_("Rename Channel")), _bundle (b), _channel (c), _adding (false) @@ -435,6 +432,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 ();