From 1a619472ca0d7514831476bb9be9980ffbd91f46 Mon Sep 17 00:00:00 2001 From: John Emmas Date: Thu, 16 Jul 2015 12:45:49 +0100 Subject: 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). --- libs/ardour/sndfileimportable.cc | 9 ++++++++- libs/ardour/sndfilesource.cc | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'libs/ardour') 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 +#include + 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; 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 +#include + #ifdef PLATFORM_WINDOWS #include #endif @@ -39,6 +41,8 @@ #include "ardour/utils.h" #include "ardour/session.h" +#include + #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(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; } -- cgit v1.2.3