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 /gtk2_ardour/sfdb_ui.cc | |
| 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 'gtk2_ardour/sfdb_ui.cc')
| -rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 6996273650..1ab1faa206 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -29,7 +29,6 @@ #include <unistd.h> #include <limits.h> -#include <sys/stat.h> #include <gtkmm/box.h> #include <gtkmm/stock.h> @@ -1255,8 +1254,8 @@ SoundFileBrowser::get_paths () vector<string>::iterator i; for (i = filenames.begin(); i != filenames.end(); ++i) { - struct stat buf; - if ((!stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) { + GStatBuf buf; + if ((!g_stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) { 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")); bool ret = false; - if (mkdir (tmpdir.c_str(), 0744)) { + if (g_mkdir (tmpdir.c_str(), 0744)) { if (errno != EEXIST) { return false; } @@ -1614,7 +1613,7 @@ SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths ret = true; out: - rmdir (tmpdir.c_str()); + g_rmdir (tmpdir.c_str()); return ret; #endif } |