X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=3f92100802ade784a839bef4a790a939fa547a2b;hb=a605b22381ee47d2737307e0b61e3423b020547b;hp=fd8b90d9972c202ad0c7da31b83001baecdd1c9d;hpb=c6e4389c8fcf7e60f71292bf62c8ff5c23ded662;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index fd8b90d99..3f9210080 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -40,7 +40,6 @@
 #include "ab_transcode_job.h"
 #include "transcode_job.h"
 #include "scp_dcp_job.h"
-#include "copy_from_dvd_job.h"
 #include "make_dcp_job.h"
 #include "log.h"
 #include "options.h"
@@ -52,6 +51,9 @@
 #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"
 
 using std::string;
 using std::stringstream;
@@ -63,11 +65,16 @@ using std::ifstream;
 using std::ofstream;
 using std::setfill;
 using std::min;
+using std::make_pair;
+using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::to_upper_copy;
 using boost::ends_with;
 using boost::starts_with;
+using boost::optional;
+
+int const Film::state_version = 1;
 
 /** Construct a Film object in a given directory, reading any metadata
  *  file that exists in that directory.  An exception will be thrown if
@@ -78,22 +85,20 @@ using boost::starts_with;
  */
 
 Film::Film (string d, bool must_exist)
-	: _use_dci_name (false)
+	: _use_dci_name (true)
 	, _dcp_content_type (0)
 	, _format (0)
 	, _scaler (Scaler::from_id ("bicubic"))
-	, _dcp_trim_action (CUT)
+	, _dcp_trim_start (0)
+	, _dcp_trim_end (0)
 	, _dcp_ab (false)
-	, _audio_stream (-1)
+	, _use_content_audio (true)
 	, _audio_gain (0)
 	, _audio_delay (0)
 	, _still_duration (10)
-	, _subtitle_stream (-1)
 	, _with_subtitles (false)
 	, _subtitle_offset (0)
 	, _subtitle_scale (1)
-	, _audio_sample_rate (0)
-	, _has_subtitles (false)
 	, _frames_per_second (0)
 	, _dirty (false)
 {
@@ -125,9 +130,12 @@ Film::Film (string d, bool must_exist)
 		}
 	}
 
+	_external_audio_stream = ExternalAudioStream::create ();
+
 	read_metadata ();
 
 	_log = new FileLog (file ("log"));
+	set_dci_date_today ();
 }
 
 Film::Film (Film const & o)
@@ -141,10 +149,12 @@ Film::Film (Film const & o)
 	, _crop              (o._crop)
 	, _filters           (o._filters)
 	, _scaler            (o._scaler)
-	, _dcp_frames        (o._dcp_frames)
-	, _dcp_trim_action   (o._dcp_trim_action)
+	, _dcp_trim_start    (o._dcp_trim_start)
+	, _dcp_trim_end      (o._dcp_trim_end)
 	, _dcp_ab            (o._dcp_ab)
-	, _audio_stream      (o._audio_stream)
+	, _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)
@@ -162,10 +172,9 @@ Film::Film (Film const & o)
 	, _thumbs            (o._thumbs)
 	, _size              (o._size)
 	, _length            (o._length)
-	, _audio_sample_rate (o._audio_sample_rate)
 	, _content_digest    (o._content_digest)
-	, _has_subtitles     (o._has_subtitles)
-	, _audio_streams     (o._audio_streams)
+	, _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)
@@ -221,6 +230,8 @@ Film::j2k_dir () const
 void
 Film::make_dcp (bool transcode)
 {
+	set_dci_date_today ();
+	
 	if (dcp_name().find ("/") != string::npos) {
 		throw BadSettingError ("name", "cannot contain slashes");
 	}
@@ -251,24 +262,20 @@ Film::make_dcp (bool transcode)
 
 	shared_ptr<Options> o (new Options (j2k_dir(), ".j2c", dir ("wavs")));
 	o->out_size = format()->dcp_size ();
-	if (!dcp_frames()) {
-		/* Decode the whole film, no blacking */
-		o->black_after = 0;
-	} else {
-		switch (dcp_trim_action()) {
-		case CUT:
-			/* Decode only part of the film, no blacking */
-			o->black_after = 0;
-			break;
-		case BLACK_OUT:
-			/* Decode the whole film, but black some frames out */
-			o->black_after = dcp_frames().get ();
-		}
-	}
-	
 	o->padding = format()->dcp_padding (shared_from_this ());
 	o->ratio = format()->ratio_as_float (shared_from_this ());
+	if (dcp_length ()) {
+		o->video_decode_range = make_pair (dcp_trim_start(), dcp_trim_start() + dcp_length().get());
+		if (audio_stream()) {
+			o->audio_decode_range = make_pair (
+				video_frames_to_audio_frames (o->video_decode_range.get().first, audio_stream()->sample_rate(), frames_per_second()),
+				video_frames_to_audio_frames (o->video_decode_range.get().second, audio_stream()->sample_rate(), frames_per_second())
+				);
+		}
+			
+	}
 	o->decode_subtitles = with_subtitles ();
+	o->decode_video_skip = dcp_frame_rate (frames_per_second()).skip;
 
 	shared_ptr<Job> r;
 
@@ -292,7 +299,7 @@ Film::examine_content ()
 		return;
 	}
 
-	set_thumbs (vector<int> ());
+	set_thumbs (vector<SourceFrame> ());
 	boost::filesystem::remove_all (dir ("thumbs"));
 
 	/* This call will recreate the directory */
@@ -329,13 +336,6 @@ Film::send_dcp_to_tms ()
 	JobManager::instance()->add (j);
 }
 
-void
-Film::copy_from_dvd ()
-{
-	shared_ptr<Job> j (new CopyFromDVDJob (shared_from_this(), shared_ptr<Job> ()));
-	JobManager::instance()->add (j);
-}
-
 /** Count the number of frames that have been encoded for this film.
  *  @return frame count.
  */
@@ -388,18 +388,18 @@ Film::thumb_subtitle (int n) const
 void
 Film::write_metadata () const
 {
-	std::string const dir = directory ();
-	
 	boost::mutex::scoped_lock lm (_state_mutex);
 
-	boost::filesystem::create_directories (dir);
+	boost::filesystem::create_directories (directory());
 
-	string const m = file_locked ("metadata");
+	string const m = file ("metadata");
 	ofstream f (m.c_str ());
 	if (!f.good ()) {
 		throw CreateFileError (m);
 	}
 
+	f << "version " << state_version << "\n";
+
 	/* User stuff */
 	f << "name " << _name << "\n";
 	f << "use_dci_name " << _use_dci_name << "\n";
@@ -418,24 +418,22 @@ Film::write_metadata () const
 		f << "filter " << (*i)->id () << "\n";
 	}
 	f << "scaler " << _scaler->id () << "\n";
-	f << "dcp_frames " << _dcp_frames.get_value_or(0) << "\n";
-
-	f << "dcp_trim_action ";
-	switch (_dcp_trim_action) {
-	case CUT:
-		f << "cut\n";
-		break;
-	case BLACK_OUT:
-		f << "black_out\n";
-		break;
-	}
-	
+	f << "dcp_trim_start " << _dcp_trim_start << "\n";
+	f << "dcp_trim_end " << _dcp_trim_end << "\n";
 	f << "dcp_ab " << (_dcp_ab ? "1" : "0") << "\n";
-	f << "selected_audio_stream " << _audio_stream << "\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";
-	f << "selected_subtitle_stream " << _subtitle_stream << "\n";
+	if (_subtitle_stream) {
+		f << "selected_subtitle_stream " << _subtitle_stream->to_string() << "\n";
+	}
 	f << "with_subtitles " << _with_subtitles << "\n";
 	f << "subtitle_offset " << _subtitle_offset << "\n";
 	f << "subtitle_scale " << _subtitle_scale << "\n";
@@ -450,22 +448,22 @@ Film::write_metadata () const
 	/* Cached stuff; this is information about our content; we could
 	   look it up each time, but that's slow.
 	*/
-	for (vector<int>::const_iterator i = _thumbs.begin(); i != _thumbs.end(); ++i) {
+	for (vector<SourceFrame>::const_iterator i = _thumbs.begin(); i != _thumbs.end(); ++i) {
 		f << "thumb " << *i << "\n";
 	}
 	f << "width " << _size.width << "\n";
 	f << "height " << _size.height << "\n";
 	f << "length " << _length.get_value_or(0) << "\n";
-	f << "audio_sample_rate " << _audio_sample_rate << "\n";
 	f << "content_digest " << _content_digest << "\n";
-	f << "has_subtitles " << _has_subtitles << "\n";
 
-	for (vector<AudioStream>::const_iterator i = _audio_streams.begin(); i != _audio_streams.end(); ++i) {
-		f << "audio_stream " << i->to_string () << "\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";
 	}
 
-	for (vector<SubtitleStream>::const_iterator i = _subtitle_streams.begin(); i != _subtitle_streams.end(); ++i) {
-		f << "subtitle_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";
 	}
 
 	f << "frames_per_second " << _frames_per_second << "\n";
@@ -478,13 +476,36 @@ void
 Film::read_metadata ()
 {
 	boost::mutex::scoped_lock lm (_state_mutex);
+
+	_external_audio.clear ();
+	_thumbs.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_locked("metadata").c_str());
+	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());
+	}
+	
 	for (multimap<string, string>::const_iterator i = kv.begin(); i != kv.end(); ++i) {
 		string const k = i->first;
 		string const v = i->second;
 
+		if (k == "audio_sample_rate") {
+			audio_sample_rate = atoi (v.c_str());
+		}
+
 		/* User-specified stuff */
 		if (k == "name") {
 			_name = v;
@@ -508,21 +529,22 @@ Film::read_metadata ()
 			_filters.push_back (Filter::from_id (v));
 		} else if (k == "scaler") {
 			_scaler = Scaler::from_id (v);
-		} else if (k == "dcp_frames") {
-			int const vv = atoi (v.c_str ());
-			if (vv) {
-				_dcp_frames = vv;
-			}
-		} else if (k == "dcp_trim_action") {
-			if (v == "cut") {
-				_dcp_trim_action = CUT;
-			} else if (v == "black_out") {
-				_dcp_trim_action = BLACK_OUT;
-			}
+		} 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_audio_stream") {
-			_audio_stream = atoi (v.c_str ());
+		} 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") {
@@ -530,7 +552,11 @@ Film::read_metadata ()
 		} else if (k == "still_duration") {
 			_still_duration = atoi (v.c_str ());
 		} else if (k == "selected_subtitle_stream") {
-			_subtitle_stream = atoi (v.c_str ());
+			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") {
@@ -557,7 +583,7 @@ Film::read_metadata ()
 		if (k == "thumb") {
 			int const n = atoi (v.c_str ());
 			/* Only add it to the list if it still exists */
-			if (boost::filesystem::exists (thumb_file_for_frame_locked (n))) {
+			if (boost::filesystem::exists (thumb_file_for_frame (n))) {
 				_thumbs.push_back (n);
 			}
 		} else if (k == "width") {
@@ -569,20 +595,37 @@ Film::read_metadata ()
 			if (vv) {
 				_length = vv;
 			}
-		} else if (k == "audio_sample_rate") {
-			_audio_sample_rate = atoi (v.c_str ());
 		} else if (k == "content_digest") {
 			_content_digest = v;
-		} else if (k == "has_subtitles") {
-			_has_subtitles = (v == "1");
-		} else if (k == "audio_stream") {
-			_audio_streams.push_back (AudioStream (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 (SubtitleStream (v));
+			_subtitle_streams.push_back (subtitle_stream_factory (v, version));
 		} else if (k == "frames_per_second") {
 			_frames_per_second = atof (v.c_str ());
 		}
 	}
+
+	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());
+			}
+		}
+
+		/* 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()];
+		}
+
+		/* 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;
 }
@@ -596,22 +639,19 @@ Film::thumb_file (int n) const
 	return thumb_file_for_frame (thumb_frame (n));
 }
 
-/** @param n A frame index within the Film.
+/** @param n A frame index within the Film's source.
  *  @return The path to the thumb's image file for this frame;
  *  we assume that it exists.
  */
 string
-Film::thumb_file_for_frame (int n) const
+Film::thumb_file_for_frame (SourceFrame n) const
 {
 	return thumb_base_for_frame(n) + ".png";
 }
 
-string
-Film::thumb_file_for_frame_locked (int n) const
-{
-	return thumb_base_for_frame_locked(n) + ".png";
-}
-
+/** @param n Thumb index.
+ *  Must not be called with the _state_mutex locked.
+ */
 string
 Film::thumb_base (int n) const
 {
@@ -619,30 +659,25 @@ Film::thumb_base (int n) const
 }
 
 string
-Film::thumb_base_for_frame (int n) const
-{
-	boost::mutex::scoped_lock lm (_state_mutex);
-	return thumb_base_for_frame_locked (n);
-}
-
-string
-Film::thumb_base_for_frame_locked (int n) const
+Film::thumb_base_for_frame (SourceFrame n) const
 {
 	stringstream s;
 	s.width (8);
 	s << setfill('0') << n;
 	
 	boost::filesystem::path p;
-	p /= dir_locked ("thumbs");
+	p /= dir ("thumbs");
 	p /= s.str ();
 		
 	return p.string ();
 }
 
 /** @param n A thumb index.
- *  @return The frame within the Film that it is for.
+ *  @return The frame within the Film's source that it is for.
+ *
+ *  Must not be called with the _state_mutex locked.
  */
-int
+SourceFrame
 Film::thumb_frame (int n) const
 {
 	boost::mutex::scoped_lock lm (_state_mutex);
@@ -665,13 +700,7 @@ Film::cropped_size (Size s) const
 string
 Film::dir (string d) const
 {
-	boost::mutex::scoped_lock lm (_state_mutex);
-	return dir_locked (d);
-}
-
-string
-Film::dir_locked (string d) const
-{
+	boost::mutex::scoped_lock lm (_directory_mutex);
 	boost::filesystem::path p;
 	p /= _directory;
 	p /= d;
@@ -679,17 +708,13 @@ Film::dir_locked (string d) const
 	return p.string ();
 }
 
-/** Given a file or directory name, return its full path within the Film's directory */
+/** Given a file or directory name, return its full path within the Film's directory.
+ *  _directory_mutex must not be locked on entry.
+ */
 string
 Film::file (string f) const
 {
-	boost::mutex::scoped_lock lm (_state_mutex);
-	return file_locked (f);
-}
-
-string
-Film::file_locked (string f) const
-{
+	boost::mutex::scoped_lock lm (_directory_mutex);
 	boost::filesystem::path p;
 	p /= _directory;
 	p /= f;
@@ -707,21 +732,18 @@ Film::content_path () const
 		return _content;
 	}
 
-	return file_locked (_content);
+	return file (_content);
 }
 
 ContentType
 Film::content_type () const
 {
-#if BOOST_FILESYSTEM_VERSION == 3
-	string ext = boost::filesystem::path(_content).extension().string();
-#else
-	string ext = boost::filesystem::path(_content).extension();
-#endif
+	if (boost::filesystem::is_directory (_content)) {
+		/* Directory of images, we assume */
+		return VIDEO;
+	}
 
-	transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
-	
-	if (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png") {
+	if (still_image_file (_content)) {
 		return STILL;
 	}
 
@@ -732,42 +754,42 @@ Film::content_type () const
 int
 Film::target_audio_sample_rate () const
 {
+	if (!audio_stream()) {
+		return 0;
+	}
+	
 	/* Resample to a DCI-approved sample rate */
-	double t = dcp_audio_sample_rate (audio_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 (rint (frames_per_second()) != frames_per_second()) {
-		t *= _frames_per_second / rint (frames_per_second());
+	if (dfr.run_fast) {
+		t *= _frames_per_second * dfr.skip / dfr.frames_per_second;
 	}
 
 	return rint (t);
 }
 
-boost::optional<int>
+boost::optional<SourceFrame>
 Film::dcp_length () const
 {
 	if (!length()) {
-		return boost::optional<int> ();
+		return boost::optional<SourceFrame> ();
 	}
 
-	if (dcp_frames()) {
-		return min (dcp_frames().get(), length().get());
-	}
-
-	return length();
+	return length().get() - dcp_trim_start() - dcp_trim_end();
 }
 
 /** @return a DCI-compliant name for a DCP of this film */
 string
 Film::dci_name () const
 {
-	boost::mutex::scoped_lock lm (_state_mutex);
-	
 	stringstream d;
 
-	string fixed_name = to_upper_copy (_name);
+	string fixed_name = to_upper_copy (name());
 	for (size_t i = 0; i < fixed_name.length(); ++i) {
 		if (fixed_name[i] == ' ') {
 			fixed_name[i] = '-';
@@ -781,18 +803,18 @@ Film::dci_name () const
 
 	d << fixed_name << "_";
 
-	if (_dcp_content_type) {
-		d << _dcp_content_type->dci_name() << "_";
+	if (dcp_content_type()) {
+		d << dcp_content_type()->dci_name() << "_";
 	}
 
-	if (_format) {
-		d << _format->dci_name() << "_";
+	if (format()) {
+		d << format()->dci_name() << "_";
 	}
 
-	if (!_audio_language.empty ()) {
-		d << _audio_language;
-		if (!_subtitle_language.empty() && _with_subtitles) {
-			d << "-" << _subtitle_language;
+	if (!audio_language().empty ()) {
+		d << audio_language();
+		if (!subtitle_language().empty() && with_subtitles()) {
+			d << "-" << subtitle_language();
 		} else {
 			d << "-XX";
 		}
@@ -800,15 +822,15 @@ Film::dci_name () const
 		d << "_";
 	}
 
-	if (!_territory.empty ()) {
-		d << _territory;
-		if (!_rating.empty ()) {
-			d << "-" << _rating;
+	if (!territory().empty ()) {
+		d << territory();
+		if (!rating().empty ()) {
+			d << "-" << rating();
 		}
 		d << "_";
 	}
 
-	switch (_audio_streams[_audio_stream].channels()) {
+	switch (audio_channels()) {
 	case 1:
 		d << "10_";
 		break;
@@ -825,19 +847,18 @@ Film::dci_name () const
 
 	d << "2K_";
 
-	if (!_studio.empty ()) {
-		d << _studio << "_";
+	if (!studio().empty ()) {
+		d << studio() << "_";
 	}
 
-	boost::gregorian::date today = boost::gregorian::day_clock::local_day ();
-	d << boost::gregorian::to_iso_string (today) << "_";
+	d << boost::gregorian::to_iso_string (_dci_date) << "_";
 
-	if (!_facility.empty ()) {
-		d << _facility << "_";
+	if (!facility().empty ()) {
+		d << facility() << "_";
 	}
 
-	if (!_package_type.empty ()) {
-		d << _package_type;
+	if (!package_type().empty ()) {
+		d << package_type();
 	}
 
 	return d.str ();
@@ -907,39 +928,64 @@ Film::set_content (string c)
 		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.
 	*/
-	
 
-	shared_ptr<Options> o (new Options ("", "", ""));
-	o->out_size = Size (1024, 1024);
-	
-	shared_ptr<Decoder> d = decoder_factory (shared_from_this(), o, 0, 0);
-
-	set_size (d->native_size ());
-	set_frames_per_second (d->frames_per_second ());
-	set_audio_sample_rate (d->audio_sample_rate ());
-	set_has_subtitles (d->has_subtitles ());
-	set_audio_streams (d->audio_streams ());
-	set_subtitle_streams (d->subtitle_streams ());
-	set_audio_stream (audio_streams().empty() ? -1 : 0);
-	set_subtitle_stream (subtitle_streams().empty() ? -1 : 0);
-	
-	signal_changed (CONTENT);
+	try {
+		shared_ptr<Options> o (new Options ("", "", ""));
+		o->out_size = Size (1024, 1024);
+		
+		pair<shared_ptr<VideoDecoder>, shared_ptr<AudioDecoder> > d = decoder_factory (shared_from_this(), o, 0);
+		
+		set_size (d.first->native_size ());
+		set_frames_per_second (d.first->frames_per_second ());
+		set_subtitle_streams (d.first->subtitle_streams ());
+		set_content_audio_streams (d.second->audio_streams ());
+
+		/* Start off with the first audio and subtitle streams */
+		if (!d.second->audio_streams().empty()) {
+			set_content_audio_stream (d.second->audio_streams().front());
+		}
+		
+		if (!d.first->subtitle_streams().empty()) {
+			set_subtitle_stream (d.first->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 (...) {
 
-	set_content_digest (md5_digest (content_path ()));
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_content = old_content;
+		throw;
 
-	examine_content ();
+	}
 }
 	       
 void
@@ -1050,23 +1096,23 @@ Film::set_scaler (Scaler const * s)
 }
 
 void
-Film::set_dcp_frames (int f)
+Film::set_dcp_trim_start (int t)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_frames = f;
+		_dcp_trim_start = t;
 	}
-	signal_changed (DCP_FRAMES);
+	signal_changed (DCP_TRIM_START);
 }
 
 void
-Film::set_dcp_trim_action (TrimAction a)
+Film::set_dcp_trim_end (int t)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_trim_action = a;
+		_dcp_trim_end = t;
 	}
-	signal_changed (DCP_TRIM_ACTION);
+	signal_changed (DCP_TRIM_END);
 }
 
 void
@@ -1080,13 +1126,42 @@ Film::set_dcp_ab (bool a)
 }
 
 void
-Film::set_audio_stream (int s)
+Film::set_content_audio_stream (shared_ptr<AudioStream> s)
+{
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_content_audio_stream = s;
+	}
+	signal_changed (CONTENT_AUDIO_STREAM);
+}
+
+void
+Film::set_external_audio (vector<string> a)
+{
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_external_audio = a;
+	}
+
+	shared_ptr<Options> o (new Options ("", "", ""));
+	o->decode_audio = true;
+	shared_ptr<ExternalAudioDecoder> decoder (new ExternalAudioDecoder (shared_from_this(), o, 0));
+	if (decoder->audio_stream()) {
+		_external_audio_stream = decoder->audio_stream ();
+	}
+	
+	signal_changed (EXTERNAL_AUDIO);
+}
+
+void
+Film::set_use_content_audio (bool e)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_audio_stream = s;
+		_use_content_audio = e;
 	}
-	signal_changed (AUDIO_STREAM);
+
+	signal_changed (USE_CONTENT_AUDIO);
 }
 
 void
@@ -1120,7 +1195,7 @@ Film::set_still_duration (int d)
 }
 
 void
-Film::set_subtitle_stream (int s)
+Film::set_subtitle_stream (shared_ptr<SubtitleStream> s)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
@@ -1230,7 +1305,7 @@ Film::set_package_type (string p)
 }
 
 void
-Film::set_thumbs (vector<int> t)
+Film::set_thumbs (vector<SourceFrame> t)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
@@ -1250,7 +1325,7 @@ Film::set_size (Size s)
 }
 
 void
-Film::set_length (int l)
+Film::set_length (SourceFrame l)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
@@ -1269,16 +1344,6 @@ Film::unset_length ()
 	signal_changed (LENGTH);
 }	
 
-void
-Film::set_audio_sample_rate (int r)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_audio_sample_rate = r;
-	}
-	signal_changed (AUDIO_SAMPLE_RATE);
-}
-
 void
 Film::set_content_digest (string d)
 {
@@ -1290,33 +1355,23 @@ Film::set_content_digest (string d)
 }
 
 void
-Film::set_has_subtitles (bool s)
+Film::set_content_audio_streams (vector<shared_ptr<AudioStream> > s)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_has_subtitles = s;
+		_content_audio_streams = s;
 	}
-	signal_changed (HAS_SUBTITLES);
+	signal_changed (CONTENT_AUDIO_STREAMS);
 }
 
 void
-Film::set_audio_streams (vector<AudioStream> s)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_audio_streams = s;
-	}
-	_dirty = true;
-}
-
-void
-Film::set_subtitle_streams (vector<SubtitleStream> s)
+Film::set_subtitle_streams (vector<shared_ptr<SubtitleStream> > s)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
 		_subtitle_streams = s;
 	}
-	_dirty = true;
+	signal_changed (SUBTITLE_STREAMS);
 }
 
 void
@@ -1336,16 +1391,35 @@ Film::signal_changed (Property p)
 		boost::mutex::scoped_lock lm (_state_mutex);
 		_dirty = true;
 	}
-	ui_signaller->emit (boost::bind (boost::ref (Changed), p));
+
+	if (ui_signaller) {
+		ui_signaller->emit (boost::bind (boost::ref (Changed), p));
+	}
 }
 
 int
 Film::audio_channels () const
 {
-	boost::mutex::scoped_lock lm (_state_mutex);
-	if (_audio_stream == -1) {
+	shared_ptr<AudioStream> s = audio_stream ();
+	if (!s) {
 		return 0;
 	}
-	
-	return _audio_streams[_audio_stream].channels ();
+
+	return s->channels ();
+}
+
+void
+Film::set_dci_date_today ()
+{
+	_dci_date = boost::gregorian::day_clock::local_day ();
+}
+
+boost::shared_ptr<AudioStream>
+Film::audio_stream () const
+{
+	if (use_content_audio()) {
+		return _content_audio_stream;
+	}
+
+	return _external_audio_stream;
 }