diff options
| author | Robin Gareus <robin@gareus.org> | 2015-07-16 19:29:45 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-07-16 19:29:45 +0200 |
| commit | 87b89a605f0c4e5fcabf9061d1a13c9caa65a824 (patch) | |
| tree | 4f75ed2898edcdb68014df39a3c2ebe384ae1d6f /gtk2_ardour | |
| parent | 1a619472ca0d7514831476bb9be9980ffbd91f46 (diff) | |
Revert "Possible fix for http://tracker.ardour.org/view.php?id=6332"
This reverts commit 1a619472ca0d7514831476bb9be9980ffbd91f46.
On Unix systems "#define g_open open" interferes with class member function
IMHO this is the wrong approach, the filename should be converted using
glib::filename_from_utf8().
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 1ab1faa206..6996273650 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -29,6 +29,7 @@ #include <unistd.h> #include <limits.h> +#include <sys/stat.h> #include <gtkmm/box.h> #include <gtkmm/stock.h> @@ -1254,8 +1255,8 @@ SoundFileBrowser::get_paths () vector<string>::iterator i; for (i = filenames.begin(); i != filenames.end(); ++i) { - GStatBuf buf; - if ((!g_stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) { + struct stat buf; + if ((!stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) { results.push_back (*i); } } @@ -1589,7 +1590,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 (g_mkdir (tmpdir.c_str(), 0744)) { + if (mkdir (tmpdir.c_str(), 0744)) { if (errno != EEXIST) { return false; } @@ -1613,7 +1614,7 @@ SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths ret = true; out: - g_rmdir (tmpdir.c_str()); + rmdir (tmpdir.c_str()); return ret; #endif } |