From 53f452dde15e6cfc70e2f9e449c8bf731e15a18d Mon Sep 17 00:00:00 2001 From: nick_m Date: Sat, 21 Mar 2015 01:02:51 +1100 Subject: [PATCH] Don't open peakfiles O_NONBLOCK or O_NOATIME. O_NOATIME removed due to what appears to be a bug in fuse where open fails. O_NONBLOCK was basically unjustifiable. --- libs/ardour/audiosource.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index 7747a2b90e..afa4698db2 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -355,13 +355,7 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t #endif framecnt_t zero_fill = 0; -#ifdef PLATFORM_WINDOWS - ScopedFileDescriptor sfd (::open (peakpath.c_str(), O_RDONLY)); -#elif defined (__APPLE__) - ScopedFileDescriptor sfd (::open (peakpath.c_str(), O_RDONLY | O_NONBLOCK)); -#else - ScopedFileDescriptor sfd (::open (peakpath.c_str(), O_RDONLY | O_NOATIME | O_NONBLOCK)); -#endif + ScopedFileDescriptor sfd (::open (peakpath.c_str(), O_RDONLY)); if (sfd < 0) { error << string_compose (_("Cannot open peakfile @ %1 for reading (%2)"), peakpath, strerror (errno)) << endmsg;