X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_manager.cc;h=8302e6dc2b98b7556eaf0cc91fe80843d942860a;hb=4ed3dcd51d31a56885ce910c551c60b65905200c;hp=ba62d73f0e5d270d393f45a2ccb5cd361660fbd9;hpb=7c49119be05c2a0fc324f6a13e91720ac66a5957;p=ardour.git diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index ba62d73f0e..8302e6dc2b 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,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; +using namespace ARDOUR_UI_UTILS; -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, show_only_bundles ()); _ports[OTHER].remove_bundle (_bundle); _ports[OTHER].resume_signals (); } @@ -74,7 +82,15 @@ BundleEditorMatrix::set_state (BundleChannel c[2], bool s) PortMatrixNode::State BundleEditorMatrix::get_state (BundleChannel c[2]) const { + if (c[0].bundle->nchannels() == ChanCount::ZERO || c[1].bundle->nchannels() == ChanCount::ZERO) { + return PortMatrixNode::NOT_ASSOCIATED; + } + 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; @@ -85,34 +101,33 @@ BundleEditorMatrix::get_state (BundleChannel c[2]) const } bool -BundleEditorMatrix::can_add_channel (boost::shared_ptr b) const +BundleEditorMatrix::can_add_channels (boost::shared_ptr b) const { if (b == _bundle) { return true; } - return PortMatrix::can_add_channel (b); + return PortMatrix::can_add_channels (b); } void -BundleEditorMatrix::add_channel (boost::shared_ptr b) +BundleEditorMatrix::add_channel (boost::shared_ptr b, DataType t) { 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()); + + _bundle->add_channel (d.get_name(), t); setup_ports (OURS); - + } else { - - PortMatrix::add_channel (b); - + + PortMatrix::add_channel (b, t); + } } @@ -147,7 +162,6 @@ void BundleEditorMatrix::rename_channel (BundleChannel bc) { NameChannelDialog d (bc.bundle, bc.channel); - d.set_position (Gtk::WIN_POS_MOUSE); if (d.run () != Gtk::RESPONSE_ACCEPT) { return; @@ -162,7 +176,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); @@ -185,7 +205,7 @@ BundleEditor::BundleEditor (Session& session, boost::shared_ptr bund 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 (_("Input")); } else { @@ -194,40 +214,14 @@ 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 (); + + signal_key_press_event().connect (sigc::mem_fun (_matrix, &BundleEditorMatrix::key_press)); } void @@ -248,7 +242,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 { @@ -258,18 +252,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,19 +260,23 @@ 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); } - + /* New / Edit / Delete buttons */ Gtk::VBox* buttons = new Gtk::VBox; buttons->set_spacing (8); @@ -301,10 +287,10 @@ BundleManager::BundleManager (Session& session) edit_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::EDIT, Gtk::ICON_SIZE_BUTTON))); edit_button.signal_clicked().connect (sigc::mem_fun (*this, &BundleManager::edit_clicked)); buttons->pack_start (edit_button, false, false); - delete_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::DELETE, Gtk::ICON_SIZE_BUTTON))); + delete_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::StockID(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); @@ -320,6 +306,13 @@ 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) + ); + + Gtk::Button* close_but = add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT); + close_but->signal_clicked ().connect (sigc::mem_fun (*this, &Gtk::Window::hide)); + set_button_sensitivity (); show_all (); @@ -340,14 +333,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 +349,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 +360,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 +377,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), boost::bind (&BundleManager::bundle_changed, this, _1, u), gui_context()); } void @@ -395,7 +386,7 @@ 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]; @@ -410,17 +401,29 @@ 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) { _name.set_text (b->channel_name (c)); @@ -430,11 +433,12 @@ NameChannelDialog::NameChannelDialog (boost::shared_ptr b, uint32_t c) 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 ();