diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-27 12:31:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-27 12:31:23 +0000 |
| commit | 298395454530a7bbcd2ea333d57dff8be8468bba (patch) | |
| tree | d95d2208d2b77683d7e9d3a4ae7441ef871e3c90 /src/lib | |
| parent | e8c1880a2b9a40eb11ee259feee3edd799139a43 (diff) | |
| parent | cc3900735839ff4b0da0c046b5c606c440ba917a (diff) | |
Merge branch '2.0' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic into 2.0
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/sndfile_decoder.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc index d6537843e..f98d4d8be 100644 --- a/src/lib/sndfile_decoder.cc +++ b/src/lib/sndfile_decoder.cc @@ -18,6 +18,10 @@ */ #include <iostream> +#ifdef DCPOMATIC_WINDOWS +#include <windows.h> +#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1 +#endif #include <sndfile.h> #include "sndfile_content.h" #include "sndfile_decoder.h" @@ -40,7 +44,14 @@ SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const Sndfi , _deinterleave_buffer (0) { _info.format = 0; + + /* Here be monsters. See fopen_boost for similar shenanigans */ +#ifdef DCPOMATIC_WINDOWS + _sndfile = sf_wchar_open (_sndfile_content->path(0).c_str(), SFM_READ, &_info); +#else _sndfile = sf_open (_sndfile_content->path(0).string().c_str(), SFM_READ, &_info); +#endif + if (!_sndfile) { throw DecodeError (_("could not open audio file for reading")); } |