projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
e0c524c
)
I think Butler should just clear itself out when the player changes.
author
Carl Hetherington
<cth@carlh.net>
Thu, 3 Aug 2017 16:53:13 +0000
(17:53 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 14 Aug 2017 20:07:49 +0000
(21:07 +0100)
Other layers will seek as appropriate, we shouldn't fight them I don't think.
src/lib/butler.cc
patch
|
blob
|
history
diff --git
a/src/lib/butler.cc
b/src/lib/butler.cc
index ef565c02b0607849689ffb8d1fd22da4f373062f..db1ef7ffa8dbde00ebb057f0591e832a99aeddea 100644
(file)
--- a/
src/lib/butler.cc
+++ b/
src/lib/butler.cc
@@
-234,19
+234,8
@@
Butler::audio (shared_ptr<AudioBuffers> audio)
void
Butler::player_changed ()
{
- optional<DCPTime> t;
-
- {
- boost::mutex::scoped_lock lm (_mutex);
- t = _video.earliest ();
- }
-
- if (t) {
- seek (*t, true);
- } else {
- _video.clear ();
- _audio.clear ();
- }
+ _video.clear ();
+ _audio.clear ();
}
/** Try to get `frames' frames of audio and copy it into `out'. Silence