From 1be2866c4d83d46dc0fd8973e0e37a4ea3dc55c4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 6 Feb 2015 10:50:02 -0500 Subject: [PATCH] two tweaks required to fix up previous commit --- libs/ardour/audio_diskstream.cc | 2 +- libs/ardour/globals.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index f0f70638ab..4f933727bd 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -1239,7 +1239,7 @@ AudioDiskstream::_do_refill (Sample* mixdown_buffer, float* gain_buffer, framecn /* total_space is in samples. We want to optimize read sizes in various sizes using bytes */ - const size_t bits_per_sample = sndfile_data_width (_session.config.get_native_file_data_format()); + const size_t bits_per_sample = format_data_width (_session.config.get_native_file_data_format()); size_t total_bytes = total_space * bits_per_sample / 8; /* chunk size range is 256kB to 4MB. Bigger is faster in terms of MB/sec, but bigger chunk size always takes longer diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index f800271f91..cf8f8dc03f 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -635,7 +635,7 @@ ARDOUR::get_microseconds () */ int -format_data_width (ARDOUR::SampleFormat format) +ARDOUR::format_data_width (ARDOUR::SampleFormat format) {