Support more detailed horizontal positioning coming from libsub.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 8637085af9a7090251f5684d4c3a1572a1c2f335..0e244c3089858684bef5f88bb6ac8e33de32fb48 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -27,7 +27,7 @@
 #include "job.h"
 #include "util.h"
 #include "job_manager.h"
-#include "dcp_transcoder.h"
+#include "dcp_encoder.h"
 #include "transcode_job.h"
 #include "upload_job.h"
 #include "null_log.h"
@@ -343,7 +343,7 @@ Film::make_dcp ()
        LOG_GENERAL ("J2K bandwidth %1", j2k_bandwidth());
 
        shared_ptr<TranscodeJob> tj (new TranscodeJob (shared_from_this()));
-       tj->set_transcoder (shared_ptr<Transcoder> (new DCPTranscoder (shared_from_this(), tj)));
+       tj->set_encoder (shared_ptr<Encoder> (new DCPEncoder (shared_from_this(), tj)));
        JobManager::instance()->add (tj);
 }
 
@@ -1113,7 +1113,7 @@ Film::move_content_later (shared_ptr<Content> c)
 DCPTime
 Film::length () const
 {
-       return _playlist->length ();
+       return _playlist->length().ceil(video_frame_rate());
 }
 
 int
@@ -1456,7 +1456,7 @@ list<DCPTimePeriod>
 Film::reels () const
 {
        list<DCPTimePeriod> p;
-       DCPTime const len = length().ceil (video_frame_rate ());
+       DCPTime const len = length();
 
        switch (reel_type ()) {
        case REELTYPE_SINGLE: