diff options
author | John Emmas <johne53@tiscali.co.uk> | 2015-07-16 12:45:49 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-07-16 18:27:52 +0200 |
commit | 1a619472ca0d7514831476bb9be9980ffbd91f46 (patch) | |
tree | 9287f7303dada9d6a23bffc81d22730047056e12 /libs/ardour/sndfileimportable.cc | |
parent | 93b90396d28fb34f17bf719b6ad41b719d653b61 (diff) |
Possible fix for http://tracker.ardour.org/view.php?id=6332
For sfdb stuff, use glib file functions in preference to ANSI or libsndfile handling. On Windows, we need functions which understand UTF-8 (so that we'll be able to import sound files, even in a non-English locale).
Diffstat (limited to 'libs/ardour/sndfileimportable.cc')
-rw-r--r-- | libs/ardour/sndfileimportable.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc index 5ccab2c0d2..ffc894b2d4 100644 --- a/libs/ardour/sndfileimportable.cc +++ b/libs/ardour/sndfileimportable.cc @@ -24,6 +24,9 @@ #include "pbd/error.h" #include "ardour/sndfileimportable.h" +#include <fcntl.h> +#include <glib/gstdio.h> + using namespace ARDOUR; using namespace std; @@ -67,8 +70,12 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf SndFileImportableSource::SndFileImportableSource (const string& path) { + int fd; + if ((-1) == (fd = g_open (path.c_str(), O_RDONLY, 0664))) + 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; |