smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

provide preference for scrolling-adjusts-note-velocity

Browse source
This commit is contained in:
Paul Davis 2023-10-22 17:14:45 -06:00
parent b40513ff7d
commit 8f405f3657
3 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/midi_region_view.cc
View file

@ -734,6 +734,7 @@ MidiRegionView::scroll (GdkEventScroll* ev)
hide_verbose_cursor (); hide_verbose_cursor ();
if (UIConfiguration::instance().get_scroll_velocity_editing()) {
bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier); bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
Keyboard::ModifierMask mask_together(Keyboard::PrimaryModifier|Keyboard::TertiaryModifier); Keyboard::ModifierMask mask_together(Keyboard::PrimaryModifier|Keyboard::TertiaryModifier);
bool together = Keyboard::modifier_state_contains (ev->state, mask_together); bool together = Keyboard::modifier_state_contains (ev->state, mask_together);
@ -748,6 +749,9 @@ MidiRegionView::scroll (GdkEventScroll* ev)
} }
return true; return true;
}
return false;
} }
bool bool

10
gtk2_ardour/rc_option_editor.cc
View file

@ -3517,7 +3517,7 @@ These settings will only take effect after %1 is restarted.\n\
-1, 65536, 1, 10 -1, 65536, 1, 10
)); ));
add_option (_("MIDI"), new OptionEditorHeading (_("Selection"))); add_option (_("MIDI"), new OptionEditorHeading (_("Editing")));
add_option (_("MIDI"), add_option (_("MIDI"),
new BoolOption ( new BoolOption (
@ -3527,6 +3527,14 @@ These settings will only take effect after %1 is restarted.\n\
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_select_last_drawn_note_only) sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_select_last_drawn_note_only)
)); ));
add_option (_("MIDI"),
new BoolOption (
"scroll_velocity_editing",
_("Scroll wheel use when editing MIDI adjusts selected note velocity"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_scroll_velocity_editing),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_scroll_velocity_editing)
));
add_option (_("MIDI"), new OptionEditorHeading (_("Audition"))); add_option (_("MIDI"), new OptionEditorHeading (_("Audition")));
add_option (_("MIDI"), add_option (_("MIDI"),

1
gtk2_ardour/ui_config_vars.h
View file

@ -162,3 +162,4 @@ UI_CONFIG_VARIABLE (bool, sandbox_all_lua_scripts, "sandbox-all-lua-scripts", fa
UI_CONFIG_VARIABLE (bool, show_on_cue_page, "show-on-cue-page", true) UI_CONFIG_VARIABLE (bool, show_on_cue_page, "show-on-cue-page", true)
UI_CONFIG_VARIABLE (uint32_t, insert_at_position, "insert-at-position", 3) UI_CONFIG_VARIABLE (uint32_t, insert_at_position, "insert-at-position", 3)
UI_CONFIG_VARIABLE (Editing::NoteNameDisplay, note_name_display, "note-name-display", Editing::Always) UI_CONFIG_VARIABLE (Editing::NoteNameDisplay, note_name_display, "note-name-display", Editing::Always)
UI_CONFIG_VARIABLE (bool, scroll_velocity_editing, "scroll-velocity-editing", true)