projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitespace.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder.cc
diff --git
a/src/lib/audio_decoder.cc
b/src/lib/audio_decoder.cc
index 70f0effd9faa742bf5e744ab71d2dd8ff35e35b0..59c631632f3f63b735a883dd1292c46403e4ec64 100644
(file)
--- a/
src/lib/audio_decoder.cc
+++ b/
src/lib/audio_decoder.cc
@@
-18,19
+18,29
@@
*/
#include "audio_decoder.h"
*/
#include "audio_decoder.h"
-#include "stream.h"
+#include "audio_buffers.h"
+#include "exceptions.h"
+#include "log.h"
+#include "i18n.h"
+
+using std::stringstream;
+using std::list;
+using std::pair;
+using std::cout;
using boost::optional;
using boost::shared_ptr;
using boost::optional;
using boost::shared_ptr;
-AudioDecoder::AudioDecoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j)
- : Decoder (f, o, j)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> f)
+ : Decoder (f)
+ , _audio_position (0)
{
}
void
{
}
void
-AudioDecoder::
set_audio_stream (shared_ptr<AudioStream> s
)
+AudioDecoder::
audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame
)
{
{
- _audio_stream = s;
+ Audio (data, frame);
+ _audio_position = frame + data->frames ();
}
}