X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fmidi_time_axis.h;h=10ad5f8f10e79a36e0935ccdc70fa45ff4783293;hb=2b8fc2a43b155d9a22d68554508181dd0894b69d;hp=748f6ebbe6312b89f1b9584d5392a545108d5939;hpb=812e95da016e334b8856b24aba14db809da3f774;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 748f6ebbe6..10ad5f8f10 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -59,20 +59,22 @@ class StepEditor;
 class MidiTimeAxisView : public RouteTimeAxisView
 {
   public:
- 	MidiTimeAxisView (PublicEditor&, ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>, ArdourCanvas::Canvas& canvas);
+ 	MidiTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
  	virtual ~MidiTimeAxisView ();
 
+	void set_route (boost::shared_ptr<ARDOUR::Route>);
+
 	MidiStreamView* midi_view();
 
-	/* overridden from parent to store display state */
-	guint32 show_at (double y, int& nth, Gtk::VBox *parent);
 	void set_height (uint32_t);
-	void hide ();
+
+        void enter_internal_edit_mode ();
+        void leave_internal_edit_mode ();
 
 	boost::shared_ptr<ARDOUR::MidiRegion> add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool);
 
-	void show_all_automation ();
-	void show_existing_automation ();
+	void show_all_automation (bool apply_to_selection = false);
+	void show_existing_automation (bool apply_to_selection = false);
 	void create_automation_child (const Evoral::Parameter& param, bool show);
 
 	ARDOUR::NoteMode  note_mode() const { return _note_mode; }
@@ -84,11 +86,6 @@ class MidiTimeAxisView : public RouteTimeAxisView
 		return _channel_selector.mode_changed;
 	}
 
-	sigc::signal<void, std::string, std::string>& signal_midi_patch_settings_changed() {
-		return _midi_patch_settings_changed;
-	}
-
-        
 	const MidiMultipleChannelSelector& channel_selector() { return _channel_selector; }
 
 	Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
@@ -96,6 +93,10 @@ class MidiTimeAxisView : public RouteTimeAxisView
         StepEditor* step_editor() { return _step_editor; }
         void check_step_edit ();
 
+	void first_idle ();
+
+	uint8_t get_channel_for_add () const;
+
   protected:
 	void start_step_editing ();
 	void stop_step_editing ();
@@ -107,15 +108,17 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	void custom_device_mode_changed();
 
 	void append_extra_display_menu_items ();
-	void build_automation_action_menu ();
+	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);
-	void set_color_mode(ARDOUR::ColorMode mode);
-	void set_note_range(MidiStreamView::VisibleNoteRange range);
+	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;
@@ -127,20 +130,14 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	Gtk::RadioMenuItem*          _meter_color_mode_item;
 	Gtk::RadioMenuItem*          _channel_color_mode_item;
 	Gtk::RadioMenuItem*          _track_color_mode_item;
-	Gtk::VBox                    _midi_controls_box;
+	Gtk::Table                   _midi_controls_box;
 	MidiMultipleChannelSelector  _channel_selector;
-	Gtk::ComboBoxText            _model_selector;
-	Gtk::ComboBoxText            _custom_device_mode_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;
 
-
-	Gtk::Menu* build_def_channel_menu();
-	void set_default_channel (int);
-	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);
@@ -149,13 +146,17 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	void build_controller_menu ();
 	void set_channel_mode (ARDOUR::ChannelMode, uint16_t);
 
+	void set_note_selection (uint8_t note);
 	void add_note_selection (uint8_t note);
 	void extend_note_selection (uint8_t note);
 	void toggle_note_selection (uint8_t note);
+	void set_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask);
 	void add_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask);
 	void extend_note_selection_region_view (RegionView*, uint8_t note, uint16_t chn_mask);
 	void toggle_note_selection_region_view (RegionView*, uint8_t note, uint16_t chn_mask);
 
+	void ensure_step_editor ();
+
 	/** parameter -> menu item map for the channel command items */
 	ParameterMenuMap _channel_command_menu_map;
 	/** parameter -> menu item map for the controller menu */