diff options
| author | Jesse Chappell <jesse@essej.net> | 2006-12-28 17:05:55 +0000 |
|---|---|---|
| committer | Jesse Chappell <jesse@essej.net> | 2006-12-28 17:05:55 +0000 |
| commit | 7e8a7c9113887fbd079340e9b55afb8a92279791 (patch) | |
| tree | 34004db825c134d6087a3f1f0cd37ffffc4eba52 /libs | |
| parent | 64c308042c52d35fcc30fbd9ae19480b629df8c0 (diff) | |
fixed compiler complaints from last commit
git-svn-id: svn://localhost/ardour2/trunk@1251 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/audiosource.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index bfe180240b..d94a34e1f0 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -799,6 +799,7 @@ AudioSource::do_build_peak (nframes_t first_frame, nframes_t cnt) int peakfile = -1; int ret = -1; off_t target_length; + off_t endpos; #ifdef DEBUG_PEAK_BUILD cerr << pthread_self() << ": " << _name << ": building peaks for " << first_frame << " to " << first_frame + cnt - 1 << endl; @@ -857,7 +858,7 @@ AudioSource::do_build_peak (nframes_t first_frame, nframes_t cnt) it does not cause single-extent allocation even for peakfiles of less than BLOCKSIZE bytes. only call ftruncate if we'll make the file larger. */ - off_t endpos = lseek (peakfile, 0, SEEK_END); + endpos = lseek (peakfile, 0, SEEK_END); target_length = BLOCKSIZE * ((first_peak_byte + BLOCKSIZE + 1) / BLOCKSIZE); @@ -874,7 +875,7 @@ AudioSource::do_build_peak (nframes_t first_frame, nframes_t cnt) goto out; } - _peak_byte_max = max(_peak_byte_max, first_peak_byte + sizeof(PeakData)*peaki); + _peak_byte_max = max(_peak_byte_max, (off_t) (first_peak_byte + sizeof(PeakData)*peaki)); ret = 0; |