X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.cc;h=00764d0b787e8e0b48d96d3ca71f89d0f5bff9c6;hb=dd72d2bf6584571b88fb383752dcb0dd892a034a;hp=5d8dc83bc18db41a7516c0d79996e7ea3534313b;hpb=ca7965d7aa4b56bca74dd4137e03bdb581c738c8;p=ardour.git diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 5d8dc83bc1..00764d0b78 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -50,6 +50,7 @@ #include "ardour/panner.h" #include "ardour/panner_shell.h" #include "ardour/playlist.h" +#include "ardour/plugin_insert.h" #include "ardour/profile.h" #include "ardour/region.h" #include "ardour/region_factory.h" @@ -60,7 +61,6 @@ #include "ardour/track.h" #include "ardour/types.h" -#include "ardour_ui.h" #include "ardour_button.h" #include "automation_line.h" #include "automation_time_axis.h" @@ -84,12 +84,13 @@ #include "rgb_macros.h" #include "selection.h" #include "step_editor.h" +#include "tooltips.h" #include "utils.h" #include "note_base.h" #include "ardour/midi_track.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; @@ -104,8 +105,8 @@ static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 160; static const uint32_t KEYBOARD_MIN_HEIGHT = 130; MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas) - : AxisView(sess) // virtually inherited - , RouteTimeAxisView(ed, sess, canvas) + : SessionHandlePtr (sess) + , RouteTimeAxisView (ed, sess, canvas) , _ignore_signals(false) , _range_scroomer(0) , _piano_roll_header(0) @@ -119,15 +120,23 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanva , _channel_selector (0) , _step_edit_item (0) , controller_menu (0) + , poly_pressure_menu (0) , _step_editor (0) { + _midnam_model_selector.disable_scrolling(); + _midnam_custom_device_mode_selector.disable_scrolling(); +} + +void +MidiTimeAxisView::set_note_highlight (uint8_t note) { + _piano_roll_header->set_note_highlight (note); } void MidiTimeAxisView::set_route (boost::shared_ptr rt) { _route = rt; - + _view = new MidiStreamView (*this); if (is_track ()) { @@ -154,20 +163,13 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) true); } - midi_view()->NoteRangeChanged.connect ( - sigc::mem_fun (*this, &MidiTimeAxisView::note_range_changed)); _view->ContentsHeightChanged.connect ( sigc::mem_fun (*this, &MidiTimeAxisView::contents_height_changed)); ignore_toggle = false; if (is_midi_track()) { - controls_ebox.set_name ("MidiTimeAxisViewControlsBaseUnselected"); - time_axis_frame.set_name ("MidiTimeAxisViewControlsBaseUnselected"); _note_mode = midi_track()->note_mode(); - } else { // MIDI bus (which doesn't exist yet..) - controls_ebox.set_name ("MidiBusControlsBaseUnselected"); - time_axis_frame.set_name ("MidiBusControlsBaseUnselected"); } /* if set_state above didn't create a gain automation child, we need to make one */ @@ -186,7 +188,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) /* map current state of the route */ ensure_pan_views (false); - + update_control_names(); processors_changed (RouteProcessorChange ()); _route->processors_changed.connect (*this, invalidator (*this), @@ -203,11 +205,12 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) _piano_roll_header->ToggleNoteSelection.connect ( sigc::mem_fun (*this, &MidiTimeAxisView::toggle_note_selection)); - /* Suspend updates of the StreamView during scroomer drags to speed things up */ + /* Update StreamView during scroomer drags.*/ + _range_scroomer->DragStarting.connect ( - sigc::mem_fun (*midi_view(), &MidiStreamView::suspend_updates)); + sigc::mem_fun (*this, &MidiTimeAxisView::start_scroomer_update)); _range_scroomer->DragFinishing.connect ( - sigc::mem_fun (*midi_view(), &MidiStreamView::resume_updates)); + sigc::mem_fun (*this, &MidiTimeAxisView::stop_scroomer_update)); /* Put the scroomer and the keyboard in a VBox with a padding label so that they can be reduced in height for stacked-view @@ -231,11 +234,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) time_axis_hbox.pack_end(*v, false, false, 0); midi_scroomer_size_group->add_widget (*v); - controls_ebox.set_name ("MidiTrackControlsBaseUnselected"); - time_axis_frame.set_name ("MidiTrackControlsBaseUnselected"); - controls_base_selected_name = "MidiTrackControlsBaseSelected"; - controls_base_unselected_name = "MidiTrackControlsBaseUnselected"; - midi_view()->NoteRangeChanged.connect ( sigc::mem_fun(*this, &MidiTimeAxisView::update_range)); @@ -243,22 +241,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) _view->RegionViewAdded.connect ( sigc::mem_fun(*this, &MidiTimeAxisView::region_view_added)); - midi_track()->PlaybackChannelModeChanged.connect (*this, invalidator (*this), - boost::bind (&MidiTimeAxisView::playback_channel_mode_changed, this), - gui_context()); - midi_track()->PlaybackChannelMaskChanged.connect (*this, invalidator (*this), - boost::bind (&MidiTimeAxisView::playback_channel_mode_changed, this), - gui_context()); - midi_track()->CaptureChannelModeChanged.connect (*this, invalidator (*this), - boost::bind (&MidiTimeAxisView::capture_channel_mode_changed, this), - gui_context()); - midi_track()->CaptureChannelMaskChanged.connect (*this, invalidator (*this), - boost::bind (&MidiTimeAxisView::capture_channel_mode_changed, this), - gui_context()); - - playback_channel_mode_changed (); - capture_channel_mode_changed (); - if (!_editor.have_idled()) { /* first idle will do what we need */ } else { @@ -266,30 +248,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) } } - typedef MIDI::Name::MidiPatchManager PatchManager; - - PatchManager& patch_manager = PatchManager::instance(); - - for (PatchManager::DeviceNamesByMaker::const_iterator m = patch_manager.devices_by_manufacturer().begin(); - m != patch_manager.devices_by_manufacturer().end(); ++m) { - Menu* menu = Gtk::manage(new Menu); - Menu_Helpers::MenuList& items = menu->items(); - - // Build manufacturer submenu - for (MIDI::Name::MIDINameDocument::MasterDeviceNamesList::const_iterator n = m->second.begin(); - n != m->second.end(); ++n) { - Menu_Helpers::MenuElem elem = Gtk::Menu_Helpers::MenuElem( - n->first.c_str(), - sigc::bind(sigc::mem_fun(*this, &MidiTimeAxisView::model_changed), - n->first.c_str())); - - items.push_back(elem); - } - - // Add manufacturer submenu to selector - _midnam_model_selector.AddMenuElem(Menu_Helpers::MenuElem(m->first, *menu)); - } - if (gui_property (X_("midnam-model-name")).empty()) { set_gui_property (X_("midnam-model-name"), "Generic"); } @@ -302,46 +260,24 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) } } - ARDOUR_UI::instance()->set_tip (_midnam_model_selector, _("External MIDI Device")); - ARDOUR_UI::instance()->set_tip (_midnam_custom_device_mode_selector, _("External Device Mode")); + set_tooltip (_midnam_model_selector, _("External MIDI Device")); + set_tooltip (_midnam_custom_device_mode_selector, _("External Device Mode")); + + _midi_controls_box.pack_start (_midnam_model_selector, false, false, 2); + _midi_controls_box.pack_start (_midnam_custom_device_mode_selector, false, false, 2); _midi_controls_box.set_homogeneous(false); _midi_controls_box.set_border_width (2); - _channel_status_box.set_homogeneous (false); - _channel_status_box.set_spacing (4); - - ArdourButton *channel_selector_button = manage (new ArdourButton(_("Chns"))); - channel_selector_button->set_name ("route button"); - ARDOUR_UI::instance()->set_tip (channel_selector_button, _("Click to edit channel settings")); - - /* fixed sized labels to prevent silly nonsense (though obviously, - * they cause their own too) - */ - set_size_request_to_display_given_text(_playback_channel_status, "Play: somemo", 2, 2); // TODO use _("Play: all/some") - set_size_request_to_display_given_text(_capture_channel_status, "Rec: somemo", 2, 2); // TODO use _("Rec: all/some") - - _channel_status_box.pack_start (_playback_channel_status, false, false); - _channel_status_box.pack_start (_capture_channel_status, false, false); - _channel_status_box.pack_end (*channel_selector_button, false, false); - _channel_status_box.show_all (); - - channel_selector_button->signal_clicked.connect (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_channel_selector)); - - _midi_controls_box.pack_start (_channel_status_box, false, false, 10); - - if (!patch_manager.all_models().empty()) { - - _midnam_model_selector.show (); - _midi_controls_box.pack_start (_midnam_model_selector, false, false, 2); - - _midnam_custom_device_mode_selector.show (); + MIDI::Name::MidiPatchManager::instance().PatchesChanged.connect (*this, invalidator (*this), + boost::bind (&MidiTimeAxisView::setup_midnam_patches, this), + gui_context()); - _midi_controls_box.pack_start (_midnam_custom_device_mode_selector, false, false, 2); - } + setup_midnam_patches (); + update_patch_selector (); - model_changed(gui_property(X_("midnam-model-name"))); - custom_device_mode_changed(gui_property(X_("midnam-custom-device-mode"))); + model_changed (gui_property(X_("midnam-model-name"))); + custom_device_mode_changed (gui_property(X_("midnam-custom-device-mode"))); controls_vbox.pack_start(_midi_controls_box, false, false); @@ -382,6 +318,13 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) } } +void +MidiTimeAxisView::processors_changed (RouteProcessorChange c) +{ + RouteTimeAxisView::processors_changed (c); + update_patch_selector (); +} + void MidiTimeAxisView::first_idle () { @@ -411,6 +354,92 @@ MidiTimeAxisView::check_step_edit () _step_editor->check_step_edit (); } +void +MidiTimeAxisView::setup_midnam_patches () +{ + typedef MIDI::Name::MidiPatchManager PatchManager; + PatchManager& patch_manager = PatchManager::instance(); + + _midnam_model_selector.clear_items (); + for (PatchManager::DeviceNamesByMaker::const_iterator m = patch_manager.devices_by_manufacturer().begin(); + m != patch_manager.devices_by_manufacturer().end(); ++m) { + Menu* menu = Gtk::manage(new Menu); + Menu_Helpers::MenuList& items = menu->items(); + + // Build manufacturer submenu + for (MIDI::Name::MIDINameDocument::MasterDeviceNamesList::const_iterator n = m->second.begin(); + n != m->second.end(); ++n) { + Menu_Helpers::MenuElem elem = Gtk::Menu_Helpers::MenuElem( + n->first.c_str(), + sigc::bind(sigc::mem_fun(*this, &MidiTimeAxisView::model_changed), + n->first.c_str())); + + items.push_back(elem); + } + + // Add manufacturer submenu to selector + _midnam_model_selector.AddMenuElem(Menu_Helpers::MenuElem(m->first, *menu)); + } + + if (!get_device_names()) { + model_changed ("Generic"); + } +} + +void +MidiTimeAxisView::drop_instrument_ref () +{ + midnam_connection.drop_connections (); +} +void +MidiTimeAxisView::start_scroomer_update () +{ + _note_range_changed_connection.disconnect(); + _note_range_changed_connection = midi_view()->NoteRangeChanged.connect ( + sigc::mem_fun (*this, &MidiTimeAxisView::note_range_changed)); +} +void +MidiTimeAxisView::stop_scroomer_update () +{ + _note_range_changed_connection.disconnect(); +} + +void +MidiTimeAxisView::update_patch_selector () +{ + typedef MIDI::Name::MidiPatchManager PatchManager; + PatchManager& patch_manager = PatchManager::instance(); + + bool pluginprovided = false; + if (_route) { + boost::shared_ptr the_instrument (_route->the_instrument()); + boost::shared_ptr pi = boost::dynamic_pointer_cast(the_instrument); + if (pi && pi->plugin ()->has_midnam ()) { + midnam_connection.drop_connections (); + the_instrument->DropReferences.connect (midnam_connection, invalidator (*this), + boost::bind (&MidiTimeAxisView::drop_instrument_ref, this), + gui_context()); + pi->plugin()->UpdateMidnam.connect (midnam_connection, invalidator (*this), + boost::bind (&Plugin::read_midnam, pi->plugin ()), + gui_context()); + + pluginprovided = true; + std::string model_name = pi->plugin ()->midnam_model (); + if (gui_property (X_("midnam-model-name")) != model_name) { + model_changed (model_name); + } + } + } + + if (patch_manager.all_models().empty() || pluginprovided) { + _midnam_model_selector.hide (); + _midnam_custom_device_mode_selector.hide (); + } else { + _midnam_model_selector.show (); + _midnam_custom_device_mode_selector.show (); + } +} + void MidiTimeAxisView::model_changed(const std::string& model) { @@ -440,7 +469,12 @@ MidiTimeAxisView::model_changed(const std::string& model) _midnam_custom_device_mode_selector.hide(); } - _route->instrument_info().set_external_instrument (model, device_modes.front()); + // now this is a real bad hack + if (device_modes.size() > 0) { + _route->instrument_info().set_external_instrument (model, device_modes.front()); + } else { + _route->instrument_info().set_external_instrument (model, ""); + } // Rebuild controller menu _controller_menu_map.clear (); @@ -466,14 +500,14 @@ MidiTimeAxisView::midi_view() } void -MidiTimeAxisView::set_height (uint32_t h) +MidiTimeAxisView::set_height (uint32_t h, TrackHeightMode m) { if (h >= MIDI_CONTROLS_BOX_MIN_HEIGHT) { _midi_controls_box.show (); } else { _midi_controls_box.hide(); } - + if (h >= KEYBOARD_MIN_HEIGHT) { if (is_track() && _range_scroomer) { _range_scroomer->show(); @@ -495,7 +529,7 @@ MidiTimeAxisView::set_height (uint32_t h) which needs to know if we have just shown or hidden a scroomer / piano roll. */ - RouteTimeAxisView::set_height (h); + RouteTimeAxisView::set_height (h, m); } void @@ -512,7 +546,7 @@ MidiTimeAxisView::append_extra_display_menu_items () range_items.push_back ( MenuElem (_("Show Full Range"), - sigc::bind (sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range), + sigc::bind (sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range), MidiStreamView::FullRange, true))); range_items.push_back ( @@ -525,11 +559,13 @@ MidiTimeAxisView::append_extra_display_menu_items () items.push_back (MenuElem (_("Channel Selector"), sigc::mem_fun(*this, &MidiTimeAxisView::toggle_channel_selector))); + items.push_back (MenuElem (_("Select Patch"), *build_patch_menu())); + color_mode_menu = build_color_mode_menu(); if (color_mode_menu) { items.push_back (MenuElem (_("Color Mode"), *color_mode_menu)); } - + items.push_back (SeparatorElem ()); } @@ -603,6 +639,13 @@ MidiTimeAxisView::build_automation_action_menu (bool for_selection) build_controller_menu (); automation_items.push_back (MenuElem (_("Controllers"), *controller_menu)); + + if (!poly_pressure_menu) { + poly_pressure_menu = new Gtk::Menu; + } + + automation_items.push_back (MenuElem (_("Polyphonic Pressure"), *poly_pressure_menu)); + automation_items.back().set_sensitive ( !for_selection || _editor.get_selection().tracks.size() == 1); } else { @@ -911,7 +954,7 @@ MidiTimeAxisView::build_controller_menu () l != device_names->controls().end(); ++l) { boost::shared_ptr name_list = l->second; Menu* ctl_menu = NULL; - + for (ControlNameList::Controls::const_iterator c = name_list->controls().begin(); c != name_list->controls().end();) { const uint16_t ctl = c->second->number(); @@ -921,7 +964,7 @@ MidiTimeAxisView::build_controller_menu () /* Create a new submenu */ ctl_menu = manage (new Menu); } - + MenuList& ctl_items (ctl_menu->items()); if (chn_cnt > 1) { add_multi_channel_controller_item(ctl_items, ctl, c->second->name()); @@ -1033,6 +1076,110 @@ MidiTimeAxisView::build_color_mode_menu() return mode_menu; } +Gtk::Menu* +MidiTimeAxisView::build_patch_menu() +{ + using namespace MIDI::Name; + using namespace Menu_Helpers; + + boost::shared_ptr device_names = get_device_names(); + const std::string device_mode = gui_property (X_("midnam-custom-device-mode")); + + Menu* pc_menu = manage (new Menu); + MenuList& pc_items = pc_menu->items(); + + for (uint32_t chn = 0; chn < 16; ++chn) { + boost::shared_ptr channel_name_set = device_names->channel_name_set_by_channel (device_mode, chn); + // see also PatchChange::initialize_popup_menus + if (!channel_name_set) { + continue; + } + const ChannelNameSet::PatchBanks& patch_banks = channel_name_set->patch_banks(); + if (patch_banks.size () == 0) { + continue; + } + + Gtk::Menu& chan_menu = *manage(new Gtk::Menu()); + + if (patch_banks.size() > 1) { + + for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin(); + bank != patch_banks.end(); + ++bank) { + Glib::RefPtr underscores = Glib::Regex::create("_"); + std::string replacement(" "); + + Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu()); + + const PatchNameList& patches = (*bank)->patch_name_list(); + Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items(); + + for (PatchNameList::const_iterator patch = patches.begin(); + patch != patches.end(); + ++patch) { + std::string name = underscores->replace((*patch)->name().c_str(), -1, 0, replacement); + + patch_menus.push_back( + Gtk::Menu_Helpers::MenuElem( + name, + sigc::bind( + sigc::mem_fun(*this, &MidiTimeAxisView::on_patch_menu_selected), + chn, (*patch)->patch_primary_key())) ); + } + + + std::string name = underscores->replace((*bank)->name().c_str(), -1, 0, replacement); + + chan_menu.items().push_back( + Gtk::Menu_Helpers::MenuElem( + name, + patch_bank_menu) ); + } + } else { + /* only one patch bank, so make it the initial menu */ + + const PatchNameList& patches = patch_banks.front()->patch_name_list(); + + for (PatchNameList::const_iterator patch = patches.begin(); + patch != patches.end(); + ++patch) { + std::string name = (*patch)->name(); + boost::replace_all (name, "_", " "); + + chan_menu.items().push_back ( + Gtk::Menu_Helpers::MenuElem ( + name, + sigc::bind (sigc::mem_fun(*this, &MidiTimeAxisView::on_patch_menu_selected), + chn, (*patch)->patch_primary_key()))); + } + } + + pc_items.push_back( + Gtk::Menu_Helpers::MenuElem( + string_compose (_("Channel %1"), chn + 1), + chan_menu)); + } + return pc_menu; +} + +void +MidiTimeAxisView::on_patch_menu_selected (int chn, const MIDI::Name::PatchPrimaryKey& key) +{ + if (!_route) { + return; + } + boost::shared_ptr bank_msb = _route->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true); + boost::shared_ptr bank_lsb = _route->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true); + boost::shared_ptr program = _route->automation_control(Evoral::Parameter (MidiPgmChangeAutomation, chn), true); + + if (!bank_msb || ! bank_lsb || !program) { + return; + } + bank_msb->set_value ((key.bank() >> 7) & 0x7f, Controllable::NoGroup); + bank_lsb->set_value (key.bank() & 0x7f, Controllable::NoGroup); + program->set_value (key.program(), Controllable::NoGroup); +} + void MidiTimeAxisView::set_note_mode(NoteMode mode, bool apply_to_selection) { @@ -1059,7 +1206,7 @@ MidiTimeAxisView::set_color_mode (ColorMode mode, bool force, bool redisplay, bo if (_color_mode == mode && !force) { return; } - + if (_channel_selector) { if (mode == ChannelColors) { _channel_selector->set_channel_colors(NoteBase::midi_channel_colors); @@ -1067,7 +1214,7 @@ MidiTimeAxisView::set_color_mode (ColorMode mode, bool force, bool redisplay, bo _channel_selector->set_default_channel_color(); } } - + _color_mode = mode; set_gui_property ("color-mode", enum_2_string(_color_mode)); if (redisplay) { @@ -1092,13 +1239,6 @@ MidiTimeAxisView::set_note_range (MidiStreamView::VisibleNoteRange range, bool a void MidiTimeAxisView::update_range() { - MidiGhostRegion* mgr; - - for (list::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - if ((mgr = dynamic_cast(*i)) != 0) { - mgr->update_range(); - } - } } void @@ -1275,32 +1415,37 @@ void MidiTimeAxisView::route_active_changed () { RouteUI::route_active_changed (); + update_control_names(); +} +void +MidiTimeAxisView::update_control_names () +{ if (is_track()) { if (_route->active()) { - controls_ebox.set_name ("MidiTrackControlsBaseUnselected"); - time_axis_frame.set_name ("MidiTrackControlsBaseUnselected"); controls_base_selected_name = "MidiTrackControlsBaseSelected"; controls_base_unselected_name = "MidiTrackControlsBaseUnselected"; } else { - controls_ebox.set_name ("MidiTrackControlsBaseInactiveUnselected"); - time_axis_frame.set_name ("MidiTrackControlsBaseInactiveUnselected"); controls_base_selected_name = "MidiTrackControlsBaseInactiveSelected"; controls_base_unselected_name = "MidiTrackControlsBaseInactiveUnselected"; } - } else { + } else { // MIDI bus (which doesn't exist yet..) if (_route->active()) { - controls_ebox.set_name ("BusControlsBaseUnselected"); - time_axis_frame.set_name ("BusControlsBaseUnselected"); controls_base_selected_name = "BusControlsBaseSelected"; controls_base_unselected_name = "BusControlsBaseUnselected"; } else { - controls_ebox.set_name ("BusControlsBaseInactiveUnselected"); - time_axis_frame.set_name ("BusControlsBaseInactiveUnselected"); controls_base_selected_name = "BusControlsBaseInactiveSelected"; controls_base_unselected_name = "BusControlsBaseInactiveUnselected"; } } + + if (selected()) { + controls_ebox.set_name (controls_base_selected_name); + time_axis_frame.set_name (controls_base_selected_name); + } else { + controls_ebox.set_name (controls_base_unselected_name); + time_axis_frame.set_name (controls_base_unselected_name); + } } void @@ -1308,6 +1453,8 @@ MidiTimeAxisView::set_note_selection (uint8_t note) { uint16_t chn_mask = midi_track()->get_playback_channel_mask(); + _editor.begin_reversible_selection_op (X_("Set Note Selection")); + if (_view->num_selected_regionviews() == 0) { _view->foreach_regionview ( sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_note_selection_region_view), @@ -1317,6 +1464,8 @@ MidiTimeAxisView::set_note_selection (uint8_t note) sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_note_selection_region_view), note, chn_mask)); } + + _editor.commit_reversible_selection_op(); } void @@ -1324,6 +1473,8 @@ MidiTimeAxisView::add_note_selection (uint8_t note) { const uint16_t chn_mask = midi_track()->get_playback_channel_mask(); + _editor.begin_reversible_selection_op (X_("Add Note Selection")); + if (_view->num_selected_regionviews() == 0) { _view->foreach_regionview ( sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::add_note_selection_region_view), @@ -1333,6 +1484,8 @@ MidiTimeAxisView::add_note_selection (uint8_t note) sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::add_note_selection_region_view), note, chn_mask)); } + + _editor.commit_reversible_selection_op(); } void @@ -1340,6 +1493,8 @@ MidiTimeAxisView::extend_note_selection (uint8_t note) { const uint16_t chn_mask = midi_track()->get_playback_channel_mask(); + _editor.begin_reversible_selection_op (X_("Extend Note Selection")); + if (_view->num_selected_regionviews() == 0) { _view->foreach_regionview ( sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::extend_note_selection_region_view), @@ -1349,6 +1504,8 @@ MidiTimeAxisView::extend_note_selection (uint8_t note) sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::extend_note_selection_region_view), note, chn_mask)); } + + _editor.commit_reversible_selection_op(); } void @@ -1356,6 +1513,8 @@ MidiTimeAxisView::toggle_note_selection (uint8_t note) { const uint16_t chn_mask = midi_track()->get_playback_channel_mask(); + _editor.begin_reversible_selection_op (X_("Toggle Note Selection")); + if (_view->num_selected_regionviews() == 0) { _view->foreach_regionview ( sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_note_selection_region_view), @@ -1365,6 +1524,15 @@ MidiTimeAxisView::toggle_note_selection (uint8_t note) sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_note_selection_region_view), note, chn_mask)); } + + _editor.commit_reversible_selection_op(); +} + +void +MidiTimeAxisView::get_per_region_note_selection (list > > > >& selection) +{ + _view->foreach_regionview ( + sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::get_per_region_note_selection_region_view), sigc::ref(selection))); } void @@ -1391,6 +1559,24 @@ MidiTimeAxisView::toggle_note_selection_region_view (RegionView* rv, uint8_t not dynamic_cast(rv)->toggle_matching_notes (note, chn_mask); } +void +MidiTimeAxisView::get_per_region_note_selection_region_view (RegionView* rv, list > > > > &selection) +{ + Evoral::Sequence::Notes selected; + dynamic_cast(rv)->selection_as_notelist (selected, false); + + std::set > > notes; + + Evoral::Sequence::Notes::iterator sel_it; + for (sel_it = selected.begin(); sel_it != selected.end(); ++sel_it) { + notes.insert (*sel_it); + } + + if (!notes.empty()) { + selection.push_back (make_pair ((rv)->region()->id(), notes)); + } +} + void MidiTimeAxisView::set_channel_mode (ChannelMode, uint16_t) { @@ -1460,11 +1646,14 @@ MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param) } boost::shared_ptr -MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit) +MidiTimeAxisView::add_region (framepos_t f, framecnt_t length, bool commit) { Editor* real_editor = dynamic_cast (&_editor); + MusicFrame pos (f, 0); - real_editor->begin_reversible_command (Operations::create_region); + if (commit) { + real_editor->begin_reversible_command (Operations::create_region); + } playlist()->clear_changes (); real_editor->snap_to (pos, RoundNearest); @@ -1477,8 +1666,9 @@ MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit) plist.add (ARDOUR::Properties::name, PBD::basename_nosuffix(src->name())); boost::shared_ptr region = (RegionFactory::create (src, plist)); - - playlist()->add_region (region, pos); + /* sets beat position */ + region->set_position (pos.frame, pos.division); + playlist()->add_region (region, pos.frame, 1.0, false, pos.division); _session->add_command (new StatefulDiffCommand (playlist())); if (commit) { @@ -1552,45 +1742,13 @@ MidiTimeAxisView::contents_height_changed () _range_scroomer->queue_resize (); } -void -MidiTimeAxisView::playback_channel_mode_changed () -{ - switch (midi_track()->get_playback_channel_mode()) { - case AllChannels: - _playback_channel_status.set_markup (string_compose ("%1: %2", _("Play"), _("all"))); - break; - case FilterChannels: - _playback_channel_status.set_markup (string_compose ("%1: %2", _("Play"), _("some"))); - break; - case ForceChannel: - _playback_channel_status.set_markup (string_compose ("%1: %2>%3", _("Play"), _("all"), PBD::ffs (midi_track()->get_playback_channel_mask()))); - break; - } -} - -void -MidiTimeAxisView::capture_channel_mode_changed () -{ - switch (midi_track()->get_capture_channel_mode()) { - case AllChannels: - _capture_channel_status.set_markup (string_compose ("%1: %2", _("Rec"), _("all"))); - break; - case FilterChannels: - _capture_channel_status.set_markup (string_compose ("%1: %2", _("Rec"), _("some"))); - break; - case ForceChannel: - _capture_channel_status.set_markup (string_compose ("%1: %2>%3", _("Rec"), _("all"), PBD::ffs (midi_track()->get_capture_channel_mask()))); - break; - } -} - bool -MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx) +MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) { if (!_editor.internal_editing()) { // Non-internal paste, paste regions like any other route - return RouteTimeAxisView::paste(pos, selection, ctx); + return RouteTimeAxisView::paste(pos, selection, ctx, sub_num); } - return midi_view()->paste(pos, selection, ctx); + return midi_view()->paste(pos, selection, ctx, sub_num); }