diff options
author | Robin Gareus <robin@gareus.org> | 2015-07-17 16:03:24 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-07-17 16:03:24 +0200 |
commit | 9da934ff296ce47845f38353367daff9bb0aa598 (patch) | |
tree | c7b547f2495db624b19a6c7ecc15cad990e9a7e4 /libs | |
parent | 9673e6b2716d2ac1adf3f3ca277bbef60ed4e7cb (diff) |
reworked variant of john’s soundfile locale fix
see 87b89a6
IMPORTANT NOTE: In theory, the correct glibmm function should have been Glib::filename_from_utf8() but I couldn't make that work on Windows and
ended up using Glib::locale_from_utf8() instead. sfdb import will therefore
need to get re-tested on the other platforms (especially in a non-English locale).
If this fix doesn't work we should probably revert to the previous strategy
but using the global specifier "::g_open()" explicitly…
… and only on PLATFORM_WINDOWS (POSIX #define g_open open) fails regardless.
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/sndfileimportable.cc | 4 | ||||
-rw-r--r-- | libs/ardour/sndfilesource.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc index 5ccab2c0d2..040771b143 100644 --- a/libs/ardour/sndfileimportable.cc +++ b/libs/ardour/sndfileimportable.cc @@ -24,6 +24,8 @@ #include "pbd/error.h" #include "ardour/sndfileimportable.h" +#include <glibmm/convert.h> + using namespace ARDOUR; using namespace std; @@ -68,7 +70,7 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf SndFileImportableSource::SndFileImportableSource (const string& path) { memset(&sf_info, 0 , sizeof(sf_info)); - in.reset( sf_open(path.c_str(), SFM_READ, &sf_info), sf_close); + in.reset( sf_open(Glib::locale_from_utf8(path).c_str(), SFM_READ, &sf_info), 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..07e189618e 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -28,9 +28,7 @@ #include <sys/stat.h> -#ifdef PLATFORM_WINDOWS #include <glibmm/convert.h> -#endif #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> @@ -924,8 +922,8 @@ SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, stri 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 ((sf = sf_open (const_cast<char*>(Glib::locale_from_utf8(path).c_str()), SFM_READ, &sf_info)) == 0) { + char errbuf[1024]; error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1); return false; } |