X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.h;h=fa22b431a00471b78488322c48c01889244a7b0f;hb=e36f74e071d4c14862d23da5ff0d49df0940d536;hp=356a2474db478362cfc3915127b692a1d0e249e8;hpb=b524fe05d57e7f42bc5fd62593a11ea5c72c2046;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 356a2474db..fa22b431a0 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -37,9 +37,14 @@
 #include "route_ui.h"
 #include "enums.h"
 #include "route_time_axis.h"
-#include "canvas.h"
 #include "midi_streamview.h"
-#include "midi_channel_selector.h"
+
+namespace MIDI {
+namespace Name {
+class MasterDeviceNames;
+class CustomDeviceMode;
+}
+}
 
 namespace ARDOUR {
 	class Session;
@@ -55,6 +60,7 @@ class MidiScroomer;
 class PianoRollHeader;
 class StepEntry;
 class StepEditor;
+class MidiChannelSelectorWindow;
 
 class MidiTimeAxisView : public RouteTimeAxisView
 {
@@ -68,8 +74,8 @@ class MidiTimeAxisView : public RouteTimeAxisView
 
 	void set_height (uint32_t);
 
-        void enter_internal_edit_mode ();
-        void leave_internal_edit_mode ();
+	void enter_internal_edit_mode ();
+	void leave_internal_edit_mode ();
 
 	boost::shared_ptr<ARDOUR::MidiRegion> add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool);
 
@@ -80,18 +86,15 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	ARDOUR::NoteMode  note_mode() const { return _note_mode; }
 	ARDOUR::ColorMode color_mode() const { return _color_mode; }
 
-	void update_range();
+	boost::shared_ptr<MIDI::Name::MasterDeviceNames> get_device_names();
+	boost::shared_ptr<MIDI::Name::CustomDeviceMode> get_device_mode();
 
-	sigc::signal<void, ARDOUR::ChannelMode, uint16_t>& signal_channel_mode_changed() {
-		return _channel_selector.mode_changed;
-	}
-
-	const MidiMultipleChannelSelector& channel_selector() { return _channel_selector; }
+	void update_range();
 
 	Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
 
-        StepEditor* step_editor() { return _step_editor; }
-        void check_step_edit ();
+	StepEditor* step_editor() { return _step_editor; }
+	void check_step_edit ();
 
 	void first_idle ();
 
@@ -111,13 +114,14 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	void build_automation_action_menu (bool);
 	Gtk::Menu* build_note_mode_menu();
 	Gtk::Menu* build_color_mode_menu();
-
+	
 	void set_note_mode (ARDOUR::NoteMode mode, bool apply_to_selection = false);
 	void set_color_mode (ARDOUR::ColorMode, bool force = false, bool redisplay = true, bool apply_to_selection = false);
 	void set_note_range (MidiStreamView::VisibleNoteRange range, bool apply_to_selection = false);
 
 	void route_active_changed ();
 	void note_range_changed ();
+	void contents_height_changed ();
 
 	bool                         _ignore_signals;
 	MidiScroomer*                _range_scroomer;
@@ -129,23 +133,29 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	Gtk::RadioMenuItem*          _meter_color_mode_item;
 	Gtk::RadioMenuItem*          _channel_color_mode_item;
 	Gtk::RadioMenuItem*          _track_color_mode_item;
+        Gtk::Label                   _playback_channel_status;
+        Gtk::Label                   _capture_channel_status;
+ 	Gtk::HBox                    _channel_status_box;
+        Gtk::Button                  _channel_selector_button;
 	Gtk::VBox                    _midi_controls_box;
-	MidiMultipleChannelSelector  _channel_selector;
-	Gtk::ComboBoxText            _model_selector;
-	Gtk::ComboBoxText            _custom_device_mode_selector;
+	MidiChannelSelectorWindow*   _channel_selector;
+	Gtk::ComboBoxText            _midnam_model_selector;
+	Gtk::ComboBoxText            _midnam_custom_device_mode_selector;
 
 	Gtk::CheckMenuItem*          _step_edit_item;
-	Gtk::CheckMenuItem*          _midi_thru_item;
 	Gtk::Menu*                    default_channel_menu;
 
-	void toggle_midi_thru ();
-
 	void change_all_channel_tracks_visibility (bool yn, Evoral::Parameter param);
 	void add_basic_parameter_menu_item (Gtk::Menu_Helpers::MenuList& items, const std::string& label, Evoral::Parameter param);
 	void add_channel_command_menu_item (Gtk::Menu_Helpers::MenuList& items, const std::string& label, ARDOUR::AutomationType auto_type, uint8_t cmd);
 
 	Gtk::Menu* controller_menu;
+
+	void add_single_channel_controller_item (Gtk::Menu_Helpers::MenuList& ctl_items, int ctl, const std::string& name);
+	void add_multi_channel_controller_item (Gtk::Menu_Helpers::MenuList& ctl_items, int ctl, const std::string& name);
 	void build_controller_menu ();
+        void toggle_channel_selector ();
+        void channel_selector_hidden ();
 	void set_channel_mode (ARDOUR::ChannelMode, uint16_t);
 
 	void set_note_selection (uint8_t note);
@@ -164,7 +174,19 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	/** parameter -> menu item map for the controller menu */
 	ParameterMenuMap _controller_menu_map;
 
-        StepEditor* _step_editor;
+	StepEditor* _step_editor;
+
+        void capture_channel_mode_changed();
+        void playback_channel_mode_changed();
+
+	void ensure_pan_views (bool show = true);
+
+	void update_gain_track_visibility ();
+	void update_pan_track_visibility ();
+
+	Gtk::CheckMenuItem* gain_automation_item;
+	std::list<boost::shared_ptr<AutomationTimeAxisView> > pan_tracks;
+	Gtk::CheckMenuItem* pan_automation_item;
 };
 
 #endif /* __ardour_midi_time_axis_h__ */