X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_manager.cc;h=8302e6dc2b98b7556eaf0cc91fe80843d942860a;hb=3c99ab0fb9da161bbce2ce6f02fb0607b1a2d2bb;hp=bec15a1674f9f0f3df7bc815f57fa358ef675ef0;hpb=14b0ca31bcb62e5b7e9e77634ef9cd2e8cf65800;p=ardour.git diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index bec15a1674..8302e6dc2b 100644 --- a/gtk2_ardour/bundle_manager.cc +++ b/gtk2_ardour/bundle_manager.cc @@ -27,7 +27,6 @@ #include "ardour/session.h" #include "ardour/user_bundle.h" -#include "ardour/audioengine.h" #include "bundle_manager.h" #include "gui_thread.h" #include "i18n.h" @@ -35,9 +34,10 @@ 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()) + : PortMatrix (parent, session, DataType::NIL) , _bundle (bundle) { _port_group = boost::shared_ptr (new PortGroup ("")); @@ -59,8 +59,8 @@ BundleEditorMatrix::setup_ports (int dim) /* 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].gather (_session, DataType::NIL, _bundle->ports_are_inputs(), true, show_only_bundles ()); _ports[OTHER].remove_bundle (_bundle); _ports[OTHER].resume_signals (); } @@ -82,11 +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; @@ -97,33 +101,32 @@ 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); } } @@ -159,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; @@ -174,6 +176,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 bundle) : ArdourDialog (_("Edit Bundle")), _matrix (this, session, bundle), _bundle (bundle) { @@ -206,34 +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::CLOSE, Gtk::RESPONSE_ACCEPT); show_all (); + + signal_key_press_event().connect (sigc::mem_fun (_matrix, &BundleEditorMatrix::key_press)); } void @@ -264,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 () { @@ -311,7 +287,7 @@ 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); @@ -334,6 +310,9 @@ BundleManager::BundleManager (Session* session) 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 (); @@ -354,7 +333,8 @@ 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); _session->add_bundle (b); add_bundle (b); @@ -397,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 (bundle_connections, invalidator (*this), ui_bind (&BundleManager::bundle_changed, this, _1, u), gui_context()); + u->Changed.connect (bundle_connections, invalidator (*this), boost::bind (&BundleManager::bundle_changed, this, _1, u), gui_context()); } void @@ -428,23 +408,22 @@ BundleManager::row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColum 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));