X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=f5522b74a1add591d2829cc2e00b4c0e5176d09a;hb=7101dd05ddcde66600bded064e28b491d79e3ebc;hp=9fd8c7400b3f987344927812379ddc5c4ae2a9e2;hpb=36cc9db860a33418cde77949503ad0a734ddc0fa;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 9fd8c7400..f5522b74a 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -101,6 +101,7 @@ Film::Film (string d, bool must_exist)
 	, _subtitle_scale (1)
 	, _colour_lut (0)
 	, _j2k_bandwidth (200000000)
+	, _dci_metadata (Config::instance()->default_dci_metadata ())
 	, _frames_per_second (0)
 	, _dirty (false)
 {
@@ -157,7 +158,6 @@ Film::Film (Film const & o)
 	, _scaler            (o._scaler)
 	, _dcp_trim_start    (o._dcp_trim_start)
 	, _dcp_trim_end      (o._dcp_trim_end)
-	, _reel_size         (o._reel_size)
 	, _dcp_ab            (o._dcp_ab)
 	, _content_audio_stream (o._content_audio_stream)
 	, _external_audio    (o._external_audio)
@@ -171,13 +171,7 @@ Film::Film (Film const & o)
 	, _subtitle_scale    (o._subtitle_scale)
 	, _colour_lut        (o._colour_lut)
 	, _j2k_bandwidth     (o._j2k_bandwidth)
-	, _audio_language    (o._audio_language)
-	, _subtitle_language (o._subtitle_language)
-	, _territory         (o._territory)
-	, _rating            (o._rating)
-	, _studio            (o._studio)
-	, _facility          (o._facility)
-	, _package_type      (o._package_type)
+	, _dci_metadata      (o._dci_metadata)
 	, _size              (o._size)
 	, _length            (o._length)
 	, _content_digest    (o._content_digest)
@@ -252,13 +246,26 @@ Film::make_dcp (bool transcode)
 		char buffer[128];
 		gethostname (buffer, sizeof (buffer));
 		log()->log (String::compose ("Starting to make DCP on %1", buffer));
-		log()->log (String::compose ("Content is %1; type %2", content_path(), (content_type() == STILL ? "still" : "video")));
-		log()->log (String::compose ("Content length %1", length().get()));
-		log()->log (String::compose ("Content digest %1", content_digest()));
-		log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
-		log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
 	}
-		
+	
+	log()->log (String::compose ("Content is %1; type %2", content_path(), (content_type() == STILL ? "still" : "video")));
+	log()->log (String::compose ("Content length %1", length().get()));
+	log()->log (String::compose ("Content digest %1", content_digest()));
+	log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
+	log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
+#ifdef DVDOMATIC_DEBUG
+	log()->log ("DVD-o-matic built in debug mode.");
+#else
+	log()->log ("DVD-o-matic built in optimised mode.");
+#endif
+#ifdef LIBDCP_DEBUG
+	log()->log ("libdcp built in debug mode.");
+#else
+	log()->log ("libdcp built in optimised mode.");
+#endif
+	pair<string, int> const c = cpu_info ();
+	log()->log (String::compose ("CPU: %1, %2 processors", c.first, c.second));
+	
 	if (format() == 0) {
 		throw MissingSettingError ("format");
 	}
@@ -337,18 +344,6 @@ Film::examine_content_finished ()
 	_examine_content_job.reset ();
 }
 
-/** @return full paths to any audio files that this Film has */
-vector<string>
-Film::audio_files () const
-{
-	vector<string> f;
-	for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (dir("wavs")); i != boost::filesystem::directory_iterator(); ++i) {
-		f.push_back (i->path().string ());
-	}
-
-	return f;
-}
-
 /** Start a job to send our DCP to the configured TMS */
 void
 Film::send_dcp_to_tms ()
@@ -413,9 +408,6 @@ Film::write_metadata () const
 	f << "scaler " << _scaler->id () << "\n";
 	f << "dcp_trim_start " << _dcp_trim_start << "\n";
 	f << "dcp_trim_end " << _dcp_trim_end << "\n";
