X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.h;h=acf9c32ea55f12478703e196259cf111826e466f;hb=e57c4d4c43c0d302c0b06128e0ba10c4683ee8fe;hp=18dfedcaf03929a5b4a7728a1e0e9e5a6edc0189;hpb=b5ec66ae6cb60fa43c343d3d29340b2370d0b9d1;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 18dfedcaf0..acf9c32ea5 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -30,8 +30,8 @@
 #include <gtkmm2ext/selector.h>
 #include <list>
 
-#include <ardour/types.h>
-#include <ardour/region.h>
+#include "ardour/types.h"
+#include "ardour/region.h"
 
 #include "ardour_dialog.h"
 #include "route_ui.h"
@@ -73,28 +73,38 @@ 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, std::string, std::string>& signal_midi_patch_settings_changed() {
+		return _midi_patch_settings_changed;
+	}
 	
   private:
+	sigc::signal<void, std::string, std::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 *);
 	
-	void channel_selector_toggled();
-	
 	bool                         _ignore_signals;
 	Gtk::Menu                    _subplugin_menu;
 	MidiScroomer*                _range_scroomer;
@@ -102,8 +112,14 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	ARDOUR::NoteMode             _note_mode;
 	Gtk::RadioMenuItem*          _note_mode_item;
 	Gtk::RadioMenuItem*          _percussion_mode_item;
-	Gtk::Expander                _midi_expander;
+	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__ */