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.
This commit is contained in:
parent
9673e6b271
commit
9da934ff29
@ -29,7 +29,6 @@
|
|||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <sys/stat.h>
|
|
||||||
|
|
||||||
#include <gtkmm/box.h>
|
#include <gtkmm/box.h>
|
||||||
#include <gtkmm/stock.h>
|
#include <gtkmm/stock.h>
|
||||||
@ -1255,8 +1254,8 @@ SoundFileBrowser::get_paths ()
|
|||||||
vector<string>::iterator i;
|
vector<string>::iterator i;
|
||||||
|
|
||||||
for (i = filenames.begin(); i != filenames.end(); ++i) {
|
for (i = filenames.begin(); i != filenames.end(); ++i) {
|
||||||
struct stat buf;
|
GStatBuf buf;
|
||||||
if ((!stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) {
|
if ((!g_stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) {
|
||||||
results.push_back (*i);
|
results.push_back (*i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1590,7 +1589,7 @@ SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths
|
|||||||
std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest"));
|
std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest"));
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
|
|
||||||
if (mkdir (tmpdir.c_str(), 0744)) {
|
if (g_mkdir (tmpdir.c_str(), 0744)) {
|
||||||
if (errno != EEXIST) {
|
if (errno != EEXIST) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -1614,7 +1613,7 @@ SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths
|
|||||||
ret = true;
|
ret = true;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
rmdir (tmpdir.c_str());
|
g_rmdir (tmpdir.c_str());
|
||||||
return ret;
|
return ret;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -24,6 +24,8 @@
|
|||||||
#include "pbd/error.h"
|
#include "pbd/error.h"
|
||||||
#include "ardour/sndfileimportable.h"
|
#include "ardour/sndfileimportable.h"
|
||||||
|
|
||||||
|
#include <glibmm/convert.h>
|
||||||
|
|
||||||
using namespace ARDOUR;
|
using namespace ARDOUR;
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
@ -68,7 +70,7 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf
|
|||||||
SndFileImportableSource::SndFileImportableSource (const string& path)
|
SndFileImportableSource::SndFileImportableSource (const string& path)
|
||||||
{
|
{
|
||||||
memset(&sf_info, 0 , sizeof(sf_info));
|
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();
|
if (!in) throw failed_constructor();
|
||||||
|
|
||||||
SF_BROADCAST_INFO binfo;
|
SF_BROADCAST_INFO binfo;
|
||||||
|
@ -28,9 +28,7 @@
|
|||||||
|
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#ifdef PLATFORM_WINDOWS
|
|
||||||
#include <glibmm/convert.h>
|
#include <glibmm/convert.h>
|
||||||
#endif
|
|
||||||
#include <glibmm/fileutils.h>
|
#include <glibmm/fileutils.h>
|
||||||
#include <glibmm/miscutils.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().
|
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) {
|
if ((sf = sf_open (const_cast<char*>(Glib::locale_from_utf8(path).c_str()), SFM_READ, &sf_info)) == 0) {
|
||||||
char errbuf[256];
|
char errbuf[1024];
|
||||||
error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1);
|
error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user