diff options
| -rw-r--r-- | libs/ardour/ardour/srcfilesource.h | 2 | ||||
| -rw-r--r-- | libs/ardour/srcfilesource.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/srcfilesource.h b/libs/ardour/ardour/srcfilesource.h index 073329cc29..3dc1590dda 100644 --- a/libs/ardour/ardour/srcfilesource.h +++ b/libs/ardour/ardour/srcfilesource.h @@ -63,7 +63,7 @@ protected: } private: - static const uint32_t blocksize; + static const uint32_t max_blocksize; boost::shared_ptr<AudioFileSource> _source; mutable SRC_STATE* _src_state; diff --git a/libs/ardour/srcfilesource.cc b/libs/ardour/srcfilesource.cc index cb31ccd77f..03b85788e1 100644 --- a/libs/ardour/srcfilesource.cc +++ b/libs/ardour/srcfilesource.cc @@ -30,7 +30,7 @@ using namespace ARDOUR; using namespace PBD; -const uint32_t SrcFileSource::blocksize = 2097152U; /* see AudioDiskstream::_do_refill_with_alloc, max */ +const uint32_t SrcFileSource::max_blocksize = 2097152U; /* see AudioDiskstream::_do_refill_with_alloc, max */ SrcFileSource::SrcFileSource (Session& s, boost::shared_ptr<AudioFileSource> src, SrcQuality srcq) : Source(s, DataType::AUDIO, src->name(), Flag (src->flags() & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy))) @@ -67,7 +67,7 @@ SrcFileSource::SrcFileSource (Session& s, boost::shared_ptr<AudioFileSource> src _ratio = s.nominal_frame_rate() / _source->sample_rate(); _src_data.src_ratio = _ratio; - src_buffer_size = ceil((double)blocksize / _ratio) + 2; + src_buffer_size = ceil((double)max_blocksize / _ratio) + 2; _src_buffer = new float[src_buffer_size]; int err; |