X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=c91a8047133dc0e14a1ff0cc47f0a946ada72e9e;hb=987a92d9906b306fb74ab65b578aa5bb510bea43;hp=e7f47c462c550c4bb8bc9fedb97cad1871bdd1ed;hpb=1f2bc4d8f3601ad1e12b94f37b3889fcd003509b;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index e7f47c462..13c1558e9 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,30 +29,28 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/date_time.hpp>
+#include <libxml++/libxml++.h>
+#include <libcxml/cxml.h>
 #include "film.h"
-#include "format.h"
 #include "job.h"
-#include "filter.h"
-#include "transcoder.h"
 #include "util.h"
 #include "job_manager.h"
-#include "ab_transcode_job.h"
 #include "transcode_job.h"
 #include "scp_dcp_job.h"
-#include "make_dcp_job.h"
 #include "log.h"
-#include "options.h"
 #include "exceptions.h"
 #include "examine_content_job.h"
 #include "scaler.h"
-#include "decoder_factory.h"
 #include "config.h"
-#include "check_hashes_job.h"
 #include "version.h"
 #include "ui_signaller.h"
-#include "video_decoder.h"
-#include "audio_decoder.h"
-#include "external_audio_decoder.h"
+#include "playlist.h"
+#include "player.h"
+#include "dcp_content_type.h"
+#include "ratio.h"
+#include "cross.h"
+
+#include "i18n.h"
 
 using std::string;
 using std::stringstream;
@@ -65,42 +63,47 @@ using std::ofstream;
 using std::setfill;
 using std::min;
 using std::make_pair;
+using std::endl;
 using std::cout;
+using std::list;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::lexical_cast;
+using boost::dynamic_pointer_cast;
 using boost::to_upper_copy;
 using boost::ends_with;
 using boost::starts_with;
 using boost::optional;
+using libdcp::Size;
 
-int const Film::state_version = 1;
+int const Film::state_version = 4;
 
-/** Construct a Film object in a given directory, reading any metadata
- *  file that exists in that directory.  An exception will be thrown if
- *  must_exist is true and the specified directory does not exist.
+/** Construct a Film object in a given directory.
  *
  *  @param d Film directory.
- *  @param must_exist true to throw an exception if does not exist.
  */
 
-Film::Film (string d, bool must_exist)
-	: _use_dci_name (true)
-	, _dcp_content_type (0)
-	, _format (0)
+Film::Film (string d)
+	: _playlist (new Playlist)
+	, _use_dci_name (true)
+	, _dcp_content_type (Config::instance()->default_dcp_content_type ())
+	, _container (Config::instance()->default_container ())
+	, _resolution (RESOLUTION_2K)
 	, _scaler (Scaler::from_id ("bicubic"))
-	, _dcp_trim_start (0)
-	, _dcp_trim_end (0)
-	, _dcp_ab (false)
-	, _use_content_audio (true)
-	, _audio_gain (0)
-	, _audio_delay (0)
-	, _still_duration (10)
 	, _with_subtitles (false)
-	, _subtitle_offset (0)
-	, _subtitle_scale (1)
-	, _frames_per_second (0)
+	, _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ())
+	, _dci_metadata (Config::instance()->default_dci_metadata ())
+	, _video_frame_rate (24)
+	, _audio_channels (MAX_AUDIO_CHANNELS)
+	, _three_d (false)
+	, _sequence_video (true)
 	, _dirty (false)
 {
+	set_dci_date_today ();
+
+	_playlist->Changed.connect (bind (&Film::playlist_changed, this));
+	_playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2));
+	
 	/* Make state.directory a complete path without ..s (where possible)
 	   (Code swiped from Adam Bowen on stackoverflow)
 	*/
@@ -120,213 +123,155 @@ Film::Film (string d, bool must_exist)
 	}
 
 	set_directory (result.string ());
-	
-	if (!boost::filesystem::exists (directory())) {
-		if (must_exist) {
-			throw OpenFileError (directory());
-		} else {
-			boost::filesystem::create_directory (directory());
-		}
-	}
+	_log.reset (new FileLog (file ("log")));
+
+	_playlist->set_sequence_video (_sequence_video);
+}
+
+string
+Film::video_identifier () const
+{
+	assert (container ());
+	LocaleGuard lg;
 
-	_external_audio_stream = ExternalAudioStream::create ();
+	stringstream s;
+	s << container()->id()
+	  << "_" << resolution_to_string (_resolution)
+	  << "_" << _playlist->video_identifier()
+	  << "_" << _video_frame_rate
+	  << "_" << scaler()->id()
+	  << "_" << j2k_bandwidth();
 
-	read_metadata ();
+	if (_three_d) {
+		s << "_3D";
+	}
 
-	_log = new FileLog (file ("log"));
-	set_dci_date_today ();
+	return s.str ();
 }
