Merge branch 'master' into content-rework-take5

[dcpomatic.git] / src / lib / video_decoder.cc

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 33dd433eac8e1a6d3484a6ca6be954924727850b..32b06085f21b741e060111cb0bd913fcfcf51d93 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -29,7 +29,7 @@
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<VideoContent> c)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
        : Decoder (f)
        , _video_frame (0)
        , _last_source_time (0)
@@ -106,10 +106,7 @@ VideoDecoder::set_progress (Job* j) const
 {
        assert (j);
 
-#if 0
-       XXX
-       if (_film->length()) {
-               j->set_progress (float (_video_frame) / _film->length().get());
+       if (_film->video_length()) {
+               j->set_progress (float (_video_frame) / _film->video_length());
        }
-#endif 
 }