convert codebase to use Temporal for various time types

[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 72167204ed023c7f8d398c0044c6d5a1518b58dc..24b66a925381a2be6ce8e5c0d5ef10ba752f0d38 100644 (file)
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -67,7 +67,6 @@ class PianoRollHeader;
 class StepEntry;
 class StepEditor;
 class MidiChannelSelectorWindow;
-class PatchChangeGridDialog;
 
 #define NO_MIDI_NOTE 0xff
 
@@ -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);
+       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 ();
@@ -139,8 +136,6 @@ private:
        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 send_patch_change ();
-
        void route_active_changed ();
        void note_range_changed ();
        void contents_height_changed ();
@@ -187,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 ();
 
@@ -199,8 +194,6 @@ private:
        StepEditor* _step_editor;
 
        void immediate_patch_chnage_response (int response);
-       PatchChangeGridDialog* _patch_change_dialog;
-
 };
 
 #endif /* __ardour_midi_time_axis_h__ */