-
-Film::Film (Film const & o)
-	: _log (0)
-	, _directory         (o._directory)
-	, _name              (o._name)
-	, _use_dci_name      (o._use_dci_name)
-	, _content           (o._content)
-	, _dcp_content_type  (o._dcp_content_type)
-	, _format            (o._format)
-	, _crop              (o._crop)
-	, _filters           (o._filters)
-	, _scaler            (o._scaler)
-	, _dcp_trim_start    (o._dcp_trim_start)
-	, _dcp_trim_end      (o._dcp_trim_end)
-	, _dcp_ab            (o._dcp_ab)
-	, _content_audio_stream (o._content_audio_stream)
-	, _external_audio    (o._external_audio)
-	, _use_content_audio (o._use_content_audio)
-	, _audio_gain        (o._audio_gain)
-	, _audio_delay       (o._audio_delay)
-	, _still_duration    (o._still_duration)
-	, _subtitle_stream   (o._subtitle_stream)
-	, _with_subtitles    (o._with_subtitles)
-	, _subtitle_offset   (o._subtitle_offset)
-	, _subtitle_scale    (o._subtitle_scale)
-	, _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)
-	, _size              (o._size)
-	, _length            (o._length)
-	, _content_digest    (o._content_digest)
-	, _content_audio_streams (o._content_audio_streams)
-	, _external_audio_stream (o._external_audio_stream)
-	, _subtitle_streams  (o._subtitle_streams)
-	, _frames_per_second (o._frames_per_second)
-	, _dirty             (o._dirty)
+	  
+/** @return The path to the directory to write video frame info files to */
+string
+Film::info_dir () const
 {
+	boost::filesystem::path p;
+	p /= "info";
+	p /= video_identifier ();
+	return dir (p.string());
+}
 
+string
+Film::internal_video_mxf_dir () const
+{
+	return dir ("video");
 }
 
-Film::~Film ()
+string
+Film::internal_video_mxf_filename () const
 {
-	delete _log;
+	return video_identifier() + ".mxf";
 }
-	  
-/** @return The path to the directory to write JPEG2000 files to */
+
 string
-Film::j2k_dir () const
+Film::video_mxf_filename () const
 {
-	assert (format());
+	return filename_safe_name() + "_video.mxf";
+}
 
-	boost::filesystem::path p;
+string
+Film::audio_mxf_filename () const
+{
+	return filename_safe_name() + "_audio.mxf";
+}
 
-	/* Start with j2c */
-	p /= "j2c";
+string
+Film::filename_safe_name () const
+{
+	string const n = name ();
+	string o;
+	for (size_t i = 0; i < n.length(); ++i) {
+		if (isalnum (n[i])) {
+			o += n[i];
+		} else {
+			o += "_";
+		}
+	}
 
-	pair<string, string> f = Filter::ffmpeg_strings (filters());
+	return o;
+}
 
-	/* Write stuff to specify the filter / post-processing settings that are in use,
-	   so that we don't get confused about J2K files generated using different
-	   settings.
-	*/
-	stringstream s;
-	s << format()->id()
-	  << "_" << content_digest()
-	  << "_" << crop().left << "_" << crop().right << "_" << crop().top << "_" << crop().bottom
-	  << "_" << f.first << "_" << f.second
-	  << "_" << scaler()->id();
-
-	p /= s.str ();
-
-	/* Similarly for the A/B case */
-	if (dcp_ab()) {
-		stringstream s;
-		pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
-		s << "ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;
-		p /= s.str ();
-	}
-	
-	return dir (p.string());
+boost::filesystem::path
+Film::audio_analysis_path (shared_ptr<const AudioContent> c) const
+{
+	boost::filesystem::path p = dir ("analysis");
+	p /= c->digest();
+	return p;
 }
 
-/** Add suitable Jobs to the JobManager to create a DCP for this Film.
- *  @param true to transcode, false to use the WAV and J2K files that are already there.
- */
+/** Add suitable Jobs to the JobManager to create a DCP for this Film */
 void
-Film::make_dcp (bool transcode)
+Film::make_dcp ()
 {
 	set_dci_date_today ();
 	
 	if (dcp_name().find ("/") != string::npos) {
-		throw BadSettingError ("name", "cannot contain slashes");
+		throw BadSettingError (_("name"), _("cannot contain slashes"));
 	}
 	
-	log()->log (String::compose ("DVD-o-matic %1 git %2 using %3", dvdomatic_version, dvdomatic_git_commit, dependency_version_summary()));
+	log()->log (String::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary()));
 
 	{
 		char buffer[128];
 		gethostname (buffer, sizeof (buffer));
 		log()->log (String::compose ("Starting to make DCP on %1", buffer));
 	}
-		
-	if (format() == 0) {
-		throw MissingSettingError ("format");
-	}
-
-	if (content().empty ()) {
-		throw MissingSettingError ("content");
-	}
-
-	if (dcp_content_type() == 0) {
-		throw MissingSettingError ("content type");
-	}
 
-	if (name().empty()) {
-		throw MissingSettingError ("name");
+	ContentList cl = content ();
+	for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) {
+		log()->log (String::compose ("Content: %1", (*i)->technical_summary()));
 	}
-
-	shared_ptr<EncodeOptions> oe (new EncodeOptions (j2k_dir(), ".j2c", dir ("wavs")));
-	oe->out_size = format()->dcp_size ();
-	oe->padding = format()->dcp_padding (shared_from_this ());
-	if (dcp_length ()) {
-		oe->video_range = make_pair (dcp_trim_start(), dcp_trim_start() + dcp_length().get());
-		if (audio_stream()) {
-			oe->audio_range = make_pair (
-				video_frames_to_audio_frames (oe->video_range.get().first, audio_stream()->sample_rate(), frames_per_second()),
-				video_frames_to_audio_frames (oe->video_range.get().second, audio_stream()->sample_rate(), frames_per_second())
-				);
-		}
-			
+	log()->log (String::compose ("DCP video rate %1 fps", video_frame_rate()));
+	log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
+	log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
+#ifdef DCPOMATIC_DEBUG
+	log()->log ("DCP-o-matic built in debug mode.");
+#else
+	log()->log ("DCP-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
+	log()->log (String::compose ("CPU: %1, %2 processors", cpu_info(), boost::thread::hardware_concurrency ()));
+	list<pair<string, string> > const m = mount_info ();
+	for (list<pair<string, string> >::const_iterator i = m.begin(); i != m.end(); ++i) {
+		log()->log (String::compose ("Mount: %1 %2", i->first, i->second));
 	}
 	
-	oe->video_skip = dcp_frame_rate (frames_per_second()).skip;
-
-	shared_ptr<DecodeOptions> od (new DecodeOptions);
-	od->decode_subtitles = with_subtitles ();
-
-	shared_ptr<Job> r;
-
-	if (transcode) {
-		if (dcp_ab()) {
-			r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this(), od, oe, shared_ptr<Job> ())));
-		} else {
-			r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this(), od, oe, shared_ptr<Job> ())));
-		}
+	if (container() == 0) {
+		throw MissingSettingError (_("container"));
 	}
 
