summaryrefslogtreecommitdiff
path: root/src/lib/decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-12-09 21:51:36 +0000
committerCarl Hetherington <cth@carlh.net>2016-12-09 21:51:36 +0000
commit936ff6927ad24daf0ed20776b19b6faa3df9bf83 (patch)
tree556123d229c916251ddc96f9a8b3164b4d815e9b /src/lib/decoder.cc
parentd7013785f7a1d86feb471af826419afa6298e2b8 (diff)
parent5757f3ba9d2cf3948bcad2b3f3ddbbf09ad754a5 (diff)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/lib/decoder.cc')
-rw-r--r--src/lib/decoder.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index b7bd78c14..114e2ebb4 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -19,19 +19,19 @@
*/
#include "decoder.h"
+#include "decoder_part.h"
#include <iostream>
using std::cout;
using boost::optional;
void
-Decoder::maybe_seek (optional<ContentTime>& position, ContentTime time, bool accurate)
+Decoder::maybe_seek (optional<ContentTime> position, ContentTime time, bool accurate)
{
- if (position && (time >= *position && time < (*position + ContentTime::from_seconds(1)))) {
+ if (position && (time >= position.get() && time < (position.get() + ContentTime::from_seconds(1)))) {
/* No need to seek: caller should just pass() */
return;
}
- position.reset ();
seek (time, accurate);
}