diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-03-21 01:02:51 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2015-03-21 01:02:51 +1100 |
| commit | 53f452dde15e6cfc70e2f9e449c8bf731e15a18d (patch) | |
| tree | 8d8d1efcf85886432f005a0057f2e2df9b4ba44f /libs/ardour/audiosource.cc | |
| parent | 26ce7b5f1bdb8990237ec773285d52db9fe1f558 (diff) | |
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.
Diffstat (limited to 'libs/ardour/audiosource.cc')
| -rw-r--r-- | libs/ardour/audiosource.cc | 8 |
1 files changed, 1 insertions, 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; |