fix a few things related to fit-to-tracks and toggle-visual-state (from 2.0)

[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 14aa4627e7e60045971beb82f107d9844560ddfd..18dfedcaf03929a5b4a7728a1e0e9e5a6edc0189 100644 (file)
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -64,16 +64,22 @@ class MidiTimeAxisView : public RouteTimeAxisView
 
        /* overridden from parent to store display state */
        guint32 show_at (double y, int& nth, Gtk::VBox *parent);
+       void set_height (uint32_t);
        void hide ();
 
+       void show_all_automation ();
        void show_existing_automation ();
-       void add_controller_track ();
-       void create_automation_child (ARDOUR::Parameter param, bool show);
+       void add_cc_track ();
+       void add_parameter_track (const Evoral::Parameter& param);
+       void create_automation_child (const Evoral::Parameter& param, bool show);
 
        ARDOUR::NoteMode note_mode() const { return _note_mode; }
 
        void update_range();
-
+       
+       sigc::signal<void, ARDOUR::ChannelMode, uint16_t>& signal_channel_mode_changed() 
+               { return _channel_selector.mode_changed; }
+       
   private:
        
        void append_extra_display_menu_items ();
@@ -87,15 +93,17 @@ class MidiTimeAxisView : public RouteTimeAxisView
 
        void add_insert_to_subplugin_menu (ARDOUR::Processor *);
        
-       Gtk::Menu _subplugin_menu;
-
-       MidiScroomer* _range_scroomer;
-       PianoRollHeader* _piano_roll_header;
-       ARDOUR::NoteMode    _note_mode;
-       Gtk::RadioMenuItem* _note_mode_item;
-       Gtk::RadioMenuItem* _percussion_mode_item;
-       Gtk::ToggleButton _channel_selection_button;
-       MidiMultipleChannelSelector _channel_selector;
+       void channel_selector_toggled();
+       
+       bool                         _ignore_signals;
+       Gtk::Menu                    _subplugin_menu;
+       MidiScroomer*                _range_scroomer;
+       PianoRollHeader*             _piano_roll_header;
+       ARDOUR::NoteMode             _note_mode;
+       Gtk::RadioMenuItem*          _note_mode_item;
+       Gtk::RadioMenuItem*          _percussion_mode_item;
+       Gtk::Expander                _midi_expander;
+       MidiMultipleChannelSelector  _channel_selector;
 };
 
 #endif /* __ardour_midi_time_axis_h__ */