ardour/livetrax
13
0
Fork 0
Code

Don't open peakfiles O_NONBLOCK or O_NOATIME.

Browse Source 
O_NOATIME removed due to what appears to be a bug in fuse where open fails.
O_NONBLOCK was basically unjustifiable.
This commit is contained in:
nick_m 2015-03-21 01:02:51 +11:00
parent 26ce7b5f1b
commit 53f452dde1
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/audiosource.cc
View File

@ -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;