projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename Content::_file to path and support md5sums of directories.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder.cc
diff --git
a/src/lib/audio_decoder.cc
b/src/lib/audio_decoder.cc
index e2006a795d9c31e650f99c64cb3634f18047ca67..59c631632f3f63b735a883dd1292c46403e4ec64 100644
(file)
--- a/
src/lib/audio_decoder.cc
+++ b/
src/lib/audio_decoder.cc
@@
-18,12
+18,29
@@
*/
#include "audio_decoder.h"
*/
#include "audio_decoder.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<const Film> f
, shared_ptr<AudioContent> c
)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> f)
: Decoder (f)
: Decoder (f)
+ , _audio_position (0)
{
}
{
}
+
+void
+AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
+{
+ Audio (data, frame);
+ _audio_position = frame + data->frames ();
+}