experiment with making MIDI region boxes vanish when in note/internal edit mode ...

[ardour.git] / gtk2_ardour / midi_time_axis.h

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index fe1835266f56b495ae41092b554ee287a0c496af..1adba26d24d4ccc49240ff8cac03c2aaa883a462 100644 (file)
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -53,6 +53,8 @@ class PublicEditor;
 class MidiStreamView;
 class MidiScroomer;
 class PianoRollHeader;
+class StepEntry;
+class StepEditor;
 
 class MidiTimeAxisView : public RouteTimeAxisView
 {
@@ -67,7 +69,10 @@ class MidiTimeAxisView : public RouteTimeAxisView
        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 ();
@@ -86,22 +91,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;
 
@@ -138,16 +141,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);
@@ -168,10 +161,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;
+
+        StepEditor* _step_editor;
 };
 
 #endif /* __ardour_midi_time_axis_h__ */