X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.h;h=f535fd6322e8bad806d454119fd0c8b416f80905;hb=f6f3769ae11e3a9e888abdf8c3ed92f08d3c9a5b;hp=a09cb5e5f10d24885b6bfe84faf74963fa532f9a;hpb=f8480d6392e6d0e61aa39e564904ba67822f711e;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index a09cb5e5f1..f535fd6322 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -73,20 +73,32 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	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, 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 ();
@@ -100,8 +112,14 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	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__ */