projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix problems with playing back 3D DCPs and with inserting 3D DCPs
[dcpomatic.git]
/
src
/
lib
/
audio_merger.cc
diff --git
a/src/lib/audio_merger.cc
b/src/lib/audio_merger.cc
index 8a69dee5204036381253a4f23e54ba12892587e6..1cc5ff0a19de156bdee0e7e6a6dd3da56e47dc49 100644
(file)
--- a/
src/lib/audio_merger.cc
+++ b/
src/lib/audio_merger.cc
@@
-33,6
+33,7
@@
using std::cout;
using std::make_pair;
using boost::shared_ptr;
using boost::optional;
using std::make_pair;
using boost::shared_ptr;
using boost::optional;
+using namespace dcpomatic;
AudioMerger::AudioMerger (int frame_rate)
: _frame_rate (frame_rate)
AudioMerger::AudioMerger (int frame_rate)
: _frame_rate (frame_rate)
@@
-56,11
+57,9
@@
AudioMerger::pull (DCPTime time)
{
list<pair<shared_ptr<AudioBuffers>, DCPTime> > out;
{
list<pair<shared_ptr<AudioBuffers>, DCPTime> > out;
- DCPTimePeriod period (_last_pull, time);
- _buffers.sort (AudioMerger::BufferComparator());
-
list<Buffer> new_buffers;
list<Buffer> new_buffers;
+ _buffers.sort (AudioMerger::BufferComparator());
BOOST_FOREACH (Buffer i, _buffers) {
if (i.period().to <= time) {
/* Completely within the pull period */
BOOST_FOREACH (Buffer i, _buffers) {
if (i.period().to <= time) {
/* Completely within the pull period */
@@
-98,7
+97,6
@@
AudioMerger::pull (DCPTime time)
void
AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
{
void
AudioMerger::push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time)
{
- DCPOMATIC_ASSERT (time >= _last_pull);
DCPOMATIC_ASSERT (audio->frames() > 0);
DCPTimePeriod period (time, time + DCPTime::from_frames (audio->frames(), _frame_rate));
DCPOMATIC_ASSERT (audio->frames() > 0);
DCPTimePeriod period (time, time + DCPTime::from_frames (audio->frames(), _frame_rate));
@@
-164,5
+162,4
@@
void
AudioMerger::clear ()
{
_buffers.clear ();
AudioMerger::clear ()
{
_buffers.clear ();
- _last_pull = DCPTime ();
}
}