use new action map API instead of ActionManager::get_action

[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 a75c9654133ab4acc5c99e601bdd47770679030a..24b66a925381a2be6ce8e5c0d5ef10ba752f0d38 100644 (file)
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -29,13 +29,12 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/checkmenuitem.h>
 
-#include "gtkmm2ext/selector.h"
-
 #include "ardour/types.h"
 #include "ardour/region.h"
 
+#include "widgets/ardour_dropdown.h"
+
 #include "ardour_dialog.h"
-#include "ardour_dropdown.h"
 #include "route_ui.h"
 #include "enums.h"
 #include "route_time_axis.h"
@@ -83,13 +82,13 @@ public:
 
        void set_height (uint32_t, TrackHeightMode m = OnlySelf);
 
-       boost::shared_ptr<ARDOUR::MidiRegion> add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool, const int32_t sub_num);
+       boost::shared_ptr<ARDOUR::MidiRegion> add_region (ARDOUR::samplepos_t, ARDOUR::samplecnt_t, bool);
 
        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);
 
-       bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num);
+       bool paste (ARDOUR::samplepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num);
 
        ARDOUR::NoteMode  note_mode() const { return _note_mode; }
        ARDOUR::ColorMode color_mode() const { return _color_mode; }
@@ -109,7 +108,7 @@ public:
 
        uint8_t get_channel_for_add () const;
 
-       void get_per_region_note_selection (std::list<std::pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > >&);
+       void get_per_region_note_selection (std::list<std::pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > >&);
 
 protected:
        void start_step_editing ();
@@ -121,8 +120,6 @@ private:
 
        void setup_midnam_patches ();
        void update_patch_selector ();
-       void drop_instrument_ref ();
-       PBD::ScopedConnectionList midnam_connection;
 
        void start_scroomer_update ();
        void stop_scroomer_update ();
@@ -135,33 +132,30 @@ private:
        void build_automation_action_menu (bool);
        Gtk::Menu* build_note_mode_menu();
        Gtk::Menu* build_color_mode_menu();
-       Gtk::Menu* build_patch_menu();
 
        void set_note_mode (ARDOUR::NoteMode mode, bool apply_to_selection = false);
        void set_color_mode (ARDOUR::ColorMode, bool force = false, bool redisplay = true, bool apply_to_selection = false);
        void set_note_range (MidiStreamView::VisibleNoteRange range, bool apply_to_selection = false);
-       void on_patch_menu_selected (int chn, const MIDI::Name::PatchPrimaryKey& key);
-
        void route_active_changed ();
        void note_range_changed ();
        void contents_height_changed ();
 
        void update_control_names ();
 
-       bool                         _ignore_signals;
-       MidiScroomer*                _range_scroomer;
-       PianoRollHeader*             _piano_roll_header;
-       ARDOUR::NoteMode             _note_mode;
-       Gtk::RadioMenuItem*          _note_mode_item;
-       Gtk::RadioMenuItem*          _percussion_mode_item;
-       ARDOUR::ColorMode            _color_mode;
-       Gtk::RadioMenuItem*          _meter_color_mode_item;
-       Gtk::RadioMenuItem*          _channel_color_mode_item;
-       Gtk::RadioMenuItem*          _track_color_mode_item;
-       Gtk::VBox                    _midi_controls_box;
-       MidiChannelSelectorWindow*   _channel_selector;
-       ArdourDropdown               _midnam_model_selector;
-       ArdourDropdown               _midnam_custom_device_mode_selector;
+       bool                          _ignore_signals;
+       MidiScroomer*                 _range_scroomer;
+       PianoRollHeader*              _piano_roll_header;
+       ARDOUR::NoteMode              _note_mode;
+       Gtk::RadioMenuItem*           _note_mode_item;
+       Gtk::RadioMenuItem*           _percussion_mode_item;
+       ARDOUR::ColorMode             _color_mode;
+       Gtk::RadioMenuItem*           _meter_color_mode_item;
+       Gtk::RadioMenuItem*           _channel_color_mode_item;
+       Gtk::RadioMenuItem*           _track_color_mode_item;
+       Gtk::VBox                     _midi_controls_box;
+       MidiChannelSelectorWindow*    _channel_selector;
+       ArdourWidgets::ArdourDropdown _midnam_model_selector;
+       ArdourWidgets::ArdourDropdown _midnam_custom_device_mode_selector;
 
        Gtk::CheckMenuItem*          _step_edit_item;
        Gtk::Menu*                    default_channel_menu;
@@ -188,7 +182,7 @@ private:
        void add_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask);
        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 get_per_region_note_selection_region_view (RegionView*, std::list<std::pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > >&);
+       void get_per_region_note_selection_region_view (RegionView*, std::list<std::pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > >&);
 
        void ensure_step_editor ();
 
@@ -198,6 +192,8 @@ private:
        ParameterMenuMap _controller_menu_map;
 
        StepEditor* _step_editor;
+
+       void immediate_patch_chnage_response (int response);
 };
 
 #endif /* __ardour_midi_time_axis_h__ */