store void pointers to processor UIs in Processors, and reset ProcessorWindowProxy...

[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 12ca3a9bfeabd56ac44dcad43994d553ca841264..28eab2b348d514c4828aa6a906ba3a92ccd84f28 100644 (file)
--- 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,19 +88,16 @@ 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 ();
+
   protected:
        void start_step_editing ();
        void stop_step_editing ();
@@ -140,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);
@@ -175,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__ */