Collect plugin runtime profile statistics.

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

diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc
index 5ccab2c0d281ec6367e6bace74940180c9bbbda9..f900689f77f804d6032f782fd99a8f3be777c86e 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;
 
@@ -40,7 +47,7 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf
         * 0xffffffff 0xfffc5680
         * seems to be a bug in Presonus Capture (which generated the file)
         *
-        * still since framepos_t is a signed int, ignore files that could
+        * still since samplepos_t is a signed int, ignore files that could
         * lead to negative timestamps for now.
         */
 
@@ -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;
@@ -86,10 +97,10 @@ SndFileImportableSource::~SndFileImportableSource ()
 {
 }
 
-framecnt_t
-SndFileImportableSource::read (Sample* buffer, framecnt_t nframes)
+samplecnt_t
+SndFileImportableSource::read (Sample* buffer, samplecnt_t nframes)
 {
-       framecnt_t per_channel = nframes / sf_info.channels;
+       samplecnt_t per_channel = nframes / sf_info.channels;
        per_channel = sf_readf_float (in.get(), buffer, per_channel);
        return per_channel * sf_info.channels;
 }
@@ -100,28 +111,28 @@ SndFileImportableSource::channels () const
        return sf_info.channels;
 }
 
-framecnt_t
+samplecnt_t
 SndFileImportableSource::length () const
 {
-       return (framecnt_t) sf_info.frames;
+       return (samplecnt_t) sf_info.frames;
 }
 
-framecnt_t
+samplecnt_t
 SndFileImportableSource::samplerate () const
 {
        return sf_info.samplerate;
 }
 
 void
-SndFileImportableSource::seek (framepos_t /*pos*/)
+SndFileImportableSource::seek (samplepos_t /*pos*/)
 {
        sf_seek (in.get(), 0, SEEK_SET);
 }
 
-framepos_t
+samplepos_t
 SndFileImportableSource::natural_position () const
 {
-       return (framepos_t) timecode;
+       return (samplepos_t) timecode;
 }
 
 bool