X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_manager.cc;h=9916f805810f65741e3e59a7befdff44608e27e7;hb=79c918fd6aace3f5d94fe61973819574489ca755;hp=916413d8359c75ec36f9a5bf31c2e0b1c30f00e1;hpb=954e1a6e795a5a53865f9278105579f00143cdb1;p=ardour.git diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index 916413d835..9916f80581 100644 --- a/gtk2_ardour/bundle_manager.cc +++ b/gtk2_ardour/bundle_manager.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,156 +24,210 @@ #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 ( - ARDOUR::Session& session, boost::shared_ptr bundle - ) - : PortMatrix ( - session, bundle->type(), bundle->ports_are_inputs(), - PortGroupList::Mask (PortGroupList::SYSTEM | PortGroupList::OTHER) - ) +BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr bundle) + : PortMatrix (parent, session, DataType::NIL) + , _bundle (bundle) { - _bundle = boost::dynamic_pointer_cast (bundle); - assert (_bundle != 0); + _port_group = boost::shared_ptr (new PortGroup ("")); + _port_group->add_bundle (_bundle); + + setup_all_ports (); + init (); } void -BundleEditorMatrix::set_state (int r, std::string const & p, bool s, uint32_t keymod) +BundleEditorMatrix::setup_ports (int dim) { - if (s) { - _bundle->add_port_to_channel (r, p); + if (dim == OURS) { + _ports[OURS].clear (); + _ports[OURS].add_group (_port_group); } else { - _bundle->remove_port_from_channel (r, p); + _ports[OTHER].suspend_signals (); + + /* 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 (); } } -bool -BundleEditorMatrix::get_state (int r, std::string const & p) const +void +BundleEditorMatrix::set_state (BundleChannel c[2], bool s) { - return _bundle->port_attached_to_channel (r, p); + Bundle::PortList const& pl = c[OTHER].bundle->channel_ports (c[OTHER].channel); + for (Bundle::PortList::const_iterator i = pl.begin(); i != pl.end(); ++i) { + if (s) { + c[OURS].bundle->add_port_to_channel (c[OURS].channel, *i); + } else { + c[OURS].bundle->remove_port_from_channel (c[OURS].channel, *i); + } + } } -uint32_t -BundleEditorMatrix::n_rows () const +PortMatrixNode::State +BundleEditorMatrix::get_state (BundleChannel c[2]) const { - return _bundle->nchannels ().n_total(); + 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; + } + } + + return PortMatrixNode::ASSOCIATED; } -uint32_t -BundleEditorMatrix::maximum_rows () const +bool +BundleEditorMatrix::can_add_channel (boost::shared_ptr b) const { - /* 65536 channels in a bundle ought to be enough for anyone (TM) */ - return 65536; + if (b == _bundle) { + return true; + } + + return PortMatrix::can_add_channel (b); } -uint32_t -BundleEditorMatrix::minimum_rows () const +void +BundleEditorMatrix::add_channel (boost::shared_ptr b, DataType t) { - return 0; + if (b == _bundle) { + + NameChannelDialog d; + d.set_position (Gtk::WIN_POS_MOUSE); + + if (d.run () != Gtk::RESPONSE_ACCEPT) { + return; + } + + _bundle->add_channel (d.get_name(), t); + setup_ports (OURS); + + } else { + + PortMatrix::add_channel (b, t); + + } } -std::string -BundleEditorMatrix::row_name (int r) const +bool +BundleEditorMatrix::can_remove_channels (boost::shared_ptr b) const { - std::stringstream s; - s << r + 1; // 1-based counting - return s.str(); + if (b == _bundle) { + return true; + } + + return PortMatrix::can_remove_channels (b); } void -BundleEditorMatrix::add_row () +BundleEditorMatrix::remove_channel (BundleChannel bc) { - _bundle->add_channel (); - setup (); + bc.bundle->remove_channel (bc.channel); + setup_ports (OURS); +} + +bool +BundleEditorMatrix::can_rename_channels (boost::shared_ptr b) const +{ + if (b == _bundle) { + return true; + } + + return PortMatrix::can_rename_channels (b); } void -BundleEditorMatrix::remove_row (int r) +BundleEditorMatrix::rename_channel (BundleChannel bc) { - _bundle->remove_channel (r); - setup (); + NameChannelDialog d (bc.bundle, bc.channel); + d.set_position (Gtk::WIN_POS_MOUSE); + + if (d.run () != Gtk::RESPONSE_ACCEPT) { + return; + } + + bc.bundle->set_channel_name (bc.channel, d.get_name ()); } -std::string -BundleEditorMatrix::row_descriptor () const +bool +BundleEditorMatrix::list_is_global (int dim) const { - return _("channel"); + return (dim == OTHER); } -BundleEditor::BundleEditor (ARDOUR::Session& session, boost::shared_ptr bundle, bool add) - : ArdourDialog (_("Edit Bundle")), _matrix (session, bundle), _bundle (bundle) +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); t->set_spacings (4); + /* Bundle name */ Gtk::Alignment* a = new Gtk::Alignment (1, 0.5, 0, 1); a->add (*Gtk::manage (new Gtk::Label (_("Name:")))); t->attach (*Gtk::manage (a), 0, 1, 0, 1, Gtk::FILL, Gtk::FILL); t->attach (_name, 1, 2, 0, 1); - _name.set_text (_bundle->name ()); _name.signal_changed().connect (sigc::mem_fun (*this, &BundleEditor::name_changed)); + /* Direction (input or output) */ a = new Gtk::Alignment (1, 0.5, 0, 1); a->add (*Gtk::manage (new Gtk::Label (_("Direction:")))); t->attach (*Gtk::manage (a), 0, 1, 1, 2, Gtk::FILL, Gtk::FILL); a = new Gtk::Alignment (0, 0.5, 0, 1); a->add (_input_or_output); t->attach (*Gtk::manage (a), 1, 2, 1, 2); - _input_or_output.append_text (_("Input")); _input_or_output.append_text (_("Output")); - + if (bundle->ports_are_inputs()) { - _input_or_output.set_active_text (_("Output")); - } else { _input_or_output.set_active_text (_("Input")); + } else { + _input_or_output.set_active_text (_("Output")); } _input_or_output.signal_changed().connect (sigc::mem_fun (*this, &BundleEditor::input_or_output_changed)); - 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 ARDOUR::DataType::AUDIO: - _type.set_active_text (_("Audio")); - break; - case ARDOUR::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); - if (add) { - add_button (Gtk::Stock::CANCEL, 1); - add_button (Gtk::Stock::ADD, 0); - } else { - add_button (Gtk::Stock::CLOSE, 0); - } - + add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT); show_all (); } +void +BundleEditor::on_show () +{ + Gtk::Window::on_show (); + pair const pm_max = _matrix.max_size (); + resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second); +} + void BundleEditor::name_changed () { @@ -183,43 +237,42 @@ BundleEditor::name_changed () void BundleEditor::input_or_output_changed () { + _bundle->remove_ports_from_channels (); + if (_input_or_output.get_active_text() == _("Output")) { - _bundle->set_ports_are_inputs (); - _matrix.set_offer_inputs (true); - } else { _bundle->set_ports_are_outputs (); - _matrix.set_offer_inputs (false); + } else { + _bundle->set_ports_are_inputs (); } -} - -void -BundleEditor::type_changed () -{ - ARDOUR::DataType const t = _type.get_active_text() == _("Audio") ? - ARDOUR::DataType::AUDIO : ARDOUR::DataType::MIDI; - _bundle->set_type (t); - _matrix.set_type (t); + _matrix.setup_all_ports (); } void BundleEditor::on_map () { - _matrix.setup (); + _matrix.setup_all_ports (); Window::on_map (); } -BundleManager::BundleManager (ARDOUR::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); - _session.foreach_bundle (sigc::mem_fun (*this, &BundleManager::add_bundle)); - + boost::shared_ptr bundles = _session->bundles (); + for (BundleList::iterator i = bundles->begin(); i != bundles->end(); ++i) { + add_bundle (*i); + } + /* New / Edit / Delete buttons */ Gtk::VBox* buttons = new Gtk::VBox; buttons->set_spacing (8); @@ -233,7 +286,7 @@ BundleManager::BundleManager (ARDOUR::Session& session) delete_button.set_image (*Gtk::manage (new Gtk::Image (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); - + Gtk::HBox* h = new Gtk::HBox; h->set_spacing (8); h->set_border_width (8); @@ -249,6 +302,10 @@ BundleManager::BundleManager (ARDOUR::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 (); @@ -266,16 +323,17 @@ BundleManager::set_button_sensitivity () void BundleManager::new_clicked () { - boost::shared_ptr b (new ARDOUR::UserBundle ("")); + boost::shared_ptr b (new UserBundle (_("Bundle"))); /* Start off with a single channel */ - b->add_channel (); + /* XXX: allow user to specify type */ + b->add_channel ("1", DataType::AUDIO); - BundleEditor e (_session, b, true); - if (e.run () == 0) { - _session.add_bundle (b); - add_bundle (b); - } + _session->add_bundle (b); + add_bundle (b); + + BundleEditor e (_session, b); + e.run (); } void @@ -283,11 +341,10 @@ 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); + boost::shared_ptr b = (*i)[_list_model_columns.bundle]; + BundleEditor e (_session, b); e.run (); } - } void @@ -295,16 +352,16 @@ 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); + boost::shared_ptr b = (*i)[_list_model_columns.bundle]; + _session->remove_bundle (b); _list_model->erase (i); } } void -BundleManager::add_bundle (boost::shared_ptr b) +BundleManager::add_bundle (boost::shared_ptr b) { - boost::shared_ptr u = boost::dynamic_pointer_cast (b); + boost::shared_ptr u = boost::dynamic_pointer_cast (b); if (u == 0) { return; } @@ -313,15 +370,19 @@ BundleManager::add_bundle (boost::shared_ptr b) (*i)[_list_model_columns.name] = u->name (); (*i)[_list_model_columns.bundle] = u; - u->NameChanged.connect (sigc::bind (sigc::mem_fun (*this, &BundleManager::bundle_name_changed), u)); + u->Changed.connect (bundle_connections, invalidator (*this), ui_bind (&BundleManager::bundle_changed, this, _1, u), gui_context()); } void -BundleManager::bundle_name_changed (boost::shared_ptr b) +BundleManager::bundle_changed (Bundle::Change c, boost::shared_ptr b) { + if ((c & Bundle::NameChanged) == 0) { + return; + } + Gtk::TreeModel::iterator i = _list_model->children().begin (); while (i != _list_model->children().end()) { - boost::shared_ptr t = (*i)[_list_model_columns.bundle]; + boost::shared_ptr t = (*i)[_list_model_columns.bundle]; if (t == b) { break; } @@ -333,3 +394,61 @@ BundleManager::bundle_name_changed (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")), + _adding (true) +{ + setup (); +} + +NameChannelDialog::NameChannelDialog (boost::shared_ptr b, uint32_t c) + : ArdourDialog (_("Rename Channel")), + _bundle (b), + _channel (c), + _adding (false) +{ + _name.set_text (b->channel_name (c)); + + setup (); +} + +void +NameChannelDialog::setup () +{ + Gtk::HBox* box = Gtk::manage (new Gtk::HBox ()); + + 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 (); + + add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + if (_adding) { + add_button (Gtk::Stock::ADD, Gtk::RESPONSE_ACCEPT); + } else { + add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_ACCEPT); + } + set_default_response (Gtk::RESPONSE_ACCEPT); +} + +string +NameChannelDialog::get_name () const +{ + return _name.get_text (); +} +