diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-07-25 21:31:42 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2015-07-25 23:14:51 +1000 |
| commit | ba140634636ff453fa2755832cafd6e15dff0415 (patch) | |
| tree | 6919c104af4fb3b7b81145c4f9a377f2cc8c93bf /libs/ardour/sndfileimportable.cc | |
| parent | ecb4a760958b3acaf1e441536305a25594ceb9b7 (diff) | |
Use g_open and sf_open_fd in SndFileImportable instead of sf_open and Glib::locale_from_utf8
Diffstat (limited to 'libs/ardour/sndfileimportable.cc')
| -rw-r--r-- | libs/ardour/sndfileimportable.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc index 040771b143..11cff41c35 100644 --- a/libs/ardour/sndfileimportable.cc +++ b/libs/ardour/sndfileimportable.cc @@ -20,6 +20,11 @@ #include <sndfile.h> #include <iostream> #include <cstring> +#include <fcntl.h> + +#include <glib.h> +#include <glib/gstdio.h> + #include "pbd/error.h" #include "ardour/sndfileimportable.h" @@ -69,8 +74,12 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf SndFileImportableSource::SndFileImportableSource (const string& path) { + int fd = g_open (path.c_str (), SFM_READ, 0444); + if (fd == -1) { + throw failed_constructor (); + } memset(&sf_info, 0 , sizeof(sf_info)); - in.reset( sf_open(Glib::locale_from_utf8(path).c_str(), SFM_READ, &sf_info), sf_close); + in.reset (sf_open_fd (fd, SFM_READ, &sf_info, true), sf_close); if (!in) throw failed_constructor(); SF_BROADCAST_INFO binfo; |