Use an explicit class-member for the mixer-strip container

[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 cbfc816c27e539c317e64e7c07a9cb7dc84b6d91..4ca76e37dd64c9088c74d9800d778e05cca65d1d 100644 (file)
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -82,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; }
@@ -96,8 +96,6 @@ public:
        boost::shared_ptr<MIDI::Name::MasterDeviceNames> get_device_names();
        boost::shared_ptr<MIDI::Name::CustomDeviceMode> get_device_mode();
 
-       void update_range();
-
        Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
 
        StepEditor* step_editor() { return _step_editor; }
@@ -108,7 +106,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 +119,6 @@ private:
        void setup_midnam_patches ();
        void update_patch_selector ();
 
-       void start_scroomer_update ();
-       void stop_scroomer_update ();
        sigc::connection _note_range_changed_connection;
 
        void model_changed(const std::string& model);
@@ -182,7 +178,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 ();
 
@@ -192,8 +188,6 @@ private:
        ParameterMenuMap _controller_menu_map;
 
        StepEditor* _step_editor;
-
-       void immediate_patch_chnage_response (int response);
 };
 
 #endif /* __ardour_midi_time_axis_h__ */