projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
sndfile_decoder.h
diff --git
a/src/lib/sndfile_decoder.h
b/src/lib/sndfile_decoder.h
index 63f2f7dc49f7553b9c265732dc683f79c58c718d..46d9c5e5cf24762b5c2733e4f8c0be6c035a4d97 100644
(file)
--- a/
src/lib/sndfile_decoder.h
+++ b/
src/lib/sndfile_decoder.h
@@
-32,19
+32,16
@@
public:
void seek (ContentTime, bool);
int audio_channels () const;
void seek (ContentTime, bool);
int audio_channels () const;
- Audio
Content::
Frame audio_length () const;
+ AudioFrame audio_length () const;
int audio_frame_rate () const;
private:
int audio_frame_rate () const;
private:
- bool has_audio () const {
- return true;
- }
bool pass ();
boost::shared_ptr<const SndfileContent> _sndfile_content;
SNDFILE* _sndfile;
SF_INFO _info;
bool pass ();
boost::shared_ptr<const SndfileContent> _sndfile_content;
SNDFILE* _sndfile;
SF_INFO _info;
- Audio
Content::
Frame _done;
- Audio
Content::
Frame _remaining;
+ AudioFrame _done;
+ AudioFrame _remaining;
float* _deinterleave_buffer;
};
float* _deinterleave_buffer;
};