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

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 12ca3a9bfe..6a557af568 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -54,6 +54,7 @@ class MidiStreamView;
 class MidiScroomer;
 class PianoRollHeader;
 class StepEntry;
+class StepEditor;
 
 class MidiTimeAxisView : public RouteTimeAxisView
 {
@@ -66,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::Region> 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; }
@@ -87,19 +90,18 @@ class MidiTimeAxisView : public RouteTimeAxisView
 		return _midi_patch_settings_changed;
 	}
 
-	void check_step_edit ();
-	void step_edit_rest ();
-        int  step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, 
-                            Evoral::MusicalTime beat_duration);
-        bool step_edit_within_triplet () const;
-        void step_edit_toggle_triplet ();
-        bool step_edit_within_chord () const;
-        void step_edit_toggle_chord ();
 
 	const MidiMultipleChannelSelector& channel_selector() { return _channel_selector; }
 
 	Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
 
+        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,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 ();
@@ -140,19 +143,6 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	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;
-        uint8_t _step_edit_triplet_countdown;
-        bool    _step_edit_within_chord;
-        Evoral::MusicalTime _step_edit_chord_duration;
-        void region_removed (boost::weak_ptr<ARDOUR::Region>);
-        void playlist_changed ();
-        PBD::ScopedConnection step_edit_region_connection;
-
-	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);
@@ -170,13 +160,14 @@ 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 */
 	ParameterMenuMap _controller_menu_map;
 
-        StepEntry* step_editor;
-        bool step_editor_hidden (GdkEventAny*);
+        StepEditor* _step_editor;
 };
 
 #endif /* __ardour_midi_time_axis_h__ */