X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.h;h=f535fd6322e8bad806d454119fd0c8b416f80905;hb=9c89a93e4f96826bec6ed519f8f435e4fc73bfa5;hp=a35a332e01922be83c9a3412f5fbc55db1715ddb;hpb=332a3d98138e94903ad9c6d35048b0201ff178c8;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index a35a332e01..f535fd6322 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -39,10 +39,10 @@
 #include "route_time_axis.h"
 #include "canvas.h"
 #include "midi_streamview.h"
+#include "midi_channel_selector.h"
 
 namespace ARDOUR {
 	class Session;
-	class MidiDiskstream;
 	class RouteGroup;
 	class Processor;
 	class Location;
@@ -51,6 +51,8 @@ namespace ARDOUR {
 
 class PublicEditor;
 class MidiStreamView;
+class MidiScroomer;
+class PianoRollHeader;
 
 class MidiTimeAxisView : public RouteTimeAxisView
 {
@@ -62,31 +64,62 @@ 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 add_controller_track ();
-	void create_automation_child (ARDOUR::Parameter param, bool show);
+	void show_all_automation ();
+	void show_existing_automation ();
+	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; }
+	ARDOUR::NoteMode  note_mode() const { return _note_mode; }
+	ARDOUR::ColorMode color_mode() const { return _color_mode; }
+
+	void update_range();
+	
+	sigc::signal<void, ARDOUR::ChannelMode, uint16_t>& signal_channel_mode_changed() { 
+		return _channel_selector.mode_changed; 
+	}
+	
+	sigc::signal<void, string, string>& signal_midi_patch_settings_changed() {
+		return _midi_patch_settings_changed;
+	}
 	
   private:
+	sigc::signal<void, string, string>  _midi_patch_settings_changed;
+	  		
+	void model_changed();
+	void custom_device_mode_changed();
 	
 	void append_extra_display_menu_items ();
 	void build_automation_action_menu ();
-	Gtk::Menu* build_mode_menu();
+	Gtk::Menu* build_note_mode_menu();
+	Gtk::Menu* build_color_mode_menu();
 
-	void set_note_mode(ARDOUR::NoteMode mode);
+	void set_note_mode (ARDOUR::NoteMode mode);
+	void set_color_mode(ARDOUR::ColorMode mode);
 	void set_note_range(MidiStreamView::VisibleNoteRange range);
 
 	void route_active_changed ();
 
 	void add_insert_to_subplugin_menu (ARDOUR::Processor *);
 	
-	Gtk::Menu _subplugin_menu;
-
-	ARDOUR::NoteMode    _note_mode;
-	Gtk::RadioMenuItem* _note_mode_item;
-	Gtk::RadioMenuItem* _percussion_mode_item;
+	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;
+	ARDOUR::ColorMode            _color_mode;
+	Gtk::RadioMenuItem*          _meter_color_mode_item;
+	Gtk::RadioMenuItem*          _channel_color_mode_item;
+	Gtk::RadioMenuItem*          _track_color_mode_item;
+	Gtk::VBox                    _midi_controls_box;
+	MidiMultipleChannelSelector  _channel_selector;
+	Gtk::ComboBoxText            _model_selector;
+	Gtk::ComboBoxText            _custom_device_mode_selector;
 };
 
 #endif /* __ardour_midi_time_axis_h__ */