diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
| commit | 73192bc1a7ea55fa1864dc3826845b15c00dd2ec (patch) | |
| tree | c0039f3f5a848aed6e880abf11519dad855fa899 /libs/ardour/sndfilesource.cc | |
| parent | 74b4a3c77b08dc1e58274875604eb73e8492fa93 (diff) | |
Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/sndfilesource.cc')
| -rw-r--r-- | libs/ardour/sndfilesource.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 0afe50a311..fa2e761d8e 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -83,7 +83,7 @@ SndFileSource::SndFileSource (Session& s, const string& path, int chn, Flag flag /** This constructor is used to construct new files, not open existing ones. */ SndFileSource::SndFileSource (Session& s, const string& path, const string& origin, - SampleFormat sfmt, HeaderFormat hf, nframes_t rate, Flag flags) + SampleFormat sfmt, HeaderFormat hf, framecnt_t rate, Flag flags) : Source(s, DataType::AUDIO, path, flags) , AudioFileSource (s, path, origin, flags, sfmt, hf) { @@ -321,7 +321,7 @@ SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) con } if (_info.channels == 1) { - nframes_t ret = sf_read_float (sf, dst, file_cnt); + framecnt_t ret = sf_read_float (sf, dst, file_cnt); _read_data_count = ret * sizeof(float); if (ret != file_cnt) { char errbuf[256]; @@ -420,8 +420,8 @@ SndFileSource::destructive_write_unlocked (Sample* data, framecnt_t cnt) file_pos = capture_start_frame - _timeline_position; // split cnt in half - nframes_t subcnt = cnt / 2; - nframes_t ofilepos = file_pos; + framecnt_t subcnt = cnt / 2; + framecnt_t ofilepos = file_pos; // fade in if (crossfade (data, subcnt, 1) != subcnt) { @@ -804,7 +804,7 @@ SndFileSource::handle_header_position_change () } void -SndFileSource::setup_standard_crossfades (Session const & s, nframes_t rate) +SndFileSource::setup_standard_crossfades (Session const & s, framecnt_t rate) { /* This static method is assumed to have been called by the Session before any DFS's are created. |