projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle multiple audio streams in a single piece of content
[dcpomatic.git]
/
src
/
lib
/
sndfile_decoder.h
diff --git
a/src/lib/sndfile_decoder.h
b/src/lib/sndfile_decoder.h
index 46d9c5e5cf24762b5c2733e4f8c0be6c035a4d97..4474adc9e3b37dba35bf62bd689ec318e973e643 100644
(file)
--- a/
src/lib/sndfile_decoder.h
+++ b/
src/lib/sndfile_decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
3
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,31
+17,24
@@
*/
*/
-#include <sndfile.h>
#include "decoder.h"
#include "audio_decoder.h"
#include "decoder.h"
#include "audio_decoder.h"
+#include "audio_examiner.h"
+#include "sndfile_base.h"
class SndfileContent;
class SndfileContent;
-class SndfileDecoder : public AudioDecoder
+class SndfileDecoder : public
Sndfile, public
AudioDecoder
{
public:
{
public:
- SndfileDecoder (boost::shared_ptr<const
Film>, boost::shared_ptr<const SndfileContent>
);
+ SndfileDecoder (boost::shared_ptr<const
SndfileContent> c
);
~SndfileDecoder ();
~SndfileDecoder ();
- void seek (ContentTime, bool);
-
- int audio_channels () const;
- AudioFrame audio_length () const;
- int audio_frame_rate () const;
-
private:
private:
- bool pass ();
+ bool pass (PassReason);
+ void seek (ContentTime, bool);
- 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;
};