diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-04-14 20:47:19 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-04-14 20:47:19 +0000 |
| commit | c8228ba9853b4f0ee452343b1f1e361c584236cf (patch) | |
| tree | adc4b822a82821450677de781079133f16cad17e /libs/ardour | |
| parent | 24377e9fb2a2777179e9078219b75beb07aa3b40 (diff) | |
Fix a few return types.
git-svn-id: svn://localhost/ardour2/branches/3.0@11974 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/location.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_source.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/region.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/track.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 71f4c1aa6a..069230438e 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -63,7 +63,7 @@ class Location : public SessionHandleRef, public PBD::StatefulDestructible framepos_t start() const { return _start; } framepos_t end() const { return _end; } - framepos_t length() const { return _end - _start; } + framecnt_t length() const { return _end - _start; } int set_start (framepos_t s, bool force = false, bool allow_bbt_recompute = true); int set_end (framepos_t e, bool force = false, bool allow_bbt_recompute = true); diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index ee5e40eb45..0c2a1b29cb 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -142,12 +142,12 @@ class MidiSource : virtual public Source, public boost::enable_shared_from_this< protected: virtual void flush_midi() = 0; - virtual framepos_t read_unlocked (Evoral::EventSink<framepos_t>& dst, + virtual framecnt_t read_unlocked (Evoral::EventSink<framepos_t>& dst, framepos_t position, framepos_t start, framecnt_t cnt, MidiStateTracker* tracker) const = 0; - virtual framepos_t write_unlocked (MidiRingBuffer<framepos_t>& dst, + virtual framecnt_t write_unlocked (MidiRingBuffer<framepos_t>& dst, framepos_t position, framecnt_t cnt) = 0; diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index cf180556b4..0acbf04af4 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -324,7 +324,7 @@ class Region virtual int _set_state (const XMLNode&, int version, PBD::PropertyChange& what_changed, bool send_signal); void post_set (const PBD::PropertyChange&); virtual void set_position_internal (framepos_t pos, bool allow_bbt_recompute); - virtual void set_length_internal (framepos_t pos); + virtual void set_length_internal (framecnt_t); DataType _type; diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 2ec1ed4fdd..71ec61bb24 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -127,8 +127,8 @@ class Track : public Route, public PublicDiskstream void set_pending_overwrite (bool); int seek (framepos_t, bool complete_refill = false); bool hidden () const; - int can_internal_playback_seek (framepos_t); - int internal_playback_seek (framepos_t); + int can_internal_playback_seek (framecnt_t); + int internal_playback_seek (framecnt_t); void non_realtime_input_change (); void non_realtime_locate (framepos_t); void non_realtime_set_speed (); |