X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_manager.cc;h=559bc7ed6c926188e711d9563230d91a5298c557;hb=e33d4553b2b333c30835b00741fc5c1fd0e2b36d;hp=8fd7c05973e52d76c16511efa1a0a3cc767b37da;hpb=c6509b8f86c29f05e64e98093fda7635ac951ebb;p=ardour.git diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index 8fd7c05973..559bc7ed6c 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,20 +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 ( - ARDOUR::Session& session, boost::shared_ptr bundle - ) - : PortMatrix (session, bundle->type()), - _bundle (bundle) +BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr bundle) + : PortMatrix (parent, session, bundle->type()) + , _bundle (bundle) { _port_group = boost::shared_ptr (new PortGroup ("")); _port_group->add_bundle (_bundle); + + setup_all_ports (); + init (); } void @@ -48,17 +55,22 @@ 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 (); } } void -BundleEditorMatrix::set_state (ARDOUR::BundleChannel c[2], bool s) +BundleEditorMatrix::set_state (BundleChannel c[2], bool s) { - ARDOUR::Bundle::PortList const& pl = c[OTHER].bundle->channel_ports (c[OTHER].channel); - for (ARDOUR::Bundle::PortList::const_iterator i = pl.begin(); i != pl.end(); ++i) { + 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 { @@ -68,10 +80,14 @@ BundleEditorMatrix::set_state (ARDOUR::BundleChannel c[2], bool s) } PortMatrixNode::State -BundleEditorMatrix::get_state (ARDOUR::BundleChannel c[2]) const +BundleEditorMatrix::get_state (BundleChannel c[2]) const { - ARDOUR::Bundle::PortList const& pl = c[OTHER].bundle->channel_ports (c[OTHER].channel); - for (ARDOUR::Bundle::PortList::const_iterator i = pl.begin(); i != pl.end(); ++i) { + 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; } @@ -80,35 +96,67 @@ BundleEditorMatrix::get_state (ARDOUR::BundleChannel c[2]) const return PortMatrixNode::ASSOCIATED; } -std::string -BundleEditorMatrix::add_channel_name () const +bool +BundleEditorMatrix::can_add_channel (boost::shared_ptr b) const { - return _bundle->name (); + if (b == _bundle) { + return true; + } + + return PortMatrix::can_add_channel (b); } void -BundleEditorMatrix::add_channel () +BundleEditorMatrix::add_channel (boost::shared_ptr b) { - NameChannelDialog d; - d.set_position (Gtk::WIN_POS_MOUSE); + 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()); + setup_ports (OURS); + + } else { + + PortMatrix::add_channel (b); - if (d.run () != Gtk::RESPONSE_ACCEPT) { - return; } +} - _bundle->add_channel (d.get_name()); - setup_ports (OURS); +bool +BundleEditorMatrix::can_remove_channels (boost::shared_ptr b) const +{ + if (b == _bundle) { + return true; + } + + return PortMatrix::can_remove_channels (b); } void -BundleEditorMatrix::remove_channel (ARDOUR::BundleChannel bc) +BundleEditorMatrix::remove_channel (BundleChannel bc) { 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::rename_channel (ARDOUR::BundleChannel bc) +BundleEditorMatrix::rename_channel (BundleChannel bc) { NameChannelDialog d (bc.bundle, bc.channel); d.set_position (Gtk::WIN_POS_MOUSE); @@ -126,8 +174,8 @@ BundleEditorMatrix::list_is_global (int dim) const return (dim == OTHER); } -BundleEditor::BundleEditor (ARDOUR::Session& session, boost::shared_ptr bundle, bool add) - : ArdourDialog (_("Edit Bundle")), _matrix (session, bundle), _bundle (bundle) +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); @@ -149,7 +197,7 @@ BundleEditor::BundleEditor (ARDOUR::Session& session, boost::shared_ptrattach (*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 (_("Input")); } else { @@ -165,28 +213,37 @@ BundleEditor::BundleEditor (ARDOUR::Session& session, boost::shared_ptradd (_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: + case DataType::AUDIO: _type.set_active_text (_("Audio")); break; - case ARDOUR::DataType::MIDI: + 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::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 () { @@ -197,7 +254,7 @@ void BundleEditor::input_or_output_changed () { _bundle->remove_ports_from_channels (); - + if (_input_or_output.get_active_text() == _("Output")) { _bundle->set_ports_are_outputs (); } else { @@ -211,9 +268,9 @@ void BundleEditor::type_changed () { _bundle->remove_ports_from_channels (); - - ARDOUR::DataType const t = _type.get_active_text() == _("Audio") ? - ARDOUR::DataType::AUDIO : ARDOUR::DataType::MIDI; + + DataType const t = _type.get_active_text() == _("Audio") ? + DataType::AUDIO : DataType::MIDI; _bundle->set_type (t); _matrix.set_type (t); @@ -227,19 +284,23 @@ BundleEditor::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); - boost::shared_ptr bundles = _session.bundles (); - for (ARDOUR::BundleList::iterator i = bundles->begin(); i != bundles->end(); ++i) { + 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); @@ -253,7 +314,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); @@ -269,6 +330,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 (); @@ -286,17 +351,16 @@ 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 (""); + 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 @@ -304,11 +368,9 @@ 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 (); - } + boost::shared_ptr b = (*i)[_list_model_columns.bundle]; + BundleEditor e (_session, b); + e.run (); } } @@ -317,16 +379,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; } @@ -335,19 +397,19 @@ 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 -BundleManager::bundle_changed (ARDOUR::Bundle::Change c, boost::shared_ptr b) +BundleManager::bundle_changed (Bundle::Change c, boost::shared_ptr b) { - if ((c & ARDOUR::Bundle::NameChanged) == 0) { + 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; } @@ -359,16 +421,28 @@ BundleManager::bundle_changed (ARDOUR::Bundle::Change c, boost::shared_ptrget_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")), +NameChannelDialog::NameChannelDialog (boost::shared_ptr b, uint32_t c) + : ArdourDialog (_("Rename Channel")), _bundle (b), _channel (c), _adding (false) @@ -380,11 +454,12 @@ NameChannelDialog::NameChannelDialog (boost::shared_ptr b, uint3 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 (); @@ -398,8 +473,9 @@ NameChannelDialog::setup () set_default_response (Gtk::RESPONSE_ACCEPT); } -std::string +string NameChannelDialog::get_name () const { return _name.get_text (); } +