projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1.0' into 1.0-multiple-selection
[dcpomatic.git]
/
src
/
lib
/
sndfile_decoder.cc
diff --git
a/src/lib/sndfile_decoder.cc
b/src/lib/sndfile_decoder.cc
index bfa163c6c6c7f41696543e582c44aca9ac56d736..09ccf4fbc1fd9ba5d2bcf3eac9d3aa2ae135b45b 100644
(file)
--- a/
src/lib/sndfile_decoder.cc
+++ b/
src/lib/sndfile_decoder.cc
@@
-35,12
+35,12
@@
using boost::shared_ptr;
SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
: Decoder (f)
SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
: Decoder (f)
- , AudioDecoder (f)
+ , AudioDecoder (f
, c
)
, _sndfile_content (c)
, _deinterleave_buffer (0)
{
_info.format = 0;
, _sndfile_content (c)
, _deinterleave_buffer (0)
{
_info.format = 0;
- _sndfile = sf_open (_sndfile_content->
file
().string().c_str(), SFM_READ, &_info);
+ _sndfile = sf_open (_sndfile_content->
path
().string().c_str(), SFM_READ, &_info);
if (!_sndfile) {
throw DecodeError (_("could not open audio file for reading"));
}
if (!_sndfile) {
throw DecodeError (_("could not open audio file for reading"));
}