X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Fmidi_time_axis.h;h=85dcd2b9eaf837b6c968bc0bf4b9415b4ea7d021;hb=ef92349187b61349d2d5182f49f700183901f59e;hp=98cc5bb0b78fc95bcfa560c800451b9956fe6342;hpb=f31abc5eaf30ea9ed099279cbc2b7c41c131acd6;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 98cc5bb0b7..85dcd2b9ea 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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"
@@ -64,46 +64,82 @@ 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 ();
 
+	boost::shared_ptr<ARDOUR::Region> add_region (nframes64_t pos);
+
+	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; }
+	ARDOUR::NoteMode  note_mode() const { return _note_mode; }
+	ARDOUR::ColorMode color_mode() const { return _color_mode; }
 
 	void update_range();
-	
-	sigc::signal<void, uint16_t>& signal_channel_selection_changed() 
-		{ return _channel_selector.selection_changed; }
-	
-	sigc::signal<void, int8_t>& signal_force_channel_changed()  
-		{ return _channel_selector.force_channel_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;
+	}
+
+	void start_step_editing ();
+	void stop_step_editing ();
+	void check_step_edit ();
+	void step_edit_rest ();
+
   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();
-	
-	Gtk::Menu                    _subplugin_menu;
 
+	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;
+	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;
+
+	Gtk::CheckMenuItem*          _step_edit_item;
+	Gtk::CheckMenuItem*          _midi_thru_item;
+	Gtk::Menu*                    default_channel_menu;
+
+	nframes64_t step_edit_insert_position;
+	Evoral::MusicalTime step_edit_beat_pos;
+	boost::shared_ptr<ARDOUR::Region> step_edit_region;
+	MidiRegionView* step_edit_region_view;
+
+	Gtk::Menu* build_def_channel_menu();
+	void set_default_channel (int);
+	void toggle_midi_thru ();
 };
 
 #endif /* __ardour_midi_time_axis_h__ */