-	r = JobManager::instance()->add (shared_ptr<Job> (new CheckHashesJob (shared_from_this(), od, oe, r)));
-	JobManager::instance()->add (shared_ptr<Job> (new MakeDCPJob (shared_from_this(), oe, r)));
-}
-
-/** Start a job to examine our content file */
-void
-Film::examine_content ()
-{
-	if (_examine_content_job) {
-		return;
+	if (content().empty()) {
+		throw StringError (_("You must add some content to the DCP before creating it"));
 	}
 
-	_examine_content_job.reset (new ExamineContentJob (shared_from_this(), shared_ptr<Job> ()));
-	_examine_content_job->Finished.connect (bind (&Film::examine_content_finished, this));
-	JobManager::instance()->add (_examine_content_job);
-}
-
-void
-Film::examine_content_finished ()
-{
-	_examine_content_job.reset ();
-}
+	if (dcp_content_type() == 0) {
+		throw MissingSettingError (_("content type"));
+	}
 
-/** @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 ());
+	if (name().empty()) {
+		throw MissingSettingError (_("name"));
 	}
 
-	return f;
+	JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this())));
 }
 
 /** Start a job to send our DCP to the configured TMS */
 void
 Film::send_dcp_to_tms ()
 {
-	shared_ptr<Job> j (new SCPDCPJob (shared_from_this(), shared_ptr<Job> ()));
+	shared_ptr<Job> j (new SCPDCPJob (shared_from_this()));
 	JobManager::instance()->add (j);
 }
 
@@ -336,12 +281,12 @@ Film::send_dcp_to_tms ()
 int
 Film::encoded_frames () const
 {
-	if (format() == 0) {
+	if (container() == 0) {
 		return 0;
 	}
 
 	int N = 0;
-	for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (j2k_dir ()); i != boost::filesystem::directory_iterator(); ++i) {
+	for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (info_dir ()); i != boost::filesystem::directory_iterator(); ++i) {
 		++N;
 		boost::this_thread::interruption_point ();
 	}
@@ -353,79 +298,43 @@ Film::encoded_frames () const
 void
 Film::write_metadata () const
 {
+	if (!boost::filesystem::exists (directory())) {
+		boost::filesystem::create_directory (directory());
+	}
+	
 	boost::mutex::scoped_lock lm (_state_mutex);
+	LocaleGuard lg;
 
 	boost::filesystem::create_directories (directory());
 
-	string const m = file ("metadata");
-	ofstream f (m.c_str ());
-	if (!f.good ()) {
-		throw CreateFileError (m);
-	}
+	xmlpp::Document doc;
+	xmlpp::Element* root = doc.create_root_node ("Metadata");
 
-	f << "version " << state_version << "\n";
+	root->add_child("Version")->add_child_text (lexical_cast<string> (state_version));
+	root->add_child("Name")->add_child_text (_name);
+	root->add_child("UseDCIName")->add_child_text (_use_dci_name ? "1" : "0");
 
-	/* User stuff */
-	f << "name " << _name << "\n";
-	f << "use_dci_name " << _use_dci_name << "\n";
-	f << "content " << _content << "\n";
 	if (_dcp_content_type) {
-		f << "dcp_content_type " << _dcp_content_type->pretty_name () << "\n";
-	}
-	if (_format) {
-		f << "format " << _format->as_metadata () << "\n";
-	}
-	f << "left_crop " << _crop.left << "\n";
-	f << "right_crop " << _crop.right << "\n";
-	f << "top_crop " << _crop.top << "\n";
-	f << "bottom_crop " << _crop.bottom << "\n";
-	for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
-		f << "filter " << (*i)->id () << "\n";
-	}
-	f << "scaler " << _scaler->id () << "\n";
-	f << "dcp_trim_start " << _dcp_trim_start << "\n";
-	f << "dcp_trim_end " << _dcp_trim_end << "\n";
-	f << "dcp_ab " << (_dcp_ab ? "1" : "0") << "\n";
-	if (_content_audio_stream) {
-		f << "selected_content_audio_stream " << _content_audio_stream->to_string() << "\n";
-	}
-	for (vector<string>::const_iterator i = _external_audio.begin(); i != _external_audio.end(); ++i) {
-		f << "external_audio " << *i << "\n";
-	}
-	f << "use_content_audio " << (_use_content_audio ? "1" : "0") << "\n";
-	f << "audio_gain " << _audio_gain << "\n";
-	f << "audio_delay " << _audio_delay << "\n";
-	f << "still_duration " << _still_duration << "\n";
-	if (_subtitle_stream) {
-		f << "selected_subtitle_stream " << _subtitle_stream->to_string() << "\n";
+		root->add_child("DCPContentType")->add_child_text (_dcp_content_type->dci_name ());
 	}
-	f << "with_subtitles " << _with_subtitles << "\n";
-	f << "subtitle_offset " << _subtitle_offset << "\n";
-	f << "subtitle_scale " << _subtitle_scale << "\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";
-
-	f << "width " << _size.width << "\n";
-	f << "height " << _size.height << "\n";
-	f << "length " << _length.get_value_or(0) << "\n";
-	f << "content_digest " << _content_digest << "\n";
-
-	for (vector<shared_ptr<AudioStream> >::const_iterator i = _content_audio_streams.begin(); i != _content_audio_streams.end(); ++i) {
-		f << "content_audio_stream " << (*i)->to_string () << "\n";
-	}
-
-	f << "external_audio_stream " << _external_audio_stream->to_string() << "\n";
 
-	for (vector<shared_ptr<SubtitleStream> >::const_iterator i = _subtitle_streams.begin(); i != _subtitle_streams.end(); ++i) {
-		f << "subtitle_stream " << (*i)->to_string () << "\n";
+	if (_container) {
+		root->add_child("Container")->add_child_text (_container->id ());
 	}
 
-	f << "frames_per_second " << _frames_per_second << "\n";
+	root->add_child("Resolution")->add_child_text (resolution_to_string (_resolution));
+	root->add_child("Scaler")->add_child_text (_scaler->id ());
+	root->add_child("WithSubtitles")->add_child_text (_with_subtitles ? "1" : "0");
+	root->add_child("J2KBandwidth")->add_child_text (lexical_cast<string> (_j2k_bandwidth));
+	_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
+	root->add_child("VideoFrameRate")->add_child_text (lexical_cast<string> (_video_frame_rate));
+	root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date));
+	root->add_child("AudioChannels")->add_child_text (lexical_cast<string> (_audio_channels));
+	root->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
+	root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0");
+	_playlist->as_xml (root->add_child ("Playlist"));
+
+	doc.write_to_file_formatted (file ("metadata.xml"));
 	
 	_dirty = false;
 }
