X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=f57b6299dfd551cb99756ee4251fccf96747654c;hb=848d897596f00828cf1aa6c064d06e69bd40922c;hp=36221fb9a5ed39f5ed74130498ecce976ad10700;hpb=0f42e807a707249cd1a60fa6e476cb47a4147c5a;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 36221fb9a..f57b6299d 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -19,7 +19,7 @@
 */
 
 /** @file  src/film.cc
- *  @brief A representation of some audio and video content, and details of
+ *  @brief A representation of some audio, video and subtitle content, and details of
  *  how they should be presented in a DCP.
  */
 
@@ -27,6 +27,7 @@
 #include "job.h"
 #include "util.h"
 #include "job_manager.h"
+#include "dcp_encoder.h"
 #include "transcode_job.h"
 #include "upload_job.h"
 #include "null_log.h"
@@ -308,7 +309,7 @@ Film::make_dcp ()
 	}
 
 	if (name().empty()) {
-		throw MissingSettingError (_("name"));
+		set_name ("DCP");
 	}
 
 	BOOST_FOREACH (shared_ptr<const Content> i, content ()) {
@@ -341,7 +342,9 @@ Film::make_dcp ()
 	}
 	LOG_GENERAL ("J2K bandwidth %1", j2k_bandwidth());
 
-	JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this())));
+	shared_ptr<TranscodeJob> tj (new TranscodeJob (shared_from_this()));
+	tj->set_encoder (shared_ptr<Encoder> (new DCPEncoder (shared_from_this(), tj)));
+	JobManager::instance()->add (tj);
 }
 
 /** Start a job to send our DCP to the configured TMS */
@@ -511,7 +514,7 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 }
 
 /** Given a directory name, return its full path within the Film's directory.
- *  @param d directory name within the Filn's directory.
+ *  @param d directory name within the Film's directory.
  *  @param create true to create the directory (and its parents) if they do not exist.
  */
 boost::filesystem::path
@@ -666,7 +669,7 @@ Film::isdcf_name (bool if_created_now) const
 
 	/* XXX: this uses the first bit of content only */
 
-	/* The standard says we don't do this for trailers, for some strange reason */
+	/* Interior aspect ratio.  The standard says we don't do this for trailers, for some strange reason */
 	if (dcp_content_type() && dcp_content_type()->libdcp_kind() != dcp::TRAILER) {
 		Ratio const * content_ratio = 0;
 		BOOST_FOREACH (shared_ptr<Content> i, content ()) {
@@ -682,7 +685,8 @@ Film::isdcf_name (bool if_created_now) const
 		}
 
 		if (content_ratio && content_ratio != container()) {
-			d += "-" + content_ratio->isdcf_name();
+			/* This needs to be the numeric version of the ratio, and ::id() is close enough */
+			d += "-" + content_ratio->id();
 		}
 	}
 
@@ -1024,24 +1028,27 @@ Film::content () const
 	return _playlist->content ();
 }
 
+/** @param content Content to add.
+ *  @param disable_audio_analysis true to never do automatic audio analysis, even if it is enabled in configuration.
+ */
 void
-Film::examine_and_add_content (shared_ptr<Content> c)
+Film::examine_and_add_content (shared_ptr<Content> content, bool disable_audio_analysis)
 {
-	if (dynamic_pointer_cast<FFmpegContent> (c) && _directory) {
-		run_ffprobe (c->path(0), file ("ffprobe.log"), _log);
+	if (dynamic_pointer_cast<FFmpegContent> (content) && _directory) {
+		run_ffprobe (content->path(0), file ("ffprobe.log"), _log);
 	}
 
-	shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
+	shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), content));
 
 	_job_connections.push_back (
-		j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr<Job> (j), weak_ptr<Content> (c)))
+		j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr<Job>(j), weak_ptr<Content>(content), disable_audio_analysis))
 		);
 
 	JobManager::instance()->add (j);
 }
 
 void
-Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c)
+Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c, bool disable_audio_analysis)
 {
 	shared_ptr<Job> job = j.lock ();
 	if (!job || !job->finished_ok ()) {
@@ -1055,7 +1062,7 @@ Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c)
 
 	add_content (content);
 
-	if (Config::instance()->automatic_audio_analysis() && content->audio) {
+	if (Config::instance()->automatic_audio_analysis() && content->audio && !disable_audio_analysis) {
 		shared_ptr<Playlist> playlist (new Playlist);
 		playlist->add (content);
 		boost::signals2::connection c;
@@ -1080,7 +1087,7 @@ Film::add_content (shared_ptr<Content> c)
 		/* Take settings from the first piece of content of c's type in _template */
 		BOOST_FOREACH (shared_ptr<Content> i, _template_film->content()) {
 			if (typeid(i.get()) == typeid(c.get())) {
-				c->use_template (i);
+				c->take_settings_from (i);
 			}
 		}
 	}
@@ -1110,7 +1117,7 @@ Film::move_content_later (shared_ptr<Content> c)
 DCPTime
 Film::length () const
 {
-	return _playlist->length ();
+	return _playlist->length().ceil(video_frame_rate());
 }
 
 int
@@ -1453,7 +1460,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: