Merge branch 'master' into ccmerge

[ardour.git] / libs / pbd / sndfile_manager.cc

diff --git a/libs/pbd/sndfile_manager.cc b/libs/pbd/sndfile_manager.cc
index 4977f21dfd069035d95e73b973bcdfcf8561c451..d1dcd0525657a38b875752d0428464d450889dd6 100644 (file)
--- a/libs/pbd/sndfile_manager.cc
+++ b/libs/pbd/sndfile_manager.cc
@@ -90,12 +90,7 @@ SndFileDescriptor::open ()
 {
        /* we must have a lock on the FileManager's mutex */
        
-       int fd = ::open(_path.c_str(), O_LARGEFILE | (_writeable ? (O_RDWR) : O_RDONLY));
-       if (fd == -1) return false;
-       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
-
-       _sndfile = sf_open_fd (fd, _writeable ? SFM_RDWR : SFM_READ, _info, 1);
-
+       _sndfile = sf_open (_path.c_str(), _writeable ? SFM_RDWR : SFM_READ, _info);
        return (_sndfile == 0);
 }