diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 18:20:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 18:20:37 +0000 |
| commit | ede4ecbb00ecc866c502454c81e711baea780ccd (patch) | |
| tree | d4a05e59cc96651ddf0eeab929f58fb7a7019fb0 /libs/ardour/region.cc | |
| parent | 10bdce85a0e7381d1b5db38e3640600c6fd3ec79 (diff) | |
megaopus patch #2 for today: remove nframes64_t and sframes_t from source
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/region.cc')
| -rw-r--r-- | libs/ardour/region.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 13576ff11a..07d27faee9 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -804,7 +804,7 @@ Region::modify_front (nframes_t new_position, bool reset_fade, void *src) if (new_position < end) { /* can't trim it zero or negative length */ nframes_t newlen = 0; - nframes64_t delta = 0; + framepos_t delta = 0; /* can't trim it back passed where source position zero is located */ @@ -1444,11 +1444,11 @@ Region::uses_source (boost::shared_ptr<const Source> source) const return false; } -sframes_t +framecnt_t Region::source_length(uint32_t n) const { assert (n < _sources.size()); - return _sources[n]->length(_position - _start); + return _sources[n]->length (_position - _start); } bool |