projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename ContentAudio -> PieceAudio and pass audio through Piece.
[dcpomatic.git]
/
src
/
lib
/
piece.cc
diff --git
a/src/lib/piece.cc
b/src/lib/piece.cc
index 29f82f80ca8ed8b9b654d1ca58f9109299888832..521a5e56db0f09f6a0eb0935bab1cc1c439dfcb1 100644
(file)
--- a/
src/lib/piece.cc
+++ b/
src/lib/piece.cc
@@
-20,6
+20,7
@@
#include "audio_content.h"
#include "audio_content.h"
+#include "audio_decoder.h"
#include "content.h"
#include "dcp_content.h"
#include "dcpomatic_log.h"
#include "content.h"
#include "dcp_content.h"
#include "dcpomatic_log.h"
@@
-56,6
+57,10
@@
Piece::Piece (weak_ptr<const Film> film, shared_ptr<Content> c, shared_ptr<Decod
if (_decoder->video) {
_decoder->video->Data.connect (boost::bind(&Piece::video, this, _1, _2, _3, _4));
}
if (_decoder->video) {
_decoder->video->Data.connect (boost::bind(&Piece::video, this, _1, _2, _3, _4));
}
+
+ if (_decoder->audio) {
+ _decoder->audio->Data.connect (boost::bind(&Piece::audio, this, _1, _2, _3));
+ }
}
}
@@
-66,6
+71,13
@@
Piece::video (shared_ptr<const ImageProxy> image, Frame frame, Eyes eyes, Part p
}
}
+void
+Piece::audio (AudioStreamPtr stream, shared_ptr<const AudioBuffers> audio, Frame frame)
+{
+ Audio (PieceAudio(stream, audio, frame));
+}
+
+
void
Piece::update_pull_to (DCPTime& pull_to) const
{
void
Piece::update_pull_to (DCPTime& pull_to) const
{