projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debug.
[dcpomatic.git]
/
src
/
lib
/
player.cc
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index fe08241ab8258bca5ec05cf8865472ef584cc941..4cdeb7256ef731975693a5cf088b2cf2ba0c0253 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-48,6
+48,7
@@
#include "image_decoder.h"
#include "compose.hpp"
#include "shuffler.h"
#include "image_decoder.h"
#include "compose.hpp"
#include "shuffler.h"
+#include "dcpomatic_log.h"
#include <dcp/reel.h>
#include <dcp/reel_sound_asset.h>
#include <dcp/reel_subtitle_asset.h>
#include <dcp/reel.h>
#include <dcp/reel_sound_asset.h>
#include <dcp/reel_subtitle_asset.h>
@@
-883,6
+884,7
@@
Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_a
return;
}
shared_ptr<AudioBuffers> cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames));
return;
}
shared_ptr<AudioBuffers> cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames));
+ LOG_GENERAL_NC("copy_from #8");
cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0);
content_audio.audio = cut;
}
cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0);
content_audio.audio = cut;
}
@@
-1167,6
+1169,7
@@
Player::discard_audio (shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTi
return make_pair(shared_ptr<AudioBuffers>(), DCPTime());
}
shared_ptr<AudioBuffers> cut (new AudioBuffers (audio->channels(), remaining_frames));
return make_pair(shared_ptr<AudioBuffers>(), DCPTime());
}
shared_ptr<AudioBuffers> cut (new AudioBuffers (audio->channels(), remaining_frames));
+ LOG_GENERAL_NC("copy_from #9");
cut->copy_from (audio.get(), remaining_frames, discard_frames, 0);
return make_pair(cut, time + discard_time);
}
cut->copy_from (audio.get(), remaining_frames, discard_frames, 0);
return make_pair(cut, time + discard_time);
}