add API to Evoral::SMF to retrieve all track/instrument names for use when importing

[ardour.git] / libs / ardour / audiosource.cc

diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc
index 7b3f424663ab78b8ce879c8ba4531dd3dc21a2c9..12c12099d5a352d090ca398d42931be1afd83c9f 100644 (file)
--- a/libs/ardour/audiosource.cc
+++ b/libs/ardour/audiosource.cc
@@ -58,7 +58,7 @@
 #include "ardour/runtime_functions.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include "ardour/debug.h"
 
@@ -387,7 +387,9 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
 
                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;
+                       lm.release(); // build_peaks_from_scratch() takes _lock
                        const_cast<AudioSource*>(this)->build_peaks_from_scratch ();
+                       lm.acquire ();
                        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;
                        }