Reenable the correct sort column and type when redisplaying regions

[ardour.git] / gtk2_ardour / virtual_keyboard_window.h

diff --git a/gtk2_ardour/virtual_keyboard_window.h b/gtk2_ardour/virtual_keyboard_window.h
index 0db53472f28dca89cf1d909f176ed13a98ccfcc5..f0f6f27bd807af65c98e3ae8f45de3f3489ab0a8 100644 (file)
--- a/gtk2_ardour/virtual_keyboard_window.h
+++ b/gtk2_ardour/virtual_keyboard_window.h
@@ -100,9 +100,15 @@ private:
        bool on_key_press_event (GdkEventKey*);
        bool on_key_release_event (GdkEventKey*);
 
+       void parameter_changed (std::string const&);
+
        void note_on_event_handler (int, int);
        void note_off_event_handler (int);
        void control_change_event_handler (int, int);
+       void control_change_knob_event_handler (int, int);
+
+       void modwheel_update_tooltip (int);
+       void modwheel_slider_adjusted ();
 
        void octave_key_event_handler (bool);
        void pitch_bend_key_event_handler (int, bool);
@@ -114,48 +120,33 @@ private:
        void pitch_slider_adjusted ();
 
        void select_keyboard_layout (std::string const&);
-       void update_velocity_settings (int);
+       void update_velocity_settings ();
        void update_octave_key ();
        void update_octave_range ();
-       void bank_patch ();
-       void update_sensitivity ();
-       bool toggle_config (GdkEventButton*);
-       bool toggle_bankpatch (GdkEventButton*);
-       bool toggle_yaxis_velocity (GdkEventButton*);
+       void cc_key_changed (size_t);
+       void update_cc (size_t, int);
        bool send_panic_message (GdkEventButton*);
+       bool on_velocity_scroll_event (GdkEventScroll*);
 
        APianoKeyboard  _piano;
 
        ArdourWidgets::ArdourDropdown  _midi_channel;
+       ArdourWidgets::ArdourDropdown  _piano_velocity;
+       ArdourWidgets::ArdourDropdown  _piano_octave_key;
+       ArdourWidgets::ArdourDropdown  _piano_octave_range;
        ArdourWidgets::ArdourDropdown  _transpose_output;
-
-       Gtk::SpinButton _bank_msb;
-       Gtk::SpinButton _bank_lsb;
-       Gtk::SpinButton _patchpgm;
-
-       Gtk::HBox* _cfg_box;
-       Gtk::HBox* _pgm_box;
-
-       ArdourWidgets::ArdourButton   _cfg_display;
-       ArdourWidgets::ArdourButton   _pgm_display;
-       ArdourWidgets::ArdourButton   _yaxis_velocity;
-       ArdourWidgets::ArdourButton   _send_panic;
-       ArdourWidgets::ArdourDropdown _keyboard_layout;
-       ArdourWidgets::ArdourDropdown _keyboard_annotations;
-
-       Gtk::SpinButton _piano_key_velocity;
-       Gtk::SpinButton _piano_min_velocity;
-       Gtk::SpinButton _piano_max_velocity;
-
-       Gtk::SpinButton _piano_octave_key;
-       Gtk::SpinButton _piano_octave_range;
+       ArdourWidgets::ArdourButton    _send_panic;
 
        boost::shared_ptr<VKBDControl>    _pitchbend;
        Gtk::Adjustment                   _pitch_adjustment;
        ArdourWidgets::VSliderController* _pitch_slider;
        Gtkmm2ext::PersistentTooltip*     _pitch_slider_tooltip;
 
-#define VKBD_NCTRLS 8
+       boost::shared_ptr<VKBDControl>    _modwheel;
+       Gtk::Adjustment                   _modwheel_adjustment;
+       ArdourWidgets::VSliderController* _modwheel_slider;
+       Gtkmm2ext::PersistentTooltip*     _modwheel_tooltip;
+#define VKBD_NCTRLS 4
 
        boost::shared_ptr<VKBDControl> _cc[VKBD_NCTRLS];
        ArdourWidgets::ArdourKnob*     _cc_knob[VKBD_NCTRLS];