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/sndfilesource.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/sndfilesource.cc')
-rw-r--r-- | libs/ardour/sndfilesource.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 5acfe7b119..ca2c41d582 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -28,6 +28,8 @@ #include <sys/stat.h> +#include <glib/gstdio.h> + #ifdef PLATFORM_WINDOWS #include <glibmm/convert.h> #endif @@ -39,6 +41,8 @@ #include "ardour/utils.h" #include "ardour/session.h" +#include <fcntl.h> + #include "i18n.h" using namespace std; @@ -921,11 +925,17 @@ SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, stri SNDFILE *sf; SF_INFO sf_info; BroadcastInfo binfo; + char errbuf[1024]; + int fd; sf_info.format = 0; // libsndfile says to clear this before sf_open(). - if ((sf = sf_open (const_cast<char*>(path.c_str()), SFM_READ, &sf_info)) == 0) { - char errbuf[256]; + if ((-1) == (fd = g_open (path.c_str(), O_RDONLY, 0664))) { + sprintf (errbuf, "SndFileSource::get_soundfile_info - cannot open file \"%s\"", path.c_str()); + return false; + } + + if ((sf = sf_open_fd (fd, SFM_READ, &sf_info, true)) == 0) { error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1); return false; } |