keep velocity value visible in verbose cursor until we leave a note (fixes #5085)

[ardour.git] / gtk2_ardour / midi_time_axis.h

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 86f899967e3e2a86e05b52ac3f6657d283dfdcb2..10ad5f8f10e79a36e0935ccdc70fa45ff4783293 100644 (file)
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -112,13 +112,13 @@ class MidiTimeAxisView : public RouteTimeAxisView
        Gtk::Menu* build_note_mode_menu();
        Gtk::Menu* build_color_mode_menu();
 
-       void set_note_mode (ARDOUR::NoteMode mode);
-       void set_color_mode (ARDOUR::ColorMode, bool force=false, bool redisplay=true);
-       void set_note_range(MidiStreamView::VisibleNoteRange range);
-       void set_note_range_for_selection (MidiStreamView::VisibleNoteRange range);
+       void set_note_mode (ARDOUR::NoteMode mode, bool apply_to_selection = false);
+       void set_color_mode (ARDOUR::ColorMode, bool force = false, bool redisplay = true, bool apply_to_selection = false);
+       void set_note_range (MidiStreamView::VisibleNoteRange range, bool apply_to_selection = false);
 
        void route_active_changed ();
        void note_range_changed ();
+       void contents_height_changed ();
 
        bool                         _ignore_signals;
        MidiScroomer*                _range_scroomer;
@@ -130,17 +130,14 @@ class MidiTimeAxisView : public RouteTimeAxisView
        Gtk::RadioMenuItem*          _meter_color_mode_item;
        Gtk::RadioMenuItem*          _channel_color_mode_item;
        Gtk::RadioMenuItem*          _track_color_mode_item;
-       Gtk::VBox                    _midi_controls_box;
+       Gtk::Table                   _midi_controls_box;
        MidiMultipleChannelSelector  _channel_selector;
-       Gtk::ComboBoxText            _model_selector;
-       Gtk::ComboBoxText            _custom_device_mode_selector;
+       Gtk::ComboBoxText            _midnam_model_selector;
+       Gtk::ComboBoxText            _midnam_custom_device_mode_selector;
 
        Gtk::CheckMenuItem*          _step_edit_item;
-       Gtk::CheckMenuItem*          _midi_thru_item;
        Gtk::Menu*                    default_channel_menu;
 
-       void toggle_midi_thru ();
-
        void change_all_channel_tracks_visibility (bool yn, Evoral::Parameter param);
        void add_basic_parameter_menu_item (Gtk::Menu_Helpers::MenuList& items, const std::string& label, Evoral::Parameter param);
        void add_channel_command_menu_item (Gtk::Menu_Helpers::MenuList& items, const std::string& label, ARDOUR::AutomationType auto_type, uint8_t cmd);