-	if (_reel_size) {
-		f << "reel_size " << _reel_size.get() << "\n";
-	}
 	f << "dcp_ab " << (_dcp_ab ? "1" : "0") << "\n";
 	if (_content_audio_stream) {
 		f << "selected_content_audio_stream " << _content_audio_stream->to_string() << "\n";
@@ -435,14 +427,7 @@ Film::write_metadata () const
 	f << "subtitle_scale " << _subtitle_scale << "\n";
 	f << "colour_lut " << _colour_lut << "\n";
 	f << "j2k_bandwidth " << _j2k_bandwidth << "\n";
-	f << "audio_language " << _audio_language << "\n";
-	f << "subtitle_language " << _subtitle_language << "\n";
-	f << "territory " << _territory << "\n";
-	f << "rating " << _rating << "\n";
-	f << "studio " << _studio << "\n";
-	f << "facility " << _facility << "\n";
-	f << "package_type " << _package_type << "\n";
-
+	_dci_metadata.write (f);
 	f << "width " << _size.width << "\n";
 	f << "height " << _size.height << "\n";
 	f << "length " << _length.get_value_or(0) << "\n";
@@ -530,8 +515,6 @@ Film::read_metadata ()
 			_dcp_trim_start = atoi (v.c_str ());
 		} else if (k == "dcp_trim_end") {
 			_dcp_trim_end = atoi (v.c_str ());
-		} else if (k == "reel_size") {
-			_reel_size = boost::lexical_cast<uint64_t> (v);
 		} else if (k == "dcp_ab") {
 			_dcp_ab = (v == "1");
 		} else if (k == "selected_content_audio_stream" || (!version && k == "selected_audio_stream")) {
@@ -566,21 +549,9 @@ Film::read_metadata ()
 			_colour_lut = atoi (v.c_str ());
 		} else if (k == "j2k_bandwidth") {
 			_j2k_bandwidth = atoi (v.c_str ());
-		} else if (k == "audio_language") {
-			_audio_language = v;
-		} else if (k == "subtitle_language") {
-			_subtitle_language = v;
-		} else if (k == "territory") {
-			_territory = v;
-		} else if (k == "rating") {
-			_rating = v;
-		} else if (k == "studio") {
-			_studio = v;
-		} else if (k == "facility") {
-			_facility = v;
-		} else if (k == "package_type") {
-			_package_type = v;
 		}
+
+		_dci_metadata.read (k, v);
 		
 		/* Cached stuff */
 		if (k == "width") {
@@ -627,8 +598,8 @@ Film::read_metadata ()
 	_dirty = false;
 }
 
-Size
-Film::cropped_size (Size s) const
+libdcp::Size
+Film::cropped_size (libdcp::Size s) const
 {
 	boost::mutex::scoped_lock lm (_state_mutex);
 	s.width -= _crop.left + _crop.right;
@@ -757,10 +728,12 @@ Film::dci_name () const
 		d << format()->dci_name() << "_";
 	}
 
-	if (!audio_language().empty ()) {
-		d << audio_language();
-		if (!subtitle_language().empty() && with_subtitles()) {
-			d << "-" << subtitle_language();
+	DCIMetadata const dm = dci_metadata ();
+
+	if (!dm.audio_language.empty ()) {
+		d << dm.audio_language;
+		if (!dm.subtitle_language.empty() && with_subtitles()) {
+			d << "-" << dm.subtitle_language;
 		} else {
 			d << "-XX";
 		}
@@ -768,10 +741,10 @@ Film::dci_name () const
 		d << "_";
 	}
 
-	if (!territory().empty ()) {
-		d << territory();
-		if (!rating().empty ()) {
-			d << "-" << rating();
+	if (!dm.territory.empty ()) {
+		d << dm.territory;
+		if (!dm.rating.empty ()) {
+			d << "-" << dm.rating;
 		}
 		d << "_";
 	}
@@ -793,18 +766,18 @@ Film::dci_name () const
 
 	d << "2K_";
 
-	if (!studio().empty ()) {
-		d << studio() << "_";
+	if (!dm.studio.empty ()) {
+		d << dm.studio << "_";
 	}
 
 	d << boost::gregorian::to_iso_string (_dci_date) << "_";
 
-	if (!facility().empty ()) {
-		d << facility() << "_";
+	if (!dm.facility.empty ()) {
+		d << dm.facility << "_";
 	}
 
-	if (!package_type().empty ()) {
-		d << package_type();
+	if (!dm.package_type.empty ()) {
+		d << dm.package_type;
 	}
 
 	return d.str ();
@@ -1093,26 +1066,6 @@ Film::set_dcp_trim_end (int t)
 	signal_changed (DCP_TRIM_END);
 }
 
-void
-Film::set_reel_size (uint64_t s)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_reel_size = s;
-	}
-	signal_changed (REEL_SIZE);
-}
-
-void
-Film::unset_reel_size ()
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_reel_size = boost::optional<uint64_t> ();
-	}
-	signal_changed (REEL_SIZE);
-}
-
 void
 Film::set_dcp_ab (bool a)
 {
@@ -1252,77 +1205,17 @@ Film::set_j2k_bandwidth (int b)
 }
 
 void
-Film::set_audio_language (string l)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_audio_language = l;
-	}
-	signal_changed (DCI_METADATA);
-}
-
-void
-Film::set_subtitle_language (string l)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_subtitle_language = l;
-	}
-	signal_changed (DCI_METADATA);
-}
-
-void
-Film::set_territory (string t)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_territory = t;
-	}
-	signal_changed (DCI_METADATA);
-}
-
-void
-Film::set_rating (string r)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_rating = r;
-	}
-	signal_changed (DCI_METADATA);
-}
-
-void
-Film::set_studio (string s)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_studio = s;
-	}
-	signal_changed (DCI_METADATA);
-}
-
-void
-Film::set_facility (string f)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_facility = f;
-	}
-	signal_changed (DCI_METADATA);
-}
-
-void
-Film::set_package_type (string p)
+Film::set_dci_metadata (DCIMetadata m)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_package_type = p;
+		_dci_metadata = m;
 	}
 	signal_changed (DCI_METADATA);
 }
 
 void
-Film::set_size (Size s)
+Film::set_size (libdcp::Size s)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);