@@ -435,162 +344,47 @@ void
 Film::read_metadata ()
 {
 	boost::mutex::scoped_lock lm (_state_mutex);
+	LocaleGuard lg;
 
-	_external_audio.clear ();
-	_content_audio_streams.clear ();
-	_subtitle_streams.clear ();
-
-	boost::optional<int> version;
-
-	/* Backward compatibility things */
-	boost::optional<int> audio_sample_rate;
-	boost::optional<int> audio_stream_index;
-	boost::optional<int> subtitle_stream_index;
-	
-	ifstream f (file ("metadata").c_str());
-	multimap<string, string> kv = read_key_value (f);
-
-	/* We need version before anything else */
-	multimap<string, string>::iterator v = kv.find ("version");
-	if (v != kv.end ()) {
-		version = atoi (v->second.c_str());
+	if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) {
+		throw StringError (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version.  You will need to create a new Film, re-add your content and set it up again.  Sorry!"));
 	}
+
+	cxml::File f (file ("metadata.xml"), "Metadata");
 	
-	for (multimap<string, string>::const_iterator i = kv.begin(); i != kv.end(); ++i) {
-		string const k = i->first;
-		string const v = i->second;
+	_name = f.string_child ("Name");
+	_use_dci_name = f.bool_child ("UseDCIName");
 
-		if (k == "audio_sample_rate") {
-			audio_sample_rate = atoi (v.c_str());
+	{
+		optional<string> c = f.optional_string_child ("DCPContentType");
+		if (c) {
+			_dcp_content_type = DCPContentType::from_dci_name (c.get ());
 		}
+	}
 
-		/* User-specified stuff */
-		if (k == "name") {
-			_name = v;
-		} else if (k == "use_dci_name") {
-			_use_dci_name = (v == "1");
-		} else if (k == "content") {
-			_content = v;
-		} else if (k == "dcp_content_type") {
-			_dcp_content_type = DCPContentType::from_pretty_name (v);
-		} else if (k == "format") {
-			_format = Format::from_metadata (v);
-		} else if (k == "left_crop") {
-			_crop.left = atoi (v.c_str ());
-		} else if (k == "right_crop") {
-			_crop.right = atoi (v.c_str ());
-		} else if (k == "top_crop") {
-			_crop.top = atoi (v.c_str ());
-		} else if (k == "bottom_crop") {
-			_crop.bottom = atoi (v.c_str ());
-		} else if (k == "filter") {
-			_filters.push_back (Filter::from_id (v));
-		} else if (k == "scaler") {
-			_scaler = Scaler::from_id (v);
-		} else if (k == "dcp_trim_start") {
-			_dcp_trim_start = atoi (v.c_str ());
-		} else if (k == "dcp_trim_end") {
-			_dcp_trim_end = atoi (v.c_str ());
-		} else if (k == "dcp_ab") {
-			_dcp_ab = (v == "1");
-		} else if (k == "selected_content_audio_stream" || (!version && k == "selected_audio_stream")) {
-			if (!version) {
-				audio_stream_index = atoi (v.c_str ());
-			} else {
-				_content_audio_stream = audio_stream_factory (v, version);
-			}
-		} else if (k == "external_audio") {
-			_external_audio.push_back (v);
-		} else if (k == "use_content_audio") {
-			_use_content_audio = (v == "1");
-		} else if (k == "audio_gain") {
-			_audio_gain = atof (v.c_str ());
-		} else if (k == "audio_delay") {
-			_audio_delay = atoi (v.c_str ());
-		} else if (k == "still_duration") {
-			_still_duration = atoi (v.c_str ());
-		} else if (k == "selected_subtitle_stream") {
-			if (!version) {
-				subtitle_stream_index = atoi (v.c_str ());
-			} else {
-				_subtitle_stream = subtitle_stream_factory (v, version);
-			}
-		} else if (k == "with_subtitles") {
-			_with_subtitles = (v == "1");
-		} else if (k == "subtitle_offset") {
-			_subtitle_offset = atoi (v.c_str ());
-		} else if (k == "subtitle_scale") {
-			_subtitle_scale = atof (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;
-		}
-		
-		/* Cached stuff */
-		if (k == "width") {
-			_size.width = atoi (v.c_str ());
-		} else if (k == "height") {
-			_size.height = atoi (v.c_str ());
-		} else if (k == "length") {
-			int const vv = atoi (v.c_str ());
-			if (vv) {
-				_length = vv;
-			}
-		} else if (k == "content_digest") {
-			_content_digest = v;
-		} else if (k == "content_audio_stream" || (!version && k == "audio_stream")) {
-			_content_audio_streams.push_back (audio_stream_factory (v, version));
-		} else if (k == "external_audio_stream") {
-			_external_audio_stream = audio_stream_factory (v, version);
-		} else if (k == "subtitle_stream") {
-			_subtitle_streams.push_back (subtitle_stream_factory (v, version));
-		} else if (k == "frames_per_second") {
-			_frames_per_second = atof (v.c_str ());
+	{
+		optional<string> c = f.optional_string_child ("Container");
+		if (c) {
+			_container = Ratio::from_id (c.get ());
 		}
 	}
 
-	if (!version) {
-		if (audio_sample_rate) {
-			/* version < 1 didn't specify sample rate in the audio streams, so fill it in here */
-			for (vector<shared_ptr<AudioStream> >::iterator i = _content_audio_streams.begin(); i != _content_audio_streams.end(); ++i) {
-				(*i)->set_sample_rate (audio_sample_rate.get());
-			}
-		}
+	_resolution = string_to_resolution (f.string_child ("Resolution"));
+	_scaler = Scaler::from_id (f.string_child ("Scaler"));
+	_with_subtitles = f.bool_child ("WithSubtitles");
+	_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
+	_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
+	_video_frame_rate = f.number_child<int> ("VideoFrameRate");
+	_dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
+	_audio_channels = f.number_child<int> ("AudioChannels");
+	_sequence_video = f.bool_child ("SequenceVideo");
+	_three_d = f.bool_child ("ThreeD");
 
-		/* also the selected stream was specified as an index */
-		if (audio_stream_index && audio_stream_index.get() >= 0 && audio_stream_index.get() < (int) _content_audio_streams.size()) {
-			_content_audio_stream = _content_audio_streams[audio_stream_index.get()];
-		}
+	_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"));
 
-		/* similarly the subtitle */
-		if (subtitle_stream_index && subtitle_stream_index.get() >= 0 && subtitle_stream_index.get() < (int) _subtitle_streams.size()) {
-			_subtitle_stream = _subtitle_streams[subtitle_stream_index.get()];
-		}
-	}
-		
 	_dirty = false;
 }
 
-Size
-Film::cropped_size (Size s) const
-{
-	boost::mutex::scoped_lock lm (_state_mutex);
-	s.width -= _crop.left + _crop.right;
-	s.height -= _crop.top + _crop.bottom;
-	return s;
-}
-
 /** Given a directory name, return its full path within the Film's directory.
  *  The directory (and its parents) will be created if they do not exist.
  */
@@ -598,91 +392,37 @@ string
 Film::dir (string d) const
 {
 	boost::mutex::scoped_lock lm (_directory_mutex);
+	
 	boost::filesystem::path p;
 	p /= _directory;
 	p /= d;
+	
 	boost::filesystem::create_directories (p);
+	
 	return p.string ();
 }
 
 /** Given a file or directory name, return its full path within the Film's directory.
  *  _directory_mutex must not be locked on entry.
+ *  Any required parent directories will be created.
  */
 string
 Film::file (string f) const
 {
 	boost::mutex::scoped_lock lm (_directory_mutex);
+
 	boost::filesystem::path p;
 	p /= _directory;
 	p /= f;
-	return p.string ();
-}
-
-/** @return full path of the content (actual video) file
- *  of the Film.
- */
-string
-Film::content_path () const
-{
-	boost::mutex::scoped_lock lm (_state_mutex);
-	if (boost::filesystem::path(_content).has_root_directory ()) {
-		return _content;
-	}
 
-	return file (_content);
-}
-
-ContentType
-Film::content_type () const
-{
-	if (boost::filesystem::is_directory (_content)) {
-		/* Directory of images, we assume */
-		return VIDEO;
-	}
-
-	if (still_image_file (_content)) {
-		return STILL;
-	}
-
-	return VIDEO;
-}
-
-/** @return The sampling rate that we will resample the audio to */
-int
-Film::target_audio_sample_rate () const
-{
-	if (!audio_stream()) {
-		return 0;
-	}
+	boost::filesystem::create_directories (p.parent_path ());
 	
-	/* Resample to a DCI-approved sample rate */
-	double t = dcp_audio_sample_rate (audio_stream()->sample_rate());
-
-	DCPFrameRate dfr = dcp_frame_rate (frames_per_second ());
-
-	/* Compensate for the fact that video will be rounded to the
-	   nearest integer number of frames per second.
-	*/
-	if (dfr.run_fast) {
-		t *= _frames_per_second * dfr.skip / dfr.frames_per_second;
-	}
-
-	return rint (t);
-}
-
-boost::optional<SourceFrame>
-Film::dcp_length () const
-{
-	if (!length()) {
-		return boost::optional<SourceFrame> ();
-	}
-
-	return length().get() - dcp_trim_start() - dcp_trim_end();
+	return p.string ();
 }
 
 /** @return a DCI-compliant name for a DCP of this film */
 string
-Film::dci_name () const
+Film::dci_name (bool if_created_now) const
 {
 	stringstream d;
 
@@ -698,64 +438,81 @@ Film::dci_name () const
 		fixed_name = fixed_name.substr (0, 14);
 	}
 
-	d << fixed_name << "_";
+	d << fixed_name;
 
 	if (dcp_content_type()) {
-		d << dcp_content_type()->dci_name() << "_";
+		d << "_" << dcp_content_type()->dci_name();
+	}
+
+	if (three_d ()) {
+		d << "-3D";
 	}
 
-	if (format()) {
-		d << format()->dci_name() << "_";
+	if (video_frame_rate() != 24) {
+		d << "-" << video_frame_rate();
 	}
 
-	if (!audio_language().empty ()) {
-		d << audio_language();
-		if (!subtitle_language().empty() && with_subtitles()) {
-			d << "-" << subtitle_language();
+	if (container()) {
+		d << "_" << container()->dci_name();
+	}
+
+	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";
 		}
-			
-		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 << "_";
 	}
 
-	switch (audio_channels()) {
+	switch (audio_channels ()) {
 	case 1:
-		d << "10_";
+		d << "_10";
 		break;
 	case 2:
-		d << "20_";
+		d << "_20";
 		break;
-	case 6:
-		d << "51_";
+	case 3:
+		d << "_30";
+		break;
+	case 4:
+		d << "_40";
 		break;
-	case 8:
-		d << "71_";
+	case 5:
+		d << "_50";
+		break;
+	case 6:
+		d << "_51";
 		break;
 	}
 
-	d << "2K_";
+	d << "_" << resolution_to_string (_resolution);
 
-	if (!studio().empty ()) {
-		d << studio() << "_";
+	if (!dm.studio.empty ()) {
+		d << "_" << dm.studio;
 	}
 
-	d << boost::gregorian::to_iso_string (_dci_date) << "_";
+	if (if_created_now) {
+		d << "_" << boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ());
+	} else {
+		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 ();
@@ -763,10 +520,10 @@ Film::dci_name () const
 
 /** @return name to give the DCP */
 string
-Film::dcp_name () const
+Film::dcp_name (bool if_created_now) const
 {
 	if (use_dci_name()) {
-		return dci_name ();
+		return dci_name (if_created_now);
 	}
 
 	return name();
@@ -801,88 +558,6 @@ Film::set_use_dci_name (bool u)
 	signal_changed (USE_DCI_NAME);
 }
 
-void
-Film::set_content (string c)
-{
-	string check = directory ();
-
-#if BOOST_FILESYSTEM_VERSION == 3
-	boost::filesystem::path slash ("/");
-	string platform_slash = slash.make_preferred().string ();
-#else
-#ifdef DVDOMATIC_WINDOWS
-	string platform_slash = "\\";
-#else
-	string platform_slash = "/";
-#endif
-#endif	
-
-	if (!ends_with (check, platform_slash)) {
-		check += platform_slash;
-	}
-	
-	if (boost::filesystem::path(c).has_root_directory () && starts_with (c, check)) {
-		c = c.substr (_directory.length() + 1);
-	}
-
-	string old_content;
-	
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		if (c == _content) {
-			return;
-		}
-
-		old_content = _content;
-		_content = c;
-	}
-
-	/* Reset streams here in case the new content doesn't have one or the other */
-	_content_audio_stream = shared_ptr<AudioStream> ();
-	_subtitle_stream = shared_ptr<SubtitleStream> ();
-
-	/* Create a temporary decoder so that we can get information
-	   about the content.
-	*/
-
-	try {
-		shared_ptr<DecodeOptions> o (new DecodeOptions);
-		Decoders d = decoder_factory (shared_from_this(), o, 0);
-		
-		set_size (d.video->native_size ());
-		set_frames_per_second (d.video->frames_per_second ());
-		set_subtitle_streams (d.video->subtitle_streams ());
-		set_content_audio_streams (d.audio->audio_streams ());
-
-		/* Start off with the first audio and subtitle streams */
-		if (!d.audio->audio_streams().empty()) {
-			set_content_audio_stream (d.audio->audio_streams().front());
-		}
-		
-		if (!d.video->subtitle_streams().empty()) {
-			set_subtitle_stream (d.video->subtitle_streams().front());
-		}
-		
-		{
-			boost::mutex::scoped_lock lm (_state_mutex);
-			_content = c;
-		}
-		
-		signal_changed (CONTENT);
-		
-		set_content_digest (md5_digest (content_path ()));
-		
-		examine_content ();
-
-	} catch (...) {
-
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_content = old_content;
-		throw;
-
-	}
-}
-	       
 void
 Film::set_dcp_content_type (DCPContentType const * t)
 {
@@ -894,416 +569,344 @@ Film::set_dcp_content_type (DCPContentType const * t)
 }
 
 void
-Film::set_format (Format const * f)
+Film::set_container (Ratio const * c)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_format = f;
+		_container = c;
 	}
-	signal_changed (FORMAT);
+	signal_changed (CONTAINER);
 }
 
 void
-Film::set_crop (Crop c)
+Film::set_resolution (Resolution r)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_crop = c;
+		_resolution = r;
 	}
-	signal_changed (CROP);
+	signal_changed (RESOLUTION);
 }
 
 void
-Film::set_left_crop (int c)
+Film::set_scaler (Scaler const * s)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		
-		if (_crop.left == c) {
-			return;
-		}
-		
-		_crop.left = c;
+		_scaler = s;
 	}
-	signal_changed (CROP);
+	signal_changed (SCALER);
 }
 
 void
-Film::set_right_crop (int c)
+Film::set_with_subtitles (bool w)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		if (_crop.right == c) {
-			return;
-		}
-		
-		_crop.right = c;
+		_with_subtitles = w;
 	}
