globally change all use of "frame" to refer to audio into "sample".

[ardour.git] / libs / ardour / ardour / midi_region.h

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 36c9125a84341b4b1fc46e9347c469bf6a2f80f9..00a5f28a5e31883b9ad387c788bfa37b60b70565 100644 (file)
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -73,23 +73,23 @@ class LIBARDOUR_API MidiRegion : public Region
        boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const;
 
        /* Stub Readable interface */
-       virtual framecnt_t read (Sample*, framepos_t /*pos*/, framecnt_t /*cnt*/, int /*channel*/) const { return 0; }
-       virtual framecnt_t readable_length() const { return length(); }
+       virtual samplecnt_t read (Sample*, samplepos_t /*pos*/, samplecnt_t /*cnt*/, int /*channel*/) const { return 0; }
+       virtual samplecnt_t readable_length() const { return length(); }
 
-       framecnt_t read_at (Evoral::EventSink<framepos_t>& dst,
-                           framepos_t position,
-                           framecnt_t dur,
-                           Evoral::Range<framepos_t>* loop_range,
+       samplecnt_t read_at (Evoral::EventSink<samplepos_t>& dst,
+                           samplepos_t position,
+                           samplecnt_t dur,
+                           Evoral::Range<samplepos_t>* loop_range,
                            MidiCursor& cursor,
                            uint32_t  chan_n = 0,
                            NoteMode  mode = Sustained,
                            MidiStateTracker* tracker = 0,
                            MidiChannelFilter* filter = 0) const;
 
-       framecnt_t master_read_at (MidiRingBuffer<framepos_t>& dst,
-                                  framepos_t position,
-                                  framecnt_t dur,
-                                  Evoral::Range<framepos_t>* loop_range,
+       samplecnt_t master_read_at (MidiRingBuffer<samplepos_t>& dst,
+                                  samplepos_t position,
+                                  samplecnt_t dur,
+                                  Evoral::Range<samplepos_t>* loop_range,
                                   MidiCursor& cursor,
                                   uint32_t  chan_n = 0,
                                   NoteMode  mode = Sustained) const;
@@ -129,12 +129,12 @@ class LIBARDOUR_API MidiRegion : public Region
 
        MidiRegion (const SourceList&);
        MidiRegion (boost::shared_ptr<const MidiRegion>);
-       MidiRegion (boost::shared_ptr<const MidiRegion>, ARDOUR::MusicFrame offset);
+       MidiRegion (boost::shared_ptr<const MidiRegion>, ARDOUR::MusicSample offset);
 
-       framecnt_t _read_at (const SourceList&, Evoral::EventSink<framepos_t>& dst,
-                            framepos_t position,
-                            framecnt_t dur,
-                            Evoral::Range<framepos_t>* loop_range,
+       samplecnt_t _read_at (const SourceList&, Evoral::EventSink<samplepos_t>& dst,
+                            samplepos_t position,
+                            samplecnt_t dur,
+                            Evoral::Range<samplepos_t>* loop_range,
                             MidiCursor& cursor,
                             uint32_t chan_n = 0,
                             NoteMode mode = Sustained,
@@ -147,18 +147,18 @@ class LIBARDOUR_API MidiRegion : public Region
        void recompute_at_start ();
        void recompute_at_end ();
 
-       void set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t sub_num);
+       void set_position_internal (samplepos_t pos, bool allow_bbt_recompute, const int32_t sub_num);
        void set_position_music_internal (double qn);
-       void set_length_internal (framecnt_t len, const int32_t sub_num);
-       void set_start_internal (framecnt_t, const int32_t sub_num);
-       void trim_to_internal (framepos_t position, framecnt_t length, const int32_t sub_num);
+       void set_length_internal (samplecnt_t len, const int32_t sub_num);
+       void set_start_internal (samplecnt_t, const int32_t sub_num);
+       void trim_to_internal (samplepos_t position, samplecnt_t length, const int32_t sub_num);
        void update_length_beats (const int32_t sub_num);
 
        void model_changed ();
        void model_shifted (double qn_distance);
        void model_automation_state_changed (Evoral::Parameter const &);
 
-       void set_start_beats_from_start_frames ();
+       void set_start_beats_from_start_samples ();
        void update_after_tempo_map_change (bool send_change = true);
 
        std::set<Evoral::Parameter> _filtered_parameters; ///< parameters that we ask our source not to return when reading