smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

permit editing velocity bars option

Browse source
This commit is contained in:
Paul Davis 2018-07-03 15:39:28 -04:00
parent bf2f4bd28a
commit 38b499a8f0
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor.cc
View file

@ -79,6 +79,7 @@
#include "ardour/vca.h" #include "ardour/vca.h"
#include "canvas/debug.h" #include "canvas/debug.h"
#include "canvas/note.h"
#include "canvas/text.h" #include "canvas/text.h"
#include "widgets/ardour_spacer.h" #include "widgets/ardour_spacer.h"
@ -6165,6 +6166,9 @@ Editor::ui_parameter_changed (string parameter)
if (_verbose_cursor) { if (_verbose_cursor) {
playhead_cursor->set_sensitive (UIConfiguration::instance().get_draggable_playhead()); playhead_cursor->set_sensitive (UIConfiguration::instance().get_draggable_playhead());
} }
} else if (parameter == "use-note-bars-for-velocity") {
ArdourCanvas::Note::set_show_velocity_bars (UIConfiguration::instance().get_use_note_bars_for_velocity());
_track_canvas->request_redraw (_track_canvas->visible_area());
} }
} }

2
gtk2_ardour/editor_actions.cc
View file

@ -1489,8 +1489,6 @@ Editor::parameter_changed (std::string p)
tact->set_active (s); tact->set_active (s);
} }
} }
} else if (p == "velocity-display") {
_track_canvas->request_redraw (_track_canvas->visible_area());
} }
} }

18
gtk2_ardour/rc_option_editor.cc
View file

@ -2903,6 +2903,24 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("MIDI"), audition_synth); add_option (_("MIDI"), audition_synth);
add_option (_("MIDI"), new OptionEditorHeading (_("Velocity Display")));
add_option (_("MIDI"),
new BoolOption (
"use-note-bars-for-velocity",
_("Show velocity horizontally inside notes"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_note_bars_for_velocity),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_note_bars_for_velocity)
));
add_option (_("MIDI"),
new BoolOption (
"use-note-color-for-velocity",
_("Use colors to show note velocity"),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_note_color_for_velocity),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_note_color_for_velocity)
));
/* Click */ /* Click */
add_option (_("Metronome"), new OptionEditorHeading (_("Metronome"))); add_option (_("Metronome"), new OptionEditorHeading (_("Metronome")));

3
gtk2_ardour/ui_config_vars.h
View file

@ -98,7 +98,8 @@ UI_CONFIG_VARIABLE (bool, prefer_inline_over_gui, "prefer-inline-over-gui", true
UI_CONFIG_VARIABLE (uint32_t, action_table_columns, "action-table-columns", 0) UI_CONFIG_VARIABLE (uint32_t, action_table_columns, "action-table-columns", 0)
UI_CONFIG_VARIABLE (bool, use_wm_visibility, "use-wm-visibility", true) UI_CONFIG_VARIABLE (bool, use_wm_visibility, "use-wm-visibility", true)
UI_CONFIG_VARIABLE (std::string, stripable_color_palette, "stripable-color-palette", "#AA3939:#FFAAAA:#D46A6A:#801515:#550000:#AA8E39:#FFEAAA:#D4BA6A:#806515:#554000:#343477:#8080B3:#565695:#1A1A59:#09093B:#2D882D:#88CC88:#55AA55:#116611:#004400") /* Gtk::ColorSelection::palette_to_string */ UI_CONFIG_VARIABLE (std::string, stripable_color_palette, "stripable-color-palette", "#AA3939:#FFAAAA:#D46A6A:#801515:#550000:#AA8E39:#FFEAAA:#D4BA6A:#806515:#554000:#343477:#8080B3:#565695:#1A1A59:#09093B:#2D882D:#88CC88:#55AA55:#116611:#004400") /* Gtk::ColorSelection::palette_to_string */
UI_CONFIG_VARIABLE (ARDOUR::VelocityDisplayOption, velocity_display, "velocity-display", ARDOUR::NoteBars) UI_CONFIG_VARIABLE (bool, use_note_bars_for_velocity, "use-note-bars-for-velocity", true)
UI_CONFIG_VARIABLE (bool, use_note_color_for_velocity, "use-note-color-for-velocity", true)
UI_CONFIG_VARIABLE (bool, show_snapped_cursor, "show-snapped-cursor", true) UI_CONFIG_VARIABLE (bool, show_snapped_cursor, "show-snapped-cursor", true)
UI_CONFIG_VARIABLE (uint32_t, snap_threshold, "snap-threshold", 25) UI_CONFIG_VARIABLE (uint32_t, snap_threshold, "snap-threshold", 25)
UI_CONFIG_VARIABLE (bool, snap_to_marks, "snap-to-marks", true) UI_CONFIG_VARIABLE (bool, snap_to_marks, "snap-to-marks", true)