more MIDI paste improvements, plus move region-mute binding to PRIMARY-m and use...

[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 8f95697e2d963b999a684149d7fb66e2c2960bc0..acf9c32ea55f12478703e196259cf111826e466f 100644 (file)
--- 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,7 +73,8 @@ 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();
        
@@ -81,21 +82,23 @@ class MidiTimeAxisView : public RouteTimeAxisView
                return _channel_selector.mode_changed; 
        }
        
-       sigc::signal<void, string, string>& signal_midi_patch_settings_changed() {
+       sigc::signal<void, std::string, std::string>& signal_midi_patch_settings_changed() {
                return _midi_patch_settings_changed;
        }
        
   private:
-       sigc::signal<void, string, string>  _midi_patch_settings_changed;
+       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 ();
@@ -109,6 +112,10 @@ 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;