extensive changes to PresentationInfo API

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

diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc
index 5ccab2c0d281ec6367e6bace74940180c9bbbda9..95b269a014a455111c02495b6ab5d78d0243d29d 100644 (file)
--- a/libs/ardour/sndfileimportable.cc
+++ b/libs/ardour/sndfileimportable.cc
@@ -20,10 +20,17 @@
 #include <sndfile.h>
 #include <iostream>
 #include <cstring>
+#include <fcntl.h>
+
+#include <glib.h>
+#include "pbd/gstdio_compat.h"
+
 
 #include "pbd/error.h"
 #include "ardour/sndfileimportable.h"
 
+#include <glibmm/convert.h>
+
 using namespace ARDOUR;
 using namespace std;
 
@@ -67,8 +74,12 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf
 
 SndFileImportableSource::SndFileImportableSource (const string& path)
 {
+       int fd = g_open (path.c_str (), O_RDONLY, 0444);
+       if (fd == -1) {
+               throw failed_constructor ();
+       }
        memset(&sf_info, 0 , sizeof(sf_info));
-       in.reset( sf_open(path.c_str(), SFM_READ, &sf_info), sf_close);
+       in.reset (sf_open_fd (fd, SFM_READ, &sf_info, true), sf_close);
        if (!in) throw failed_constructor();
 
        SF_BROADCAST_INFO binfo;