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 /libs/ardour/sndfilesource.cc | |
| 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 'libs/ardour/sndfilesource.cc')
| -rw-r--r-- | libs/ardour/sndfilesource.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index ca2c41d582..5acfe7b119 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -28,8 +28,6 @@ #include <sys/stat.h> -#include <glib/gstdio.h> - #ifdef PLATFORM_WINDOWS #include <glibmm/convert.h> #endif @@ -41,8 +39,6 @@ #include "ardour/utils.h" #include "ardour/session.h" -#include <fcntl.h> - #include "i18n.h" using namespace std; @@ -925,17 +921,11 @@ SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, stri SNDFILE *sf; SF_INFO sf_info; BroadcastInfo binfo; - char errbuf[1024]; - int fd; sf_info.format = 0; // libsndfile says to clear this before sf_open(). - if ((-1) == (fd = g_open (path.c_str(), O_RDONLY, 0664))) { - sprintf (errbuf, "SndFileSource::get_soundfile_info - cannot open file \"%s\"", path.c_str()); - return false; - } - - if ((sf = sf_open_fd (fd, SFM_READ, &sf_info, true)) == 0) { + if ((sf = sf_open (const_cast<char*>(path.c_str()), SFM_READ, &sf_info)) == 0) { + char errbuf[256]; error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1); return false; } |