-	signal_changed (CROP);
+	signal_changed (WITH_SUBTITLES);
 }
 
 void
-Film::set_top_crop (int c)
+Film::set_j2k_bandwidth (int b)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		if (_crop.top == c) {
-			return;
-		}
-		
-		_crop.top = c;
+		_j2k_bandwidth = b;
 	}
-	signal_changed (CROP);
+	signal_changed (J2K_BANDWIDTH);
 }
 
 void
-Film::set_bottom_crop (int c)
+Film::set_dci_metadata (DCIMetadata m)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		if (_crop.bottom == c) {
-			return;
-		}
-		
-		_crop.bottom = c;
+		_dci_metadata = m;
 	}
-	signal_changed (CROP);
+	signal_changed (DCI_METADATA);
 }
 
 void
-Film::set_filters (vector<Filter const *> f)
+Film::set_video_frame_rate (int f)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_filters = f;
+		_video_frame_rate = f;
 	}
-	signal_changed (FILTERS);
+	signal_changed (VIDEO_FRAME_RATE);
 }
 
 void
-Film::set_scaler (Scaler const * s)
+Film::set_audio_channels (int c)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_scaler = s;
+		_audio_channels = c;
 	}
-	signal_changed (SCALER);
+	signal_changed (AUDIO_CHANNELS);
 }
 
 void
-Film::set_dcp_trim_start (int t)
+Film::set_three_d (bool t)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_trim_start = t;
+		_three_d = t;
 	}
-	signal_changed (DCP_TRIM_START);
+	signal_changed (THREE_D);
 }
 
 void
-Film::set_dcp_trim_end (int t)
+Film::signal_changed (Property p)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_trim_end = t;
+		_dirty = true;
 	}
-	signal_changed (DCP_TRIM_END);
-}
 
-void
-Film::set_dcp_ab (bool a)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_ab = a;
+	switch (p) {
+	case Film::CONTENT:
+		set_video_frame_rate (_playlist->best_dcp_frame_rate ());
+		break;
+	case Film::VIDEO_FRAME_RATE:
+	case Film::SEQUENCE_VIDEO:
+		_playlist->maybe_sequence_video ();
+		break;
+	default:
+		break;
+	}
+
+	if (ui_signaller) {
+		ui_signaller->emit (boost::bind (boost::ref (Changed), p));
 	}
-	signal_changed (DCP_AB);
 }
 
 void
-Film::set_content_audio_stream (shared_ptr<AudioStream> s)
+Film::set_dci_date_today ()
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_content_audio_stream = s;
-	}
-	signal_changed (CONTENT_AUDIO_STREAM);
+	_dci_date = boost::gregorian::day_clock::local_day ();
 }
 
-void
-Film::set_external_audio (vector<string> a)
+string
+Film::info_path (int f, Eyes e) const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_external_audio = a;
-	}
+	boost::filesystem::path p;
+	p /= info_dir ();
+
+	stringstream s;
+	s.width (8);
+	s << setfill('0') << f;
 
-	shared_ptr<DecodeOptions> o (new DecodeOptions);
-	shared_ptr<ExternalAudioDecoder> decoder (new ExternalAudioDecoder (shared_from_this(), o, 0));
-	if (decoder->audio_stream()) {
-		_external_audio_stream = decoder->audio_stream ();
+	if (e == EYES_LEFT) {
+		s << ".L";
+	} else if (e == EYES_RIGHT) {
+		s << ".R";
 	}
+
+	s << ".md5";
 	
-	signal_changed (EXTERNAL_AUDIO);
+	p /= s.str();
+
+	/* info_dir() will already have added any initial bit of the path,
+	   so don't call file() on this.
+	*/
+	return p.string ();
 }
 
-void
-Film::set_use_content_audio (bool e)
+string
+Film::j2c_path (int f, Eyes e, bool t) const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_use_content_audio = e;
-	}
+	boost::filesystem::path p;
+	p /= "j2c";
+	p /= video_identifier ();
 
-	signal_changed (USE_CONTENT_AUDIO);
-}
+	stringstream s;
+	s.width (8);
+	s << setfill('0') << f;
 
-void
-Film::set_audio_gain (float g)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_audio_gain = g;
+	if (e == EYES_LEFT) {
+		s << ".L";
+	} else if (e == EYES_RIGHT) {
+		s << ".R";
 	}
-	signal_changed (AUDIO_GAIN);
-}
+	
+	s << ".j2c";
 
-void
-Film::set_audio_delay (int d)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_audio_delay = d;
+	if (t) {
+		s << ".tmp";
 	}
-	signal_changed (AUDIO_DELAY);
-}
 
-void
-Film::set_still_duration (int d)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_still_duration = d;
-	}
-	signal_changed (STILL_DURATION);
+	p /= s.str();
+	return file (p.string ());
 }
 
-void
-Film::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_subtitle_stream = s;
-	}
-	signal_changed (SUBTITLE_STREAM);
-}
+/** Make an educated guess as to whether we have a complete DCP
+ *  or not.
+ *  @return true if we do.
+ */
 
-void
-Film::set_with_subtitles (bool w)
+bool
+Film::have_dcp () const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_with_subtitles = w;
+	try {
+		libdcp::DCP dcp (dir (dcp_name()));
+		dcp.read ();
+	} catch (...) {
+		return false;
 	}
-	signal_changed (WITH_SUBTITLES);
+
+	return true;
 }
 
-void
-Film::set_subtitle_offset (int o)
+shared_ptr<Player>
+Film::make_player () const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_subtitle_offset = o;
-	}
-	signal_changed (SUBTITLE_OFFSET);
+	return shared_ptr<Player> (new Player (shared_from_this (), _playlist));
 }
 
