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 46d9c5e5cf24762b5c2733e4f8c0be6c035a4d97..41d5faf082ec29c75b2c2e1059f528c59a26e0ff 100644
(file)
--- a/
src/lib/sndfile_decoder.h
+++ b/
src/lib/sndfile_decoder.h
@@
-20,19
+20,20
@@
#include <sndfile.h>
#include "decoder.h"
#include "audio_decoder.h"
#include <sndfile.h>
#include "decoder.h"
#include "audio_decoder.h"
+#include "audio_examiner.h"
class SndfileContent;
class SndfileContent;
-class SndfileDecoder : public AudioDecoder
+class SndfileDecoder : public AudioDecoder
, public AudioExaminer
{
public:
{
public:
- SndfileDecoder (boost::shared_ptr<const
Film>, boost::shared_ptr<const SndfileContent>
);
+ SndfileDecoder (boost::shared_ptr<const
SndfileContent> c
);
~SndfileDecoder ();
void seek (ContentTime, bool);
int audio_channels () const;
~SndfileDecoder ();
void seek (ContentTime, bool);
int audio_channels () const;
-
AudioFra
me audio_length () const;
+
ContentTi
me audio_length () const;
int audio_frame_rate () const;
private:
int audio_frame_rate () const;
private:
@@
-41,7
+42,7
@@
private:
boost::shared_ptr<const SndfileContent> _sndfile_content;
SNDFILE* _sndfile;
SF_INFO _info;
boost::shared_ptr<const SndfileContent> _sndfile_content;
SNDFILE* _sndfile;
SF_INFO _info;
-
AudioFrame
_done;
-
AudioFrame
_remaining;
+
int64_t
_done;
+
int64_t
_remaining;
float* _deinterleave_buffer;
};
float* _deinterleave_buffer;
};