allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Stopgap solution to speed up MIDI region selection

Browse Source 
Filling the CC dropdown menus of the editor's pianroll
bottom attachment can take ages.. So only do that when
the bottom pane is actually visible.

This will need more work, since it's still slow, and the
menu is also not correctly using sub-menus.
This commit is contained in:
Robin Gareus
2025-09-18 00:08:56 +02:00
parent 614472bc4c
commit 64613cbeb0
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
gtk2_ardour/pianoroll.cc
View File

@@ -301,6 +301,10 @@ Pianoroll::build_lower_toolbar ()
cc_dropdown2->signal_led_clicked.connect (sigc::bind (sigc::mem_fun (*this, &Pianoroll::user_led_click), cc_dropdown2));
cc_dropdown3->signal_led_clicked.connect (sigc::bind (sigc::mem_fun (*this, &Pianoroll::user_led_click), cc_dropdown3));
cc_dropdown1->signal_map().connect (sigc::bind (sigc::mem_fun (*this, &Pianoroll::build_cc_menu), cc_dropdown1));
cc_dropdown2->signal_map().connect (sigc::bind (sigc::mem_fun (*this, &Pianoroll::build_cc_menu), cc_dropdown2));
cc_dropdown3->signal_map().connect (sigc::bind (sigc::mem_fun (*this, &Pianoroll::build_cc_menu), cc_dropdown3));
_toolbox.pack_start (*_canvas_hscrollbar, false, false);
_toolbox.pack_start (button_bar, false, false);
}
@@ -1421,6 +1425,23 @@ Pianoroll::unset (bool trigger_too)
view->set_region (nullptr);
}
void
Pianoroll::build_cc_menu (ArdourWidgets::MetaButton* ccbtn)
{
if (!ccbtn->menu().items().empty () || !_track) {
return;
}
/* note this can take a long time, and also is not entirely correct.
* ::add_multi_controller_item() add items directly to the top-level
* while keeping empty sub-menus for grouped controls 1-31, 32-64, etc.
*/
build_controller_menu (ccbtn->menu(), _track->instrument_info(), 0xffff,
sigc::bind (sigc::mem_fun (*this, &Pianoroll::add_single_controller_item), ccbtn),
sigc::bind (sigc::mem_fun (*this, &Pianoroll::add_multi_controller_item), ccbtn), 12);
// reset_user_cc_choice (Evoral::Parameter (ARDOUR::MidiCCAutomation, _visible_channel, MIDI_CTL_MSB_GENERAL_PURPOSE1), ccbtn);
}
void
Pianoroll::set_track (std::shared_ptr<ARDOUR::Track> track)
{
@@ -1435,29 +1456,19 @@ Pianoroll::set_track (std::shared_ptr<ARDOUR::Track> track)
view->set_track (std::dynamic_pointer_cast<MidiTrack> (track));
}
/* XXX this is very slow when the menus are populated */
cc_dropdown1->menu().items().clear ();
cc_dropdown2->menu().items().clear ();
cc_dropdown3->menu().items().clear ();
/* XXX and this can take seconds for some synths.
* called from Editor::maybe_edit_region_in_bottom_pane
* -> set_track ()
* -> set_region () (via CueEditor::set_region)
* */
build_controller_menu (cc_dropdown1->menu(), track->instrument_info(), 0xffff,
sigc::bind (sigc::mem_fun (*this, &Pianoroll::add_single_controller_item), cc_dropdown1),
sigc::bind (sigc::mem_fun (*this, &Pianoroll::add_multi_controller_item), cc_dropdown1), 12);
build_controller_menu (cc_dropdown2->menu(), track->instrument_info(), 0xffff,
sigc::bind (sigc::mem_fun (*this, &Pianoroll::add_single_controller_item), cc_dropdown2),
sigc::bind (sigc::mem_fun (*this, &Pianoroll::add_multi_controller_item), cc_dropdown2), 12);
build_controller_menu (cc_dropdown3->menu(), track->instrument_info(), 0xffff,
sigc::bind (sigc::mem_fun (*this, &Pianoroll::add_single_controller_item), cc_dropdown3),
sigc::bind (sigc::mem_fun (*this, &Pianoroll::add_multi_controller_item), cc_dropdown3), 12);
// reset_user_cc_choice (Evoral::Parameter (ARDOUR::MidiCCAutomation, _visible_channel, MIDI_CTL_MSB_GENERAL_PURPOSE1), cc_dropdown1);
// reset_user_cc_choice (Evoral::Parameter (ARDOUR::MidiCCAutomation, _visible_channel, MIDI_CTL_MSB_GENERAL_PURPOSE2), cc_dropdown2);
// reset_user_cc_choice (Evoral::Parameter (ARDOUR::MidiCCAutomation, _visible_channel, MIDI_CTL_MSB_GENERAL_PURPOSE3), cc_dropdown3);
if (cc_dropdown1->get_mapped ()) {
build_cc_menu (cc_dropdown1);
}
if (cc_dropdown2->get_mapped ()) {
build_cc_menu (cc_dropdown2);
}
if (cc_dropdown3->get_mapped ()) {
build_cc_menu (cc_dropdown3);
}
}
void

1
gtk2_ardour/pianoroll.h
View File

@@ -176,6 +176,7 @@ class Pianoroll : public CueEditor
void build_canvas ();
void canvas_allocate (Gtk::Allocation);
void build_lower_toolbar ();
void build_cc_menu (ArdourWidgets::MetaButton*);
bool canvas_enter_leave (GdkEventCrossing* ev);