-void
-Film::set_subtitle_scale (float s)
+shared_ptr<Playlist>
+Film::playlist () const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_subtitle_scale = s;
-	}
-	signal_changed (SUBTITLE_SCALE);
+	boost::mutex::scoped_lock lm (_state_mutex);
+	return _playlist;
 }
 
-void
-Film::set_audio_language (string l)
+ContentList
+Film::content () const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_audio_language = l;
-	}
-	signal_changed (DCI_METADATA);
+	return _playlist->content ();
 }
 
 void
-Film::set_subtitle_language (string l)
+Film::examine_and_add_content (shared_ptr<Content> c)
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_subtitle_language = l;
-	}
-	signal_changed (DCI_METADATA);
+	shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
+	j->Finished.connect (bind (&Film::maybe_add_content, this, boost::weak_ptr<Job> (j), boost::weak_ptr<Content> (c)));
+	JobManager::instance()->add (j);
 }
 
 void
-Film::set_territory (string t)
+Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c)
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_territory = t;
+	shared_ptr<Job> job = j.lock ();
+	if (!job || !job->finished_ok ()) {
+		return;
+	}
+	
+	shared_ptr<Content> content = c.lock ();
+	if (content) {
+		add_content (content);
 	}
-	signal_changed (DCI_METADATA);
 }
 
 void
-Film::set_rating (string r)
+Film::add_content (shared_ptr<Content> c)
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_rating = r;
+	/* Add video content after any existing content */
+	if (dynamic_pointer_cast<VideoContent> (c)) {
+		c->set_start (_playlist->video_end ());
 	}
-	signal_changed (DCI_METADATA);
+
+	_playlist->add (c);
 }
 
 void
-Film::set_studio (string s)
+Film::remove_content (shared_ptr<Content> c)
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_studio = s;
-	}
-	signal_changed (DCI_METADATA);
+	_playlist->remove (c);
 }
 
-void
-Film::set_facility (string f)
+Time
+Film::length () const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_facility = f;
-	}
-	signal_changed (DCI_METADATA);
+	return _playlist->length ();
 }
 
-void
-Film::set_package_type (string p)
+bool
+Film::has_subtitles () const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_package_type = p;
-	}
-	signal_changed (DCI_METADATA);
+	return _playlist->has_subtitles ();
 }
 
-void
-Film::set_size (Size s)
+OutputVideoFrame
+Film::best_video_frame_rate () const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_size = s;
-	}
-	signal_changed (SIZE);
+	return _playlist->best_dcp_frame_rate ();
 }
 
 void
-Film::set_length (SourceFrame l)
+Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_length = l;
+	if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
+		set_video_frame_rate (_playlist->best_dcp_frame_rate ());
+	} 
+
+	if (ui_signaller) {
+		ui_signaller->emit (boost::bind (boost::ref (ContentChanged), c, p));
 	}
-	signal_changed (LENGTH);
 }
 
 void
-Film::unset_length ()
+Film::playlist_changed ()
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_length = boost::none;
-	}
-	signal_changed (LENGTH);
+	signal_changed (CONTENT);
 }	
 
-void
-Film::set_content_digest (string d)
+OutputAudioFrame
+Film::time_to_audio_frames (Time t) const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_content_digest = d;
-	}
-	_dirty = true;
+	return t * audio_frame_rate () / TIME_HZ;
 }
 
-void
-Film::set_content_audio_streams (vector<shared_ptr<AudioStream> > s)
+OutputVideoFrame
+Film::time_to_video_frames (Time t) const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_content_audio_streams = s;
-	}
-	signal_changed (CONTENT_AUDIO_STREAMS);
+	return t * video_frame_rate () / TIME_HZ;
 }
 
-void
-Film::set_subtitle_streams (vector<shared_ptr<SubtitleStream> > s)
+Time
+Film::audio_frames_to_time (OutputAudioFrame f) const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_subtitle_streams = s;
-	}
-	signal_changed (SUBTITLE_STREAMS);
+	return f * TIME_HZ / audio_frame_rate ();
 }
 
-void
-Film::set_frames_per_second (float f)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_frames_per_second = f;
-	}
-	signal_changed (FRAMES_PER_SECOND);
-}
-	
-void
-Film::signal_changed (Property p)
+Time
+Film::video_frames_to_time (OutputVideoFrame f) const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_dirty = true;
-	}
-
-	if (ui_signaller) {
-		ui_signaller->emit (boost::bind (boost::ref (Changed), p));
-	}
+	return f * TIME_HZ / video_frame_rate ();
 }
 
-int
-Film::audio_channels () const
+OutputAudioFrame
+Film::audio_frame_rate () const
 {
-	shared_ptr<AudioStream> s = audio_stream ();
-	if (!s) {
-		return 0;
-	}
-
-	return s->channels ();
+	/* XXX */
+	return 48000;
 }
 
 void
-Film::set_dci_date_today ()
+Film::set_sequence_video (bool s)
 {
-	_dci_date = boost::gregorian::day_clock::local_day ();
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_sequence_video = s;
+		_playlist->set_sequence_video (s);
+	}
+	
+	signal_changed (SEQUENCE_VIDEO);
 }
 
-boost::shared_ptr<AudioStream>
-Film::audio_stream () const
+libdcp::Size
+Film::full_frame () const
 {
-	if (use_content_audio()) {
-		return _content_audio_stream;
+	switch (_resolution) {
+	case RESOLUTION_2K:
+		return libdcp::Size (2048, 1080);
+	case RESOLUTION_4K:
+		return libdcp::Size (4096, 2160);
 	}
 
-	return _external_audio_stream;
+	assert (false);
+	return libdcp::Size ();
 }