X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.h;h=28eab2b348d514c4828aa6a906ba3a92ccd84f28;hb=b78d036aa056af0ef4f5821c45dae5f70bc69231;hp=abe5218be3f2a5111de65f501b8c43d3677722b3;hpb=b1f5a6a68d0b62a61684b2c011a97de825256a59;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index abe5218be3..28eab2b348 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
 {
@@ -68,7 +69,7 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	void set_height (uint32_t);
 	void hide ();
 
-	boost::shared_ptr<ARDOUR::Region> add_region (ARDOUR::framepos_t pos);
+	boost::shared_ptr<ARDOUR::MidiRegion> add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool);
 
 	void show_all_automation ();
 	void show_existing_automation ();
@@ -87,22 +88,20 @@ class MidiTimeAxisView : public RouteTimeAxisView
 		return _midi_patch_settings_changed;
 	}
 
-        void toggle_step_edit ();
-	void start_step_editing ();
-	void stop_step_editing ();
-	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 ();
+
+  protected:
+	void start_step_editing ();
+	void stop_step_editing ();
+
   private:
 	sigc::signal<void, std::string, std::string>  _midi_patch_settings_changed;
 
@@ -139,16 +138,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);
@@ -174,8 +163,7 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	/** 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__ */