projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bad default scale when sample aspect ratio is given as 0.
[dcpomatic.git]
/
src
/
lib
/
sndfile_decoder.h
diff --git
a/src/lib/sndfile_decoder.h
b/src/lib/sndfile_decoder.h
index 2900afea0b3f258aaa5c1031328a716b800f9bef..41d5faf082ec29c75b2c2e1059f528c59a26e0ff 100644
(file)
--- a/
src/lib/sndfile_decoder.h
+++ b/
src/lib/sndfile_decoder.h
@@
-20,27
+20,29
@@
#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 ();
~SndfileDecoder ();
-
bool pass (
);
+
void seek (ContentTime, bool
);
int audio_channels () const;
int audio_channels () const;
- Content
AudioFra
me audio_length () const;
+ Content
Ti
me audio_length () const;
int audio_frame_rate () const;
private:
int audio_frame_rate () const;
private:
- SNDFILE* open_file (sf_count_t &);
- void close_file (SNDFILE*);
-
+ bool pass ();
+
boost::shared_ptr<const SndfileContent> _sndfile_content;
SNDFILE* _sndfile;
SF_INFO _info;
boost::shared_ptr<const SndfileContent> _sndfile_content;
SNDFILE* _sndfile;
SF_INFO _info;
- ContentAudioFrame _remaining;
+ int64_t _done;
+ int64_t _remaining;
+ float* _deinterleave_buffer;
};
};