X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.h;h=6a557af568daa1a279efd2bc5dbd371aba261ffd;hb=7f1e04eff26072c609809d89a3190b70ad388060;hp=73c48f2613008a21a0e885c95b4f0512a1090675;hpb=faca3e5f5d666fc543b23f6ab7b93a14f6c8ff7f;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 73c48f2613..6a557af568 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -67,12 +67,14 @@ 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::MidiRegion> add_region (ARDOUR::framepos_t pos);
+        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; }
@@ -88,7 +90,7 @@ class MidiTimeAxisView : public RouteTimeAxisView
 		return _midi_patch_settings_changed;
 	}
 
-        
+
 	const MidiMultipleChannelSelector& channel_selector() { return _channel_selector; }
 
 	Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
@@ -96,6 +98,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 ();
@@ -103,16 +109,17 @@ class MidiTimeAxisView : public RouteTimeAxisView
   private:
 	sigc::signal<void, std::string, std::string>  _midi_patch_settings_changed;
 
+	void hide ();
 	void model_changed();
 	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_color_mode (ARDOUR::ColorMode, bool force=false, bool redisplay=true);
 	void set_note_range(MidiStreamView::VisibleNoteRange range);
 
 	void route_active_changed ();
@@ -136,9 +143,6 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	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);
@@ -156,6 +160,8 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	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 */