From 9da934ff296ce47845f38353367daff9bb0aa598 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 17 Jul 2015 16:03:24 +0200 Subject: reworked variant of john’s soundfile locale fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- libs/ardour/sndfilesource.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libs/ardour/sndfilesource.cc') 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 -#ifdef PLATFORM_WINDOWS #include -#endif #include #include @@ -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(path.c_str()), SFM_READ, &sf_info)) == 0) { - char errbuf[256]; + if ((sf = sf_open (const_cast(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; } -- cgit v1.2.3