Use g_open and sf_open_fd in SndFileImportable instead of sf_open and Glib::locale_fr...
authorTim Mayberry <mojofunk@gmail.com>
Sat, 25 Jul 2015 11:31:42 +0000 (21:31 +1000)
committerTim Mayberry <mojofunk@gmail.com>
Sat, 25 Jul 2015 13:14:51 +0000 (23:14 +1000)
libs/ardour/sndfileimportable.cc

index 040771b1439a362bbbffc0d83c75ac77287d4c25..11cff41c355d3898dcbee59a34d339f7187e0b3a 100644 (file)
 #include <sndfile.h>
 #include <iostream>
 #include <cstring>
+#include <fcntl.h>
+
+#include <glib.h>
+#include <glib/gstdio.h>
+
 
 #include "pbd/error.h"
 #include "ardour/sndfileimportable.h"
@@ -69,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 (), SFM_READ, 0444);
+       if (fd == -1) {
+               throw failed_constructor ();
+       }
        memset(&sf_info, 0 , sizeof(sf_info));
-       in.reset( sf_open(Glib::locale_from_utf8(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;