From 8587fef16afd4b14e871ed22ea23492f14b8af85 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 17 Jul 2015 11:52:45 -0400 Subject: do not carry out a size check on peakfiles for files still being recorded. The size check (and possible rebuild) causes a crash with MSVC. It would be nice to know more about why. --- libs/ardour/audiosource.cc | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'libs/ardour/audiosource.cc') diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index 025652aa3b..9f52e847a0 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -363,22 +363,32 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t return -1; } - /* check actual size of the peakfile is at least large enough for all - * the data in the audio file. if it is too short, assume that a crash - * or other error truncated it, and rebuild it from scratch. - */ + if (!_captured_for.empty()) { - const off_t expected_file_size = (_length / (double) samples_per_file_peak) * sizeof (PeakData); - - if (statbuf.st_size < expected_file_size) { - warning << string_compose (_("peak file %1 is truncated from %2 to %3"), peakpath, expected_file_size, statbuf.st_size) << endmsg; - const_cast(this)->build_peaks_from_scratch (); - if (g_stat (peakpath.c_str(), &statbuf) != 0) { - error << string_compose (_("Cannot open peakfile @ %1 for size check (%2) after rebuild"), peakpath, strerror (errno)) << endmsg; - } + /* _captured_for is only set after a capture pass is + * complete. so we know that capturing is finished for this + * file, and now we can check actual size of the peakfile is at + * least large enough for all the data in the audio file. if it + * is too short, assume that a crash or other error truncated + * it, and rebuild it from scratch. + * + * XXX this may not work for destructive recording, but we + * might decided to get rid of that anyway. + * + */ + + const off_t expected_file_size = (_length / (double) samples_per_file_peak) * sizeof (PeakData); + if (statbuf.st_size < expected_file_size) { - fatal << "peak file is still truncated after rebuild" << endmsg; - /*NOTREACHED*/ + warning << string_compose (_("peak file %1 is truncated from %2 to %3"), peakpath, expected_file_size, statbuf.st_size) << endmsg; + const_cast(this)->build_peaks_from_scratch (); + if (g_stat (peakpath.c_str(), &statbuf) != 0) { + error << string_compose (_("Cannot open peakfile @ %1 for size check (%2) after rebuild"), peakpath, strerror (errno)) << endmsg; + } + if (statbuf.st_size < expected_file_size) { + fatal << "peak file is still truncated after rebuild" << endmsg; + /*NOTREACHED*/ + } } } -- cgit v1.2.3