From d0babb26ab341026fe227de810ed30c6c9f65cf2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 11 Jan 2013 18:50:50 +0000
Subject: Try a separate writer thread.

---
 src/lib/encoder.cc | 94 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 73 insertions(+), 21 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 693bd5bc8..93a364fed 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -60,7 +60,9 @@ Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<const EncodeOptions> o)
 	, _swr_context (0)
 #endif	  
 	, _audio_frames_written (0)
-	, _process_end (false)
+	, _terminate_encoder (false)
+	, _writer_thread (0)
+	, _terminate_writer (false)
 {
 	if (_film->audio_stream()) {
 		/* Create sound output files with .tmp suffixes; we will rename
@@ -85,6 +87,7 @@ Encoder::~Encoder ()
 {
 	close_sound_files ();
 	terminate_worker_threads ();
+	terminate_writer_thread ();
 }
 
 void
@@ -130,6 +133,8 @@ Encoder::process_begin ()
 			_worker_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, *i)));
 		}
 	}
+
+	_writer_thread = new boost::thread (boost::bind (&Encoder::writer_thread, this));
 }
 
 
@@ -174,11 +179,11 @@ Encoder::process_end ()
 
 	boost::mutex::scoped_lock lock (_worker_mutex);
 
-	_film->log()->log ("Clearing queue of " + lexical_cast<string> (_queue.size ()));
+	_film->log()->log ("Clearing queue of " + lexical_cast<string> (_encode_queue.size ()));
 
 	/* Keep waking workers until the queue is empty */
-	while (!_queue.empty ()) {
-		_film->log()->log ("Waking with " + lexical_cast<string> (_queue.size ()), Log::VERBOSE);
+	while (!_encode_queue.empty ()) {
+		_film->log()->log ("Waking with " + lexical_cast<string> (_encode_queue.size ()), Log::VERBOSE);
 		_worker_condition.notify_all ();
 		_worker_condition.wait (lock);
 	}
@@ -186,8 +191,9 @@ Encoder::process_end ()
 	lock.unlock ();
 	
 	terminate_worker_threads ();
+	terminate_writer_thread ();
 
-	_film->log()->log ("Mopping up " + lexical_cast<string> (_queue.size()));
+	_film->log()->log ("Mopping up " + lexical_cast<string> (_encode_queue.size()));
 
 	/* The following sequence of events can occur in the above code:
 	     1. a remote worker takes the last image off the queue
@@ -198,7 +204,7 @@ Encoder::process_end ()
 	     So just mop up anything left in the queue here.
 	*/
 
-	for (list<shared_ptr<DCPVideoFrame> >::iterator i = _queue.begin(); i != _queue.end(); ++i) {
+	for (list<shared_ptr<DCPVideoFrame> >::iterator i = _encode_queue.begin(); i != _encode_queue.end(); ++i) {
 		_film->log()->log (String::compose ("Encode left-over frame %1", (*i)->frame ()));
 		try {
 			shared_ptr<EncodedData> e = (*i)->encode_locally ();
@@ -209,6 +215,11 @@ Encoder::process_end ()
 		}
 	}
 
+	/* Mop up any unwritten things in the writer's queue */
+	for (list<pair<shared_ptr<EncodedData>, int> >::iterator i = _write_queue.begin(); i != _write_queue.end(); ++i) {
+		i->first->write (_opt, i->second);
+	}
+
 	/* Now do links (or copies on windows) to duplicate frames */
 	for (list<pair<int, int> >::iterator i = _links_required.begin(); i != _links_required.end(); ++i) {
 		link (_opt->frame_out_path (i->first, false), _opt->frame_out_path (i->second, false));
@@ -295,13 +306,13 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	boost::mutex::scoped_lock lock (_worker_mutex);
 
 	/* Wait until the queue has gone down a bit */
-	while (_queue.size() >= _worker_threads.size() * 2 && !_process_end) {
-		TIMING ("decoder sleeps with queue of %1", _queue.size());
+	while (_encode_queue.size() >= _worker_threads.size() * 2 && !_terminate_encoder) {
+		TIMING ("decoder sleeps with queue of %1", _encode_queue.size());
 		_worker_condition.wait (lock);
-		TIMING ("decoder wakes with queue of %1", _queue.size());
+		TIMING ("decoder wakes with queue of %1", _encode_queue.size());
 	}
 
-	if (_process_end) {
+	if (_terminate_encoder) {
 		return;
 	}
 
@@ -320,8 +331,8 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	} else {
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
-		TIMING ("adding to queue of %1", _queue.size ());
-		_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
+		TIMING ("adding to queue of %1", _encode_queue.size ());
+		_encode_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
 						  image, sub, _opt->out_size, _opt->padding, _film->subtitle_offset(), _film->subtitle_scale(),
 						  _film->scaler(), _video_frame, _film->frames_per_second(), s.second,
@@ -434,7 +445,7 @@ void
 Encoder::terminate_worker_threads ()
 {
 	boost::mutex::scoped_lock lock (_worker_mutex);
-	_process_end = true;
+	_terminate_encoder = true;
 	_worker_condition.notify_all ();
 	lock.unlock ();
 
@@ -444,6 +455,23 @@ Encoder::terminate_worker_threads ()
 	}
 }
 
+void
+Encoder::terminate_writer_thread ()
+{
+	if (!_writer_thread) {
+		return;
+	}
+	
+	boost::mutex::scoped_lock lock (_writer_mutex);
+	_terminate_writer = true;
+	_writer_condition.notify_all ();
+	lock.unlock ();
+
+	_writer_thread->join ();
+	delete _writer_thread;
+	_writer_thread = 0;
+}
+
 void
 Encoder::encoder_thread (ServerDescription* server)
 {
@@ -457,18 +485,18 @@ Encoder::encoder_thread (ServerDescription* server)
 
 		TIMING ("encoder thread %1 sleeps", boost::this_thread::get_id());
 		boost::mutex::scoped_lock lock (_worker_mutex);
-		while (_queue.empty () && !_process_end) {
+		while (_encode_queue.empty () && !_terminate_encoder) {
 			_worker_condition.wait (lock);
 		}
 
-		if (_process_end) {
+		if (_terminate_encoder) {
 			return;
 		}
 
-		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
-		boost::shared_ptr<DCPVideoFrame> vf = _queue.front ();
+		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _encode_queue.size());
+		boost::shared_ptr<DCPVideoFrame> vf = _encode_queue.front ();
 		_film->log()->log (String::compose ("Encoder thread %1 pops frame %2 from queue", boost::this_thread::get_id(), vf->frame()), Log::VERBOSE);
-		_queue.pop_front ();
+		_encode_queue.pop_front ();
 		
 		lock.unlock ();
 
@@ -508,14 +536,15 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		if (encoded) {
-			encoded->write (_opt, vf->frame ());
-			frame_done ();
+			boost::mutex::scoped_lock lock (_writer_mutex);
+			_write_queue.push_back (make_pair (encoded, vf->frame ()));
+			_writer_condition.notify_all ();
 		} else {
 			lock.lock ();
 			_film->log()->log (
 				String::compose ("Encoder thread %1 pushes frame %2 back onto queue after failure", boost::this_thread::get_id(), vf->frame())
 				);
-			_queue.push_front (vf);
+			_encode_queue.push_front (vf);
 			lock.unlock ();
 		}
 
@@ -542,3 +571,26 @@ Encoder::link (string a, string b) const
 	boost::filesystem::copy_file (a, b);
 #endif			
 }
+
+void
+Encoder::writer_thread ()
+{
+	while (1)
+	{
+		boost::mutex::scoped_lock lock (_writer_mutex);
+		while (_write_queue.empty() && !_terminate_writer) {
+			_writer_condition.wait (lock);
+		}
+
+		if (_terminate_writer) {
+			return;
+		}
+
+		pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.front ();
+		_write_queue.pop_front ();
+
+		lock.unlock ();
+		encoded.first->write (_opt, encoded.second);
+		lock.lock ();
+	}
+}
-- 
cgit v1.2.3


From ef0aa27c671f9c34b9aad79015bcc50cb10c0fc5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 11 Jan 2013 19:20:51 +0000
Subject: Encoded data must be copied; disambiguate second lock in
 encoder_thread.

---
 src/lib/dcp_video_frame.cc | 26 ++++++++++++++++++++------
 src/lib/dcp_video_frame.h  | 21 +++++++++------------
 src/lib/encoder.cc         |  2 +-
 3 files changed, 30 insertions(+), 19 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 8b70b0aa4..f84fa8a3f 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -59,6 +59,7 @@
 using std::string;
 using std::stringstream;
 using std::ofstream;
+using std::cout;
 using boost::shared_ptr;
 
 /** Construct a DCP video frame.
@@ -371,6 +372,18 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
 	return e;
 }
 
+EncodedData::EncodedData (int s)
+	: _data (new uint8_t[s])
+	, _size (s)
+{
+
+}
+
+EncodedData::~EncodedData ()
+{
+	delete[] _data;
+}
+
 /** Write this data to a J2K file.
  *  @param opt Options.
  *  @param frame Frame index.
@@ -413,14 +426,15 @@ EncodedData::send (shared_ptr<Socket> socket)
 	socket->write (_data, _size, 30);
 }
 
-/** @param s Size of data in bytes */
-RemotelyEncodedData::RemotelyEncodedData (int s)
-	: EncodedData (new uint8_t[s], s)
+LocallyEncodedData::LocallyEncodedData (uint8_t* d, int s)
+	: EncodedData (s)
 {
-
+	memcpy (_data, d, s);
 }
 
-RemotelyEncodedData::~RemotelyEncodedData ()
+/** @param s Size of data in bytes */
+RemotelyEncodedData::RemotelyEncodedData (int s)
+	: EncodedData (s)
 {
-	delete[] _data;
+
 }
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 57e7e6203..f5ffa467e 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -39,15 +39,11 @@ class Subtitle;
 class EncodedData
 {
 public:
-	/** @param d Data (will not be freed by this class, but may be by subclasses)
-	 *  @param s Size of data, in bytes.
+	/** @param s Size of data, in bytes.
 	 */
-	EncodedData (uint8_t* d, int s)
-		: _data (d)
-		, _size (s)
-	{}
+	EncodedData (int s);
 
-	virtual ~EncodedData () {}
+	virtual ~EncodedData ();
 
 	void send (boost::shared_ptr<Socket> socket);
 	void write (boost::shared_ptr<const EncodeOptions>, SourceFrame);
@@ -65,6 +61,10 @@ public:
 protected:
 	uint8_t* _data; ///< data
 	int _size;      ///< data size in bytes
+
+private:
+	/* No copy construction */
+	EncodedData (EncodedData const &);
 };
 
 /** @class LocallyEncodedData
@@ -75,12 +75,10 @@ protected:
 class LocallyEncodedData : public EncodedData
 {
 public:
-	/** @param d Data (which will not be freed by this class)
+	/** @param d Data (which will be copied by this class)
 	 *  @param s Size of data, in bytes.
 	 */
-	LocallyEncodedData (uint8_t* d, int s)
-		: EncodedData (d, s)
-	{}
+	LocallyEncodedData (uint8_t* d, int s);
 };
 
 /** @class RemotelyEncodedData
@@ -91,7 +89,6 @@ class RemotelyEncodedData : public EncodedData
 {
 public:
 	RemotelyEncodedData (int s);
-	~RemotelyEncodedData ();
 };
 
 /** @class DCPVideoFrame
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 93a364fed..f6d0cc40e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -536,7 +536,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		if (encoded) {
-			boost::mutex::scoped_lock lock (_writer_mutex);
+			boost::mutex::scoped_lock lock2 (_writer_mutex);
 			_write_queue.push_back (make_pair (encoded, vf->frame ()));
 			_writer_condition.notify_all ();
 		} else {
-- 
cgit v1.2.3


From 7b81eb3b0b4e173404c30d754796c7339034c3c5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 11 Jan 2013 19:29:03 +0000
Subject: Add writer thread timing.

---
 src/lib/encoder.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index f6d0cc40e..ef8866897 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -577,10 +577,12 @@ Encoder::writer_thread ()
 {
 	while (1)
 	{
+		TIMING ("writer sleeps");
 		boost::mutex::scoped_lock lock (_writer_mutex);
 		while (_write_queue.empty() && !_terminate_writer) {
 			_writer_condition.wait (lock);
 		}
+		TIMING ("writer wakes with a queue of %1", _write_queue.size());
 
 		if (_terminate_writer) {
 			return;
-- 
cgit v1.2.3


From 72494dd766159e9bdac5d80479b43eb1b3ca15b2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 11 Jan 2013 19:30:44 +0000
Subject: Make the previous compile.

---
 src/lib/encoder.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index ef8866897..731a39042 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -577,8 +577,8 @@ Encoder::writer_thread ()
 {
 	while (1)
 	{
-		TIMING ("writer sleeps");
 		boost::mutex::scoped_lock lock (_writer_mutex);
+		TIMING ("writer sleeps with a queue of %1", _write_queue.size());
 		while (_write_queue.empty() && !_terminate_writer) {
 			_writer_condition.wait (lock);
 		}
-- 
cgit v1.2.3


From c7292767fe4935da750423461a41224b3e0a8e37 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 16 Jan 2013 21:45:41 +0000
Subject: Give DCPFrameRate a constructor.  Add repeat member and cleverer dcp
 frame rate calculations.

---
 src/lib/check_hashes_job.cc |  6 +++--
 src/lib/dcp_video_frame.cc  |  6 ++---
 src/lib/encoder.cc          |  2 +-
 src/lib/film.cc             | 13 +++++----
 src/lib/make_dcp_job.cc     | 11 +++++---
 src/lib/options.h           |  8 +++---
 src/lib/util.cc             | 66 ++++++++++++++++++++++++++++++++-------------
 src/lib/util.h              | 19 ++++++++-----
 8 files changed, 88 insertions(+), 43 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/check_hashes_job.cc b/src/lib/check_hashes_job.cc
index 701584c74..6f6591396 100644
--- a/src/lib/check_hashes_job.cc
+++ b/src/lib/check_hashes_job.cc
@@ -59,9 +59,11 @@ CheckHashesJob::run ()
 	}
 	
 	SourceFrame const N = _film->dcp_trim_start() + _film->dcp_length().get();
-	DCPFrameRate const dfr = dcp_frame_rate (_film->frames_per_second ());
+	DCPFrameRate const dfr (_film->frames_per_second ());
+
+	int const inc = dfr.skip ? 2 : 1;
 	
-	for (SourceFrame i = _film->dcp_trim_start(); i < N; i += dfr.skip) {
+	for (SourceFrame i = _film->dcp_trim_start(); i < N; i += inc) {
 		string const j2k_file = _encode_opt->frame_out_path (i, false);
 		string const hash_file = _encode_opt->hash_out_path (i, false);
 
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index c6b29ba41..f6fb8fe2e 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -66,8 +66,8 @@ using boost::shared_ptr;
  *  @param out Required size of output, in pixels (including any padding).
  *  @param s Scaler to use.
  *  @param p Number of pixels of padding either side of the image.
- *  @param f Index of the frame within the Film.
- *  @param fps Frames per second of the Film.
+ *  @param f Index of the frame within the Film's source.
+ *  @param fps Frames per second of the Film's source.
  *  @param pp FFmpeg post-processing string to use.
  *  @param clut Colour look-up table to use (see Config::colour_lut_index ())
  *  @param bw J2K bandwidth to use (see Config::j2k_bandwidth ())
@@ -86,7 +86,7 @@ DCPVideoFrame::DCPVideoFrame (
 	, _subtitle_scale (subtitle_scale)
 	, _scaler (s)
 	, _frame (f)
-	, _frames_per_second (dcp_frame_rate(fps).frames_per_second)
+	, _frames_per_second (DCPFrameRate(fps).frames_per_second)
 	, _post_process (pp)
 	, _colour_lut (clut)
 	, _j2k_bandwidth (bw)
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index efedfcfef..afa636150 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -279,7 +279,7 @@ Encoder::frame_skipped ()
 void
 Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub)
 {
-	if (_opt->video_skip != 0 && (_video_frame % _opt->video_skip) != 0) {
+	if (_opt->video_skip && (_video_frame % 2)) {
 		++_video_frame;
 		return;
 	}
diff --git a/src/lib/film.cc b/src/lib/film.cc
index f0441c9e0..17e14e544 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -294,25 +294,26 @@ Film::make_dcp (bool transcode)
 	if (dcp_length ()) {
 		oe->video_range = make_pair (dcp_trim_start(), dcp_trim_start() + dcp_length().get());
 		if (audio_stream()) {
+			DCPFrameRate dfr (frames_per_second ());
 			oe->audio_range = make_pair (
 
 				video_frames_to_audio_frames (
 					oe->video_range.get().first,
 					dcp_audio_sample_rate (audio_stream()->sample_rate()),
-					dcp_frame_rate (frames_per_second()).frames_per_second
+					dfr.frames_per_second
 					),
 				
 				video_frames_to_audio_frames (
 					oe->video_range.get().second,
 					dcp_audio_sample_rate (audio_stream()->sample_rate()),
-					dcp_frame_rate (frames_per_second()).frames_per_second
+					dfr.frames_per_second
 					)
 				);
 		}
 			
 	}
 	
-	oe->video_skip = dcp_frame_rate (frames_per_second()).skip;
+	oe->video_skip = DCPFrameRate (frames_per_second()).skip;
 
 	shared_ptr<DecodeOptions> od (new DecodeOptions);
 	od->decode_subtitles = with_subtitles ();
@@ -704,13 +705,15 @@ Film::target_audio_sample_rate () const
 	/* 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 ());
+	DCPFrameRate dfr (frames_per_second ());
 
 	/* Compensate for the fact that video will be rounded to the
 	   nearest integer number of frames per second.
 	*/
+
+	int const mult = dfr.skip ? 2 : 1;
 	if (dfr.run_fast) {
-		t *= _frames_per_second * dfr.skip / dfr.frames_per_second;
+		t *= _frames_per_second * mult / dfr.frames_per_second;
 	}
 
 	return rint (t);
diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index b9f0cacf3..67a2d8b13 100644
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -61,7 +61,9 @@ MakeDCPJob::name () const
 string
 MakeDCPJob::j2c_path (int f, int offset) const
 {
-	SourceFrame const s = ((f + offset) * dcp_frame_rate(_film->frames_per_second()).skip) + _film->dcp_trim_start();
+	DCPFrameRate dfr (_film->frames_per_second());
+	int const mult = dfr.skip ? 2 : 1;
+	SourceFrame const s = ((f + offset) * mult) + _film->dcp_trim_start();
 	return _opt->frame_out_path (s, false);
 }
 
@@ -85,13 +87,16 @@ MakeDCPJob::run ()
 	/* Remove any old DCP */
 	boost::filesystem::remove_all (dcp_path);
 
-	DCPFrameRate const dfr = dcp_frame_rate (_film->frames_per_second ());
+	DCPFrameRate const dfr (_film->frames_per_second ());
 
 	int frames = 0;
 	switch (_film->content_type ()) {
 	case VIDEO:
 		/* Source frames -> DCP frames */
-		frames = _film->dcp_length().get() / dfr.skip;
+		frames = _film->dcp_length().get();
+		if (dfr.skip) {
+			frames /= 2;
+		}
 		break;
 	case STILL:
 		frames = _film->still_duration() * 24;
diff --git a/src/lib/options.h b/src/lib/options.h
index 55b066a2d..d1fc1d54e 100644
--- a/src/lib/options.h
+++ b/src/lib/options.h
@@ -39,7 +39,7 @@ public:
 
 	EncodeOptions (std::string f, std::string e, std::string m)
 		: padding (0)
-		, video_skip (0)
+		, video_skip (false)
 		, _frame_out_path (f)
 		, _frame_out_extension (e)
 		, _multichannel_audio_out_path (m)
@@ -98,10 +98,8 @@ public:
 	/** Range of audio frames to decode (in the DCP's sampling rate) */
 	boost::optional<std::pair<int64_t, int64_t> > audio_range;
 	
-	/** Skip frames such that we don't decode any frame where (index % decode_video_skip) != 0; e.g.
-	 *  1 for every frame, 2 for every other frame, etc.
-	 */
-	SourceFrame video_skip; 
+	/** true to skip every other frame */
+	SourceFrame video_skip;
 
 private:
 	/** Path of the directory to write video frames to */
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 0fced638c..4228ce6cf 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -330,25 +330,55 @@ md5_digest (string file)
 	return s.str ();
 }
 
-/** @param fps Arbitrary frames-per-second value.
- *  @return DCPFrameRate for this frames-per-second.
- */
-DCPFrameRate
-dcp_frame_rate (float fps)
-{
-	DCPFrameRate dfr;
-
-	dfr.run_fast = (fps != rint (fps));
-	dfr.frames_per_second = rint (fps);
-	dfr.skip = 1;
-
-	/* XXX: somewhat arbitrary */
-	if (fps == 50) {
-		dfr.frames_per_second = 25;
-		dfr.skip = 2;
+static bool about_equal (float a, float b)
+{
+	/* A film of F seconds at f FPS will be Ff frames;
+	   Consider some delta FPS d, so if we run the same
+	   film at (f + d) FPS it will last F(f + d) seconds.
+
+	   Hence the difference in length over the length of the film will
+	   be F(f + d) - Ff frames
+	    = Ff + Fd - Ff frames
+	    = Fd frames
+	    = Fd/f seconds
+ 
+	   So if we accept a difference of 1 frame, ie 1/f seconds, we can
+	   say that
+
+	   1/f = Fd/f
+	ie 1 = Fd
+	ie d = 1/F
+ 
+	   So for a 3hr film, ie F = 3 * 60 * 60 = 10800, the acceptable
+	   FPS error is 1/F ~= 0.0001 ~= 10-e4
+	*/
+
+	return (fabs (a - b) < 1e-4);
+}
+
+/** @param fps Arbitrary source frames-per-second value */
+DCPFrameRate::DCPFrameRate (float fps)
+	: frames_per_second (rint (fps))
+	, skip (false)
+	, repeat (false)
+	, run_fast (false)
+{
+	if (about_equal (fps, 50)) {
+		/* XXX: not sure about this; just run at 50?
+		   Ring Peter Jackson.
+		*/
+		frames_per_second = 25;
+		skip = true;
+	} else if (fps >= (27.5 / 2) && fps <= (32.5 / 2)) {
+		frames_per_second = 30;
+		repeat = true;
+	} else if (fps >= (24.5 / 2) && fps <= (27.5 / 2)) {
+		frames_per_second = 25;
+		repeat = true;
+	} else if (fps >= (20 / 2) && fps <= (24.5 / 2)) {
+		frames_per_second = 24;
+		repeat = true;
 	}
-
-	return dfr;
 }
 
 /** @param An arbitrary sampling rate.
diff --git a/src/lib/util.h b/src/lib/util.h
index 024c40fb5..50e7410d6 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -61,14 +61,22 @@ typedef int SourceFrame;
 
 struct DCPFrameRate
 {
+	DCPFrameRate (float);
+	
 	/** frames per second for the DCP */
 	int frames_per_second;
-	/** Skip every `skip' frames.  e.g. if this is 1, we skip nothing;
-	 *  if it's 2, we skip every other frame.
-	 */
-	int skip;
+	/** true to skip every other frame */
+	bool skip;
+	/** true to repeat every frame once */
+	bool repeat;
 	/** true if this DCP will run its video faster than the source
-	 *  (e.g. if the source is 29.97fps and we will run the DCP at 30fps)
+	 *  without taking into account `skip' and `repeat'.
+	 *  (i.e. run_fast will be true if
+	 *          source is 29.97fps, DCP is 30fps
+	 *          source is 14.50fps, DCP is 30fps
+	 *  but not if
+	 *          source is 15.00fps, DCP is 30fps
+	 *          source is 12.50fps, DCP is 25fps)
 	 */
 	bool run_fast;
 };
@@ -183,7 +191,6 @@ struct Rect
 
 extern std::string crop_string (Position, Size);
 extern int dcp_audio_sample_rate (int);
-extern DCPFrameRate dcp_frame_rate (float);
 extern int dcp_audio_channels (int);
 extern std::string colour_lut_index_to_name (int index);
 extern int stride_round_up (int, int const *, int);
-- 
cgit v1.2.3


From f35b2a637ba82e39eb81e030c2e112185349cac5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Jan 2013 00:10:12 +0000
Subject: EncodeOptions can go.

---
 src/lib/ab_transcode_job.cc |   5 +-
 src/lib/ab_transcode_job.h  |   3 --
 src/lib/check_hashes_job.cc |  13 +++---
 src/lib/check_hashes_job.h  |   3 --
 src/lib/dcp_video_frame.cc  |   8 ++--
 src/lib/dcp_video_frame.h   |   4 +-
 src/lib/encoder.cc          |  39 +++++++++-------
 src/lib/encoder.h           |   5 +-
 src/lib/film.cc             | 111 +++++++++++++++++++++++++++++++-------------
 src/lib/film.h              |   6 +++
 src/lib/make_dcp_job.cc     |  12 ++---
 src/lib/make_dcp_job.h      |   6 +--
 src/lib/options.h           |  84 ---------------------------------
 src/lib/transcode_job.cc    |   5 +-
 src/lib/transcode_job.h     |   4 +-
 src/lib/transcoder.h        |   1 -
 16 files changed, 132 insertions(+), 177 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/ab_transcode_job.cc b/src/lib/ab_transcode_job.cc
index a6233c185..2dd8f95ad 100644
--- a/src/lib/ab_transcode_job.cc
+++ b/src/lib/ab_transcode_job.cc
@@ -32,10 +32,9 @@ using boost::shared_ptr;
 /** @param f Film to compare.
  *  @param o Options.
  */
-ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<const EncodeOptions> oe, shared_ptr<Job> req)
+ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<Job> req)
 	: Job (f, req)
 	, _decode_opt (od)
-	, _encode_opt (oe)
 {
 	_film_b.reset (new Film (*_film));
 	_film_b->set_scaler (Config::instance()->reference_scaler ());
@@ -53,7 +52,7 @@ ABTranscodeJob::run ()
 {
 	try {
 		/* _film_b is the one with reference filters */
-		ABTranscoder w (_film_b, _film, _decode_opt, this, shared_ptr<Encoder> (new Encoder (_film, _encode_opt)));
+		ABTranscoder w (_film_b, _film, _decode_opt, this, shared_ptr<Encoder> (new Encoder (_film)));
 		w.go ();
 		set_progress (1);
 		set_state (FINISHED_OK);
diff --git a/src/lib/ab_transcode_job.h b/src/lib/ab_transcode_job.h
index 86a2a81b8..69c157651 100644
--- a/src/lib/ab_transcode_job.h
+++ b/src/lib/ab_transcode_job.h
@@ -26,7 +26,6 @@
 
 class Film;
 class DecodeOptions;
-class EncodeOptions;
 
 /** @class ABTranscodeJob
  *  @brief Job to run a transcoder which produces output for A/B comparison of various settings.
@@ -41,7 +40,6 @@ public:
 	ABTranscodeJob (
 		boost::shared_ptr<Film> f,
 		boost::shared_ptr<const DecodeOptions> od,
-		boost::shared_ptr<const EncodeOptions> oe,
 		boost::shared_ptr<Job> req
 		);
 
@@ -50,7 +48,6 @@ public:
 
 private:
 	boost::shared_ptr<const DecodeOptions> _decode_opt;
-	boost::shared_ptr<const EncodeOptions> _encode_opt;
 	
 	/** Copy of our Film using the reference filters and scaler */
 	boost::shared_ptr<Film> _film_b;
diff --git a/src/lib/check_hashes_job.cc b/src/lib/check_hashes_job.cc
index 6f6591396..099845d8c 100644
--- a/src/lib/check_hashes_job.cc
+++ b/src/lib/check_hashes_job.cc
@@ -34,10 +34,9 @@ using std::stringstream;
 using std::ifstream;
 using boost::shared_ptr;
 
-CheckHashesJob::CheckHashesJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<const EncodeOptions> oe, shared_ptr<Job> req)
+CheckHashesJob::CheckHashesJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<Job> req)
 	: Job (f, req)
 	, _decode_opt (od)
-	, _encode_opt (oe)
 	, _bad (0)
 {
 
@@ -64,8 +63,8 @@ CheckHashesJob::run ()
 	int const inc = dfr.skip ? 2 : 1;
 	
 	for (SourceFrame i = _film->dcp_trim_start(); i < N; i += inc) {
-		string const j2k_file = _encode_opt->frame_out_path (i, false);
-		string const hash_file = _encode_opt->hash_out_path (i, false);
+		string const j2k_file = _film->frame_out_path (i, false);
+		string const hash_file = _film->hash_out_path (i, false);
 
 		if (!boost::filesystem::exists (j2k_file)) {
 			_film->log()->log (String::compose ("Frame %1 has a missing J2K file.", i));
@@ -94,13 +93,13 @@ CheckHashesJob::run ()
 		shared_ptr<Job> tc;
 
 		if (_film->dcp_ab()) {
-			tc.reset (new ABTranscodeJob (_film, _decode_opt, _encode_opt, shared_from_this()));
+			tc.reset (new ABTranscodeJob (_film, _decode_opt, shared_from_this()));
 		} else {
-			tc.reset (new TranscodeJob (_film, _decode_opt, _encode_opt, shared_from_this()));
+			tc.reset (new TranscodeJob (_film, _decode_opt, shared_from_this()));
 		}
 		
 		JobManager::instance()->add_after (shared_from_this(), tc);
-		JobManager::instance()->add_after (tc, shared_ptr<Job> (new CheckHashesJob (_film, _decode_opt, _encode_opt, tc)));
+		JobManager::instance()->add_after (tc, shared_ptr<Job> (new CheckHashesJob (_film, _decode_opt, tc)));
 	}
 		
 	set_progress (1);
diff --git a/src/lib/check_hashes_job.h b/src/lib/check_hashes_job.h
index c41af9d3f..7e62b0e7a 100644
--- a/src/lib/check_hashes_job.h
+++ b/src/lib/check_hashes_job.h
@@ -20,7 +20,6 @@
 #include "job.h"
 
 class DecodeOptions;
-class EncodeOptions;
 
 class CheckHashesJob : public Job
 {
@@ -28,7 +27,6 @@ public:
 	CheckHashesJob (
 		boost::shared_ptr<Film> f,
 		boost::shared_ptr<const DecodeOptions> od,
-		boost::shared_ptr<const EncodeOptions> oe,
 		boost::shared_ptr<Job> req
 		);
 
@@ -38,6 +36,5 @@ public:
 
 private:
 	boost::shared_ptr<const DecodeOptions> _decode_opt;
-	boost::shared_ptr<const EncodeOptions> _encode_opt;
 	int _bad;
 };
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index f6fb8fe2e..c00ed9b88 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -376,9 +376,9 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
  *  @param frame Frame index.
  */
 void
-EncodedData::write (shared_ptr<const EncodeOptions> opt, SourceFrame frame)
+EncodedData::write (shared_ptr<const Film> film, SourceFrame frame)
 {
-	string const tmp_j2k = opt->frame_out_path (frame, true);
+	string const tmp_j2k = film->frame_out_path (frame, true);
 
 	FILE* f = fopen (tmp_j2k.c_str (), "wb");
 	
@@ -389,13 +389,13 @@ EncodedData::write (shared_ptr<const EncodeOptions> opt, SourceFrame frame)
 	fwrite (_data, 1, _size, f);
 	fclose (f);
 
-	string const real_j2k = opt->frame_out_path (frame, false);
+	string const real_j2k = film->frame_out_path (frame, false);
 
 	/* Rename the file from foo.j2c.tmp to foo.j2c now that it is complete */
 	boost::filesystem::rename (tmp_j2k, real_j2k);
 
 	/* Write a file containing the hash */
-	string const hash = opt->hash_out_path (frame, false);
+	string const hash = film->hash_out_path (frame, false);
 	ofstream h (hash.c_str());
 	h << md5_digest (_data, _size) << "\n";
 	h.close ();
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 134720da8..1b75cb207 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -26,7 +26,7 @@
  */
 
 class FilmState;
-class EncodeOptions;
+class Film;
 class ServerDescription;
 class Scaler;
 class Image;
@@ -50,7 +50,7 @@ public:
 	virtual ~EncodedData () {}
 
 	void send (boost::shared_ptr<Socket> socket);
-	void write (boost::shared_ptr<const EncodeOptions>, SourceFrame);
+	void write (boost::shared_ptr<const Film>, SourceFrame);
 
 	/** @return data */
 	uint8_t* data () const {
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index afa636150..35b43e334 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -34,6 +34,7 @@
 #include "config.h"
 #include "dcp_video_frame.h"
 #include "server.h"
+#include "format.h"
 #include "cross.h"
 
 using std::pair;
@@ -50,9 +51,8 @@ int const Encoder::_history_size = 25;
 /** @param f Film that we are encoding.
  *  @param o Options.
  */
-Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<const EncodeOptions> o)
+Encoder::Encoder (shared_ptr<const Film> f)
 	: _film (f)
-	, _opt (o)
 	, _just_skipped (false)
 	, _video_frame (0)
 	, _audio_frame (0)
@@ -72,9 +72,9 @@ Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<const EncodeOptions> o)
 			/* We write mono files */
 			sf_info.channels = 1;
 			sf_info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_24;
-			SNDFILE* f = sf_open (_opt->multichannel_audio_out_path (i, true).c_str (), SFM_WRITE, &sf_info);
+			SNDFILE* f = sf_open (_film->multichannel_audio_out_path (i, true).c_str (), SFM_WRITE, &sf_info);
 			if (f == 0) {
-				throw CreateFileError (_opt->multichannel_audio_out_path (i, true));
+				throw CreateFileError (_film->multichannel_audio_out_path (i, true));
 			}
 			_sound_files.push_back (f);
 		}
@@ -165,10 +165,10 @@ Encoder::process_end ()
 		
 		/* Rename .wav.tmp files to .wav */
 		for (int i = 0; i < dcp_audio_channels (_film->audio_channels()); ++i) {
-			if (boost::filesystem::exists (_opt->multichannel_audio_out_path (i, false))) {
-				boost::filesystem::remove (_opt->multichannel_audio_out_path (i, false));
+			if (boost::filesystem::exists (_film->multichannel_audio_out_path (i, false))) {
+				boost::filesystem::remove (_film->multichannel_audio_out_path (i, false));
 			}
-			boost::filesystem::rename (_opt->multichannel_audio_out_path (i, true), _opt->multichannel_audio_out_path (i, false));
+			boost::filesystem::rename (_film->multichannel_audio_out_path (i, true), _film->multichannel_audio_out_path (i, false));
 		}
 	}
 
@@ -202,7 +202,7 @@ Encoder::process_end ()
 		_film->log()->log (String::compose ("Encode left-over frame %1", (*i)->frame ()));
 		try {
 			shared_ptr<EncodedData> e = (*i)->encode_locally ();
-			e->write (_opt, (*i)->frame ());
+			e->write (_film, (*i)->frame ());
 			frame_done ();
 		} catch (std::exception& e) {
 			_film->log()->log (String::compose ("Local encode failed (%1)", e.what ()));
@@ -211,8 +211,8 @@ Encoder::process_end ()
 
 	/* Now do links (or copies on windows) to duplicate frames */
 	for (list<pair<int, int> >::iterator i = _links_required.begin(); i != _links_required.end(); ++i) {
-		link (_opt->frame_out_path (i->first, false), _opt->frame_out_path (i->second, false));
-		link (_opt->hash_out_path (i->first, false), _opt->hash_out_path (i->second, false));
+		link (_film->frame_out_path (i->first, false), _film->frame_out_path (i->second, false));
+		link (_film->hash_out_path (i->first, false), _film->hash_out_path (i->second, false));
 	}
 }	
 
@@ -279,13 +279,15 @@ Encoder::frame_skipped ()
 void
 Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub)
 {
-	if (_opt->video_skip && (_video_frame % 2)) {
+	DCPFrameRate dfr (_film->frames_per_second ());
+	
+	if (dfr.skip && (_video_frame % 2)) {
 		++_video_frame;
 		return;
 	}
 
-	if (_opt->video_range) {
-		pair<SourceFrame, SourceFrame> const r = _opt->video_range.get();
+	if (_film->video_range ()) {
+		pair<SourceFrame, SourceFrame> const r = _film->video_range().get();
 		if (_video_frame < r.first || _video_frame >= r.second) {
 			++_video_frame;
 			return;
@@ -306,7 +308,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	}
 
 	/* Only do the processing if we don't already have a file for this frame */
-	if (boost::filesystem::exists (_opt->frame_out_path (_video_frame, false))) {
+	if (boost::filesystem::exists (_film->frame_out_path (_video_frame, false))) {
 		frame_skipped ();
 		return;
 	}
@@ -323,7 +325,8 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		TIMING ("adding to queue of %1", _queue.size ());
 		_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, sub, _opt->out_size, _opt->padding, _film->subtitle_offset(), _film->subtitle_scale(),
+						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
+						  _film->subtitle_offset(), _film->subtitle_scale(),
 						  _film->scaler(), _video_frame, _film->frames_per_second(), s.second,
 						  _film->colour_lut(), _film->j2k_bandwidth(),
 						  _film->log()
@@ -340,11 +343,11 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 void
 Encoder::process_audio (shared_ptr<AudioBuffers> data)
 {
-	if (_opt->audio_range) {
+	if (_film->audio_range ()) {
 		shared_ptr<AudioBuffers> trimmed (new AudioBuffers (*data.get ()));
 		
 		/* Range that we are encoding */
-		pair<int64_t, int64_t> required_range = _opt->audio_range.get();
+		pair<int64_t, int64_t> required_range = _film->audio_range().get();
 		/* Range of this block of data */
 		pair<int64_t, int64_t> this_range (_audio_frame, _audio_frame + trimmed->frames());
 
@@ -508,7 +511,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		if (encoded) {
-			encoded->write (_opt, vf->frame ());
+			encoded->write (_film, vf->frame ());
 			frame_done ();
 		} else {
 			lock.lock ();
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index bd38dc6bd..d8edf9b26 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -44,7 +44,6 @@ extern "C" {
 #include "video_sink.h"
 #include "audio_sink.h"
 
-class EncodeOptions;
 class Image;
 class Subtitle;
 class AudioBuffers;
@@ -62,7 +61,7 @@ class DCPVideoFrame;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-	Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<const EncodeOptions> o);
+	Encoder (boost::shared_ptr<const Film> f);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
@@ -99,8 +98,6 @@ private:
 
 	/** Film that we are encoding */
 	boost::shared_ptr<const Film> _film;
-	/** Options */
-	boost::shared_ptr<const EncodeOptions> _opt;
 
 	/** Mutex for _time_history, _just_skipped and _last_frame */
 	mutable boost::mutex _history_mutex;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 83c60a5f5..4bf6606a9 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -290,33 +290,6 @@ Film::make_dcp (bool transcode)
 		throw MissingSettingError ("name");
 	}
 
-	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()) {
-			DCPFrameRate dfr (frames_per_second ());
-			oe->audio_range = make_pair (
-
-				video_frames_to_audio_frames (
-					oe->video_range.get().first,
-					dcp_audio_sample_rate (audio_stream()->sample_rate()),
-					dfr.frames_per_second
-					),
-				
-				video_frames_to_audio_frames (
-					oe->video_range.get().second,
-					dcp_audio_sample_rate (audio_stream()->sample_rate()),
-					dfr.frames_per_second
-					)
-				);
-		}
-			
-	}
-	
-	oe->video_skip = DCPFrameRate (frames_per_second()).skip;
-
 	shared_ptr<DecodeOptions> od (new DecodeOptions);
 	od->decode_subtitles = with_subtitles ();
 
@@ -324,14 +297,14 @@ Film::make_dcp (bool transcode)
 
 	if (transcode) {
 		if (dcp_ab()) {
-			r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this(), od, oe, shared_ptr<Job> ())));
+			r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this(), od, shared_ptr<Job> ())));
 		} else {
-			r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this(), od, oe, shared_ptr<Job> ())));
+			r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this(), od, shared_ptr<Job> ())));
 		}
 	}
 
-	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)));
+	r = JobManager::instance()->add (shared_ptr<Job> (new CheckHashesJob (shared_from_this(), od, r)));
+	JobManager::instance()->add (shared_ptr<Job> (new MakeDCPJob (shared_from_this(), r)));
 }
 
 /** Start a job to examine our content file */
@@ -1437,3 +1410,79 @@ Film::audio_stream () const
 
 	return _external_audio_stream;
 }
+
+/** @param f Source frame index.
+ *  @param t true to return a temporary file path, otherwise a permanent one.
+ *  @return The path to write this video frame to.
+ */
+string
+Film::frame_out_path (SourceFrame f, bool t) const
+{
+	stringstream s;
+	s << j2k_dir() << "/";
+	s.width (8);
+	s << std::setfill('0') << f << ".j2c";
+
+	if (t) {
+		s << ".tmp";
+	}
+
+	return s.str ();
+}
+
+string
+Film::hash_out_path (SourceFrame f, bool t) const
+{
+	return frame_out_path (f, t) + ".md5";
+}
+
+/** @param c Audio channel index.
+ *  @param t true to return a temporary file path, otherwise a permanent one.
+ *  @return The path to write this audio file to.
+ */
+string
+Film::multichannel_audio_out_path (int c, bool t) const
+{
+	stringstream s;
+	s << dir ("wavs") << "/" << (c + 1) << ".wav";
+	if (t) {
+		s << ".tmp";
+	}
+	
+	return s.str ();
+}
+
+boost::optional<pair<SourceFrame, SourceFrame> >
+Film::video_range () const
+{
+	if (!dcp_length()) {
+		return boost::optional<pair<SourceFrame, SourceFrame> > ();
+	}
+	
+	return make_pair (dcp_trim_start(), dcp_trim_start() + dcp_length().get());
+}
+
+boost::optional<pair<int64_t, int64_t> >
+Film::audio_range () const
+{
+	boost::optional<pair<SourceFrame, SourceFrame> > vr = video_range ();
+	if (!vr || !audio_stream()) {
+		return boost::optional<pair<int64_t, int64_t> > ();
+	}
+
+	DCPFrameRate dfr (frames_per_second ());
+	return make_pair (
+		
+		video_frames_to_audio_frames (
+			vr.get().first,
+			dcp_audio_sample_rate (audio_stream()->sample_rate()),
+			dfr.frames_per_second
+			),
+		
+		video_frames_to_audio_frames (
+			vr.get().second,
+			dcp_audio_sample_rate (audio_stream()->sample_rate()),
+			dfr.frames_per_second
+			)
+		);
+}
diff --git a/src/lib/film.h b/src/lib/film.h
index 3485dfaae..6c27af3ab 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -78,6 +78,10 @@ public:
 	std::string file (std::string f) const;
 	std::string dir (std::string d) const;
 
+	std::string frame_out_path (SourceFrame f, bool t) const;
+	std::string hash_out_path (SourceFrame f, bool t) const;
+	std::string multichannel_audio_out_path (int c, bool t) const;
+	
 	std::string content_path () const;
 	ContentType content_type () const;
 	
@@ -97,6 +101,8 @@ public:
 	}
 
 	int audio_channels () const;
+	boost::optional<std::pair<SourceFrame, SourceFrame> > video_range () const;
+	boost::optional<std::pair<int64_t, int64_t> > audio_range () const;
 
 	void set_dci_date_today ();
 
diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index 67a2d8b13..efc2f05d5 100644
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -36,6 +36,7 @@ extern "C" {
 #include "options.h"
 #include "imagemagick_decoder.h"
 #include "film.h"
+#include "format.h"
 
 using std::string;
 using std::cout;
@@ -44,9 +45,8 @@ using boost::shared_ptr;
 /** @param f Film we are making the DCP for.
  *  @param o Options.
  */
-MakeDCPJob::MakeDCPJob (shared_ptr<Film> f, shared_ptr<const EncodeOptions> o, shared_ptr<Job> req)
+MakeDCPJob::MakeDCPJob (shared_ptr<Film> f, shared_ptr<Job> req)
 	: Job (f, req)
-	, _opt (o)
 {
 	
 }
@@ -64,13 +64,13 @@ MakeDCPJob::j2c_path (int f, int offset) const
 	DCPFrameRate dfr (_film->frames_per_second());
 	int const mult = dfr.skip ? 2 : 1;
 	SourceFrame const s = ((f + offset) * mult) + _film->dcp_trim_start();
-	return _opt->frame_out_path (s, false);
+	return _film->frame_out_path (s, false);
 }
 
 string
 MakeDCPJob::wav_path (libdcp::Channel c) const
 {
-	return _opt->multichannel_audio_out_path (int (c), false);
+	return _film->multichannel_audio_out_path (int (c), false);
 }
 
 void
@@ -138,8 +138,8 @@ MakeDCPJob::run ()
 				&dcp.Progress,
 				dfr.frames_per_second,
 				this_time,
-				_opt->out_size.width,
-				_opt->out_size.height
+				_film->format()->dcp_size().width,
+				_film->format()->dcp_size().height
 				)
 			);
 	
diff --git a/src/lib/make_dcp_job.h b/src/lib/make_dcp_job.h
index 5e4f78a25..481382248 100644
--- a/src/lib/make_dcp_job.h
+++ b/src/lib/make_dcp_job.h
@@ -23,15 +23,13 @@
 
 #include "job.h"
 
-class EncodeOptions;
-
 /** @class MakeDCPJob
  *  @brief A job to create DCPs
  */
 class MakeDCPJob : public Job
 {
 public:
-	MakeDCPJob (boost::shared_ptr<Film>, boost::shared_ptr<const EncodeOptions>, boost::shared_ptr<Job> req);
+	MakeDCPJob (boost::shared_ptr<Film>, boost::shared_ptr<Job> req);
 
 	std::string name () const;
 	void run ();
@@ -40,7 +38,5 @@ private:
 	void dcp_progress (float);
 	std::string j2c_path (int, int) const;
 	std::string wav_path (libdcp::Channel) const;
-
-	boost::shared_ptr<const EncodeOptions> _opt;
 };
 
diff --git a/src/lib/options.h b/src/lib/options.h
index d1fc1d54e..2f8733507 100644
--- a/src/lib/options.h
+++ b/src/lib/options.h
@@ -27,90 +27,6 @@
 #include <boost/optional.hpp>
 #include "util.h"
 
-/** @class EncodeOptions
- *  @brief EncodeOptions for an encoding operation.
- *
- *  These are settings which may be different, in different circumstances, for
- *  the same film; ie they are options for a particular operation.
- */
-class EncodeOptions
-{
-public:
-
-	EncodeOptions (std::string f, std::string e, std::string m)
-		: padding (0)
-		, video_skip (false)
-		, _frame_out_path (f)
-		, _frame_out_extension (e)
-		, _multichannel_audio_out_path (m)
-	{}
-
-	/** @return The path to write video frames to */
-	std::string frame_out_path () const {
-		return _frame_out_path;
-	}
-
-	/** @param f Source frame index.
-	 *  @param t true to return a temporary file path, otherwise a permanent one.
-	 *  @return The path to write this video frame to.
-	 */
-	std::string frame_out_path (SourceFrame f, bool t) const {
-		std::stringstream s;
-		s << _frame_out_path << "/";
-		s.width (8);
-		s << std::setfill('0') << f << _frame_out_extension;
-
-		if (t) {
-			s << ".tmp";
-		}
-
-		return s.str ();
-	}
-
-	std::string hash_out_path (SourceFrame f, bool t) const {
-		return frame_out_path (f, t) + ".md5";
-	}
-
-	/** @return Path to write multichannel audio data to */
-	std::string multichannel_audio_out_path () const {
-		return _multichannel_audio_out_path;
-	}
-
-	/** @param c Audio channel index.
-	 *  @param t true to return a temporary file path, otherwise a permanent one.
-	 *  @return The path to write this audio file to.
-	 */
-	std::string multichannel_audio_out_path (int c, bool t) const {
-		std::stringstream s;
-		s << _multichannel_audio_out_path << "/" << (c + 1) << ".wav";
-		if (t) {
-			s << ".tmp";
-		}
-
-		return s.str ();
-	}
-
-	Size out_size;              ///< size of output images
-	int padding;                ///< number of pixels of padding (in terms of the output size) each side of the image
-
-	/** Range of video frames to encode (in DCP frames) */
-	boost::optional<std::pair<int, int> > video_range;
-	/** Range of audio frames to decode (in the DCP's sampling rate) */
-	boost::optional<std::pair<int64_t, int64_t> > audio_range;
-	
-	/** true to skip every other frame */
-	SourceFrame video_skip;
-
-private:
-	/** Path of the directory to write video frames to */
-	std::string _frame_out_path;
-	/** Extension to use for video frame files (including the leading .) */
-	std::string _frame_out_extension;
-	/** Path of the directory to write audio files to */
-	std::string _multichannel_audio_out_path;
-};
-
-
 class DecodeOptions
 {
 public:
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index dfb9b1071..db5c33641 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -40,10 +40,9 @@ using boost::shared_ptr;
  *  @param o Options.
  *  @param req Job that must be completed before this job is run.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<const EncodeOptions> oe, shared_ptr<Job> req)
+TranscodeJob::TranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<Job> req)
 	: Job (f, req)
 	, _decode_opt (od)
-	, _encode_opt (oe)
 {
 	
 }
@@ -62,7 +61,7 @@ TranscodeJob::run ()
 		_film->log()->log ("Transcode job starting");
 		_film->log()->log (String::compose ("Audio delay is %1ms", _film->audio_delay()));
 
-		_encoder.reset (new Encoder (_film, _encode_opt));
+		_encoder.reset (new Encoder (_film));
 		Transcoder w (_film, _decode_opt, this, _encoder);
 		w.go ();
 		set_progress (1);
diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index 97f655e15..aef190a64 100644
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -26,7 +26,6 @@
 
 class Encoder;
 class DecodeOptions;
-class EncodeOptions;
 
 /** @class TranscodeJob
  *  @brief A job which transcodes from one format to another.
@@ -34,7 +33,7 @@ class EncodeOptions;
 class TranscodeJob : public Job
 {
 public:
-	TranscodeJob (boost::shared_ptr<Film> f, boost::shared_ptr<const DecodeOptions> od, boost::shared_ptr<const EncodeOptions> oe, boost::shared_ptr<Job> req);
+	TranscodeJob (boost::shared_ptr<Film> f, boost::shared_ptr<const DecodeOptions> od, boost::shared_ptr<Job> req);
 	
 	std::string name () const;
 	void run ();
@@ -45,6 +44,5 @@ protected:
 
 private:
 	boost::shared_ptr<const DecodeOptions> _decode_opt;
-	boost::shared_ptr<const EncodeOptions> _encode_opt;
 	boost::shared_ptr<Encoder> _encoder;
 };
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index b50113742..ef6a438c8 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -36,7 +36,6 @@ class Gain;
 class VideoDecoder;
 class AudioDecoder;
 class DelayLine;
-class EncodeOptions;
 class DecodeOptions;
 
 /** @class Transcoder
-- 
cgit v1.2.3


From 3882d34aed9dee417ceed93bf0bf5372b3970ff6 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Jan 2013 20:49:09 +0000
Subject: Basics of doing trim using asset entry point / duration.

---
 src/lib/encoder.cc      | 32 --------------------------------
 src/lib/film.cc         | 34 ----------------------------------
 src/lib/film.h          |  2 --
 src/lib/make_dcp_job.cc |  7 +++++++
 4 files changed, 7 insertions(+), 68 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 35b43e334..c32d68834 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -286,14 +286,6 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		return;
 	}
 
-	if (_film->video_range ()) {
-		pair<SourceFrame, SourceFrame> const r = _film->video_range().get();
-		if (_video_frame < r.first || _video_frame >= r.second) {
-			++_video_frame;
-			return;
-		}
-	}
-
 	boost::mutex::scoped_lock lock (_worker_mutex);
 
 	/* Wait until the queue has gone down a bit */
@@ -343,30 +335,6 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 void
 Encoder::process_audio (shared_ptr<AudioBuffers> data)
 {
-	if (_film->audio_range ()) {
-		shared_ptr<AudioBuffers> trimmed (new AudioBuffers (*data.get ()));
-		
-		/* Range that we are encoding */
-		pair<int64_t, int64_t> required_range = _film->audio_range().get();
-		/* Range of this block of data */
-		pair<int64_t, int64_t> this_range (_audio_frame, _audio_frame + trimmed->frames());
-
-		if (this_range.second < required_range.first || required_range.second < this_range.first) {
-			/* No part of this audio is within the required range */
-			return;
-		} else if (required_range.first >= this_range.first && required_range.first < this_range.second) {
-			/* Trim start */
-			int64_t const shift = required_range.first - this_range.first;
-			trimmed->move (shift, 0, trimmed->frames() - shift);
-			trimmed->set_frames (trimmed->frames() - shift);
-		} else if (required_range.second >= this_range.first && required_range.second < this_range.second) {
-			/* Trim end */
-			trimmed->set_frames (required_range.second - this_range.first);
-		}
-
-		data = trimmed;
-	}
-
 #if HAVE_SWRESAMPLE
 	/* Maybe sample-rate convert */
 	if (_swr_context) {
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 8fe03184d..2af8d3c14 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1450,37 +1450,3 @@ Film::multichannel_audio_out_path (int c, bool t) const
 	return s.str ();
 }
 
-boost::optional<pair<SourceFrame, SourceFrame> >
-Film::video_range () const
-{
-	if (!dcp_length()) {
-		return boost::optional<pair<SourceFrame, SourceFrame> > ();
-	}
-	
-	return make_pair (trim_start(), trim_start() + dcp_length().get());
-}
-
-boost::optional<pair<int64_t, int64_t> >
-Film::audio_range () const
-{
-	boost::optional<pair<SourceFrame, SourceFrame> > vr = video_range ();
-	if (!vr || !audio_stream()) {
-		return boost::optional<pair<int64_t, int64_t> > ();
-	}
-
-	DCPFrameRate dfr (frames_per_second ());
-	return make_pair (
-		
-		video_frames_to_audio_frames (
-			vr.get().first,
-			dcp_audio_sample_rate (audio_stream()->sample_rate()),
-			dfr.frames_per_second
-			),
-		
-		video_frames_to_audio_frames (
-			vr.get().second,
-			dcp_audio_sample_rate (audio_stream()->sample_rate()),
-			dfr.frames_per_second
-			)
-		);
-}
diff --git a/src/lib/film.h b/src/lib/film.h
index 4cecf663c..b03d84920 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -101,8 +101,6 @@ public:
 	}
 
 	int audio_channels () const;
-	boost::optional<std::pair<SourceFrame, SourceFrame> > video_range () const;
-	boost::optional<std::pair<int64_t, int64_t> > audio_range () const;
 
 	void set_dci_date_today ();
 
diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index fcb10069d..3603298d9 100644
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -142,6 +142,9 @@ MakeDCPJob::run ()
 				_film->format()->dcp_size().height
 				)
 			);
+
+		pa->set_entry_point (_film->trim_start ());
+		pa->set_duration (_film->duration ());
 	
 		ascend ();
 		
@@ -161,6 +164,10 @@ MakeDCPJob::run ()
 					dcp_audio_channels (_film->audio_channels())
 					)
 				);
+
+			sa->set_entry_point (_film->trim_start ());
+			sa->set_duration (_film->duration ());
+			
 			ascend ();
 		}
 
-- 
cgit v1.2.3


From 39c65e47432c76a4e34aaea5317bd7362409aed0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Jan 2013 21:30:16 +0000
Subject: Try to tidy up frame indexing; use DCP length obtained from the
 transcode to make the DCP.

---
 src/lib/check_hashes_job.cc    | 12 ++++--------
 src/lib/dcp_video_frame.cc     |  9 +++++----
 src/lib/dcp_video_frame.h      | 12 ++++++------
 src/lib/encoder.cc             | 39 +++++++++++++++++++++++----------------
 src/lib/encoder.h              | 12 ++++++++----
 src/lib/ffmpeg_decoder.cc      |  1 +
 src/lib/ffmpeg_decoder.h       |  2 +-
 src/lib/film.cc                | 40 +++++++++++++++++++++++++---------------
 src/lib/film.h                 | 26 +++++++++++++++++---------
 src/lib/filter_graph.cc        |  1 +
 src/lib/filter_graph.h         |  6 +++---
 src/lib/format.cc              |  1 +
 src/lib/format.h               | 10 +++++-----
 src/lib/image.cc               |  1 +
 src/lib/image.h                | 14 +++++++-------
 src/lib/imagemagick_decoder.cc |  3 ++-
 src/lib/imagemagick_decoder.h  |  2 +-
 src/lib/make_dcp_job.cc        | 32 ++++++++------------------------
 src/lib/matcher.h              |  2 +-
 src/lib/server.cc              |  1 +
 src/lib/subtitle.cc            |  1 +
 src/lib/transcode_job.cc       | 15 +++++++++++++--
 src/lib/util.cc                | 11 +----------
 src/lib/util.h                 | 34 ++++------------------------------
 src/lib/video_decoder.h        |  2 +-
 src/wx/film_editor.cc          |  2 ++
 src/wx/film_viewer.cc          |  1 +
 src/wx/properties_dialog.cc    |  4 ++--
 test/metadata.ref              |  1 +
 test/test.cc                   | 14 +++++++-------
 30 files changed, 154 insertions(+), 157 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/check_hashes_job.cc b/src/lib/check_hashes_job.cc
index cf4e86b79..55a744552 100644
--- a/src/lib/check_hashes_job.cc
+++ b/src/lib/check_hashes_job.cc
@@ -53,16 +53,12 @@ CheckHashesJob::run ()
 {
 	_bad = 0;
 
-	if (!_film->dcp_length()) {
-		throw EncodeError ("cannot check hashes of a DCP with unknown length");
+	if (!_film->dcp_intrinsic_duration()) {
+		throw EncodeError ("cannot check hashes of a DCP with unknown intrinsic duration");
 	}
 	
-	SourceFrame const N = _film->trim_start() + _film->dcp_length().get();
-	DCPFrameRate const dfr (_film->frames_per_second ());
-
-	int const inc = dfr.skip ? 2 : 1;
-	
-	for (SourceFrame i = _film->trim_start(); i < N; i += inc) {
+	int const N = _film->dcp_intrinsic_duration().get();
+	for (int i = 0; i < N; ++i) {
 		string const j2k_file = _film->frame_out_path (i, false);
 		string const hash_file = _film->hash_out_path (i, false);
 
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index c00ed9b88..427d447ef 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -60,13 +60,14 @@ using std::string;
 using std::stringstream;
 using std::ofstream;
 using boost::shared_ptr;
+using libdcp::Size;
 
 /** Construct a DCP video frame.
  *  @param input Input image.
  *  @param out Required size of output, in pixels (including any padding).
  *  @param s Scaler to use.
  *  @param p Number of pixels of padding either side of the image.
- *  @param f Index of the frame within the Film's source.
+ *  @param f Index of the frame within the DCP's intrinsic duration.
  *  @param fps Frames per second of the Film's source.
  *  @param pp FFmpeg post-processing string to use.
  *  @param clut Colour look-up table to use (see Config::colour_lut_index ())
@@ -76,7 +77,7 @@ using boost::shared_ptr;
 DCPVideoFrame::DCPVideoFrame (
 	shared_ptr<const Image> yuv, shared_ptr<Subtitle> sub,
 	Size out, int p, int subtitle_offset, float subtitle_scale,
-	Scaler const * s, SourceFrame f, float fps, string pp, int clut, int bw, Log* l
+	Scaler const * s, int f, float fps, string pp, int clut, int bw, Log* l
 	)
 	: _input (yuv)
 	, _subtitle (sub)
@@ -373,10 +374,10 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
 
 /** Write this data to a J2K file.
  *  @param opt Options.
- *  @param frame Frame index.
+ *  @param frame DCP Frame index.
  */
 void
-EncodedData::write (shared_ptr<const Film> film, SourceFrame frame)
+EncodedData::write (shared_ptr<const Film> film, int frame)
 {
 	string const tmp_j2k = film->frame_out_path (frame, true);
 
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 1b75cb207..4271ebb28 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -50,7 +50,7 @@ public:
 	virtual ~EncodedData () {}
 
 	void send (boost::shared_ptr<Socket> socket);
-	void write (boost::shared_ptr<const Film>, SourceFrame);
+	void write (boost::shared_ptr<const Film>, int);
 
 	/** @return data */
 	uint8_t* data () const {
@@ -107,8 +107,8 @@ class DCPVideoFrame
 {
 public:
 	DCPVideoFrame (
-		boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, Size,
-		int, int, float, Scaler const *, SourceFrame, float, std::string, int, int, Log *
+		boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, libdcp::Size,
+		int, int, float, Scaler const *, int, float, std::string, int, int, Log *
 		);
 	
 	virtual ~DCPVideoFrame ();
@@ -116,7 +116,7 @@ public:
 	boost::shared_ptr<EncodedData> encode_locally ();
 	boost::shared_ptr<EncodedData> encode_remotely (ServerDescription const *);
 
-	SourceFrame frame () const {
+	int frame () const {
 		return _frame;
 	}
 	
@@ -125,12 +125,12 @@ private:
 
 	boost::shared_ptr<const Image> _input; ///< the input image
 	boost::shared_ptr<Subtitle> _subtitle; ///< any subtitle that should be on the image
-	Size _out_size;                  ///< the required size of the output, in pixels
+	libdcp::Size _out_size;                ///< the required size of the output, in pixels
 	int _padding;
 	int _subtitle_offset;
 	float _subtitle_scale;
 	Scaler const * _scaler;          ///< scaler to use
-	SourceFrame _frame;              ///< frame index within the Film's source
+	int _frame;                      ///< frame index within the DCP's intrinsic duration
 	int _frames_per_second;          ///< Frames per second that we will use for the DCP (rounded)
 	std::string _post_process;       ///< FFmpeg post-processing string to use
 	int _colour_lut;                 ///< Colour look-up table to use
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index c32d68834..6df7c85a1 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -54,12 +54,13 @@ int const Encoder::_history_size = 25;
 Encoder::Encoder (shared_ptr<const Film> f)
 	: _film (f)
 	, _just_skipped (false)
-	, _video_frame (0)
-	, _audio_frame (0)
+	, _video_frames_in (0)
+	, _audio_frames_in (0)
+	, _video_frames_out (0)
+	, _audio_frames_out (0)
 #ifdef HAVE_SWRESAMPLE	  
 	, _swr_context (0)
 #endif	  
-	, _audio_frames_written (0)
 	, _process_end (false)
 {
 	if (_film->audio_stream()) {
@@ -241,12 +242,12 @@ Encoder::skipping () const
 	return _just_skipped;
 }
 
-/** @return Number of video frames that have been received */
-SourceFrame
-Encoder::video_frame () const
+/** @return Number of video frames that have been sent out */
+int
+Encoder::video_frames_out () const
 {
 	boost::mutex::scoped_lock (_history_mutex);
-	return _video_frame;
+	return _video_frames_out;
 }
 
 /** Should be called when a frame has been encoded successfully.
@@ -281,8 +282,8 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 {
 	DCPFrameRate dfr (_film->frames_per_second ());
 	
-	if (dfr.skip && (_video_frame % 2)) {
-		++_video_frame;
+	if (dfr.skip && (_video_frames_in % 2)) {
+		++_video_frames_in;
 		return;
 	}
 
@@ -300,7 +301,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	}
 
 	/* Only do the processing if we don't already have a file for this frame */
-	if (boost::filesystem::exists (_film->frame_out_path (_video_frame, false))) {
+	if (boost::filesystem::exists (_film->frame_out_path (_video_frames_out, false))) {
 		frame_skipped ();
 		return;
 	}
@@ -310,7 +311,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		   as on windows the link is really a copy and the reference frame might not have
 		   finished encoding yet.
 		*/
-		_links_required.push_back (make_pair (_last_real_frame.get(), _video_frame));
+		_links_required.push_back (make_pair (_last_real_frame.get(), _video_frames_out));
 	} else {
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
@@ -319,17 +320,23 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 					  new DCPVideoFrame (
 						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
 						  _film->subtitle_offset(), _film->subtitle_scale(),
-						  _film->scaler(), _video_frame, _film->frames_per_second(), s.second,
+						  _film->scaler(), _video_frames_out, _film->frames_per_second(), s.second,
 						  _film->colour_lut(), _film->j2k_bandwidth(),
 						  _film->log()
 						  )
 					  ));
 		
 		_worker_condition.notify_all ();
-		_last_real_frame = _video_frame;
+		_last_real_frame = _video_frames_out;
 	}
 
-	++_video_frame;
+	++_video_frames_in;
+	++_video_frames_out;
+
+	if (dfr.repeat) {
+		_links_required.push_back (make_pair (_video_frames_out, _video_frames_out - 1));
+		++_video_frames_out;
+	}
 }
 
 void
@@ -378,7 +385,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 
 	write_audio (data);
 	
-	_audio_frame += data->frames ();
+	_audio_frames_in += data->frames ();
 }
 
 void
@@ -388,7 +395,7 @@ Encoder::write_audio (shared_ptr<const AudioBuffers> audio)
 		sf_write_float (_sound_files[i], audio->data(i), audio->frames());
 	}
 
-	_audio_frames_written += audio->frames ();
+	_audio_frames_out += audio->frames ();
 }
 
 void
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index d8edf9b26..20255cca9 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -82,7 +82,7 @@ public:
 
 	float current_frames_per_second () const;
 	bool skipping () const;
-	SourceFrame video_frame () const;
+	int video_frames_out () const;
 
 private:
 	
@@ -111,9 +111,13 @@ private:
 	bool _just_skipped;
 
 	/** Number of video frames received so far */
-	SourceFrame _video_frame;
+	SourceFrame _video_frames_in;
 	/** Number of audio frames received so far */
-	int64_t _audio_frame;
+	int64_t _audio_frames_in;
+	/** Number of video frames written for the DCP so far */
+	int _video_frames_out;
+	/** Number of audio frames written for the DCP so far */
+	int64_t _audio_frames_out;
 
 #if HAVE_SWRESAMPLE	
 	SwrContext* _swr_context;
@@ -122,11 +126,11 @@ private:
 	/** List of links that we need to create when all frames have been processed;
 	 *  such that we need to call link (first, second) for each member of this list.
 	 *  In other words, `first' is a `real' frame and `second' should be a link to `first'.
+	 *  Frames are DCP frames.
 	 */
 	std::list<std::pair<int, int> > _links_required;
 
 	std::vector<SNDFILE*> _sound_files;
-	int64_t _audio_frames_written;
 
 	boost::optional<int> _last_real_frame;
 	bool _process_end;
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 9e5cda889..e7dfc206b 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -58,6 +58,7 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using libdcp::Size;
 
 FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, DecodeOptions o, Job* j)
 	: Decoder (f, o, j)
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 51b88a24a..9a4e65ebc 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -90,7 +90,7 @@ public:
 	~FFmpegDecoder ();
 
 	float frames_per_second () const;
-	Size native_size () const;
+	libdcp::Size native_size () const;
 	SourceFrame length () const;
 	int time_base_numerator () const;
 	int time_base_denominator () const;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 2af8d3c14..1741d49e6 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -72,6 +72,7 @@ using boost::to_upper_copy;
 using boost::ends_with;
 using boost::starts_with;
 using boost::optional;
+using libdcp::Size;
 
 int const Film::state_version = 2;
 
@@ -180,6 +181,7 @@ Film::Film (Film const & o)
 	, _package_type      (o._package_type)
 	, _size              (o._size)
 	, _length            (o._length)
+	, _dcp_intrinsic_duration (o._dcp_intrinsic_duration)
 	, _content_digest    (o._content_digest)
 	, _content_audio_streams (o._content_audio_streams)
 	, _external_audio_stream (o._external_audio_stream)
@@ -423,6 +425,7 @@ Film::write_metadata () const
 	f << "width " << _size.width << "\n";
 	f << "height " << _size.height << "\n";
 	f << "length " << _length.get_value_or(0) << "\n";
+	f << "dcp_intrinsic_duration " << _dcp_intrinsic_duration.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) {
@@ -569,6 +572,11 @@ Film::read_metadata ()
 			if (vv) {
 				_length = vv;
 			}
+		} else if (k == "dcp_intrinsic_duration") {
+			int const vv = atoi (v.c_str ());
+			if (vv) {
+				_dcp_intrinsic_duration = vv;
+			}
 		} else if (k == "content_digest") {
 			_content_digest = v;
 		} else if (k == "content_audio_stream" || (!version && k == "audio_stream")) {
@@ -695,18 +703,10 @@ Film::target_audio_sample_rate () const
 	return rint (t);
 }
 
-boost::optional<int>
-Film::dcp_length () const
+int
+Film::still_duration_in_frames () const
 {
-	if (content_type() == STILL) {
-		return _still_duration * frames_per_second();
-	}
-	
-	if (!length()) {
-		return boost::optional<int> ();
-	}
-
-	return length().get() - trim_start() - trim_end();
+	return still_duration() * frames_per_second();
 }
 
 /** @return a DCI-compliant name for a DCP of this film */
@@ -1327,7 +1327,17 @@ Film::unset_length ()
 		_length = boost::none;
 	}
 	signal_changed (LENGTH);
-}	
+}
+
+void
+Film::set_dcp_intrinsic_duration (int d)
+{
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_dcp_intrinsic_duration = d;
+	}
+	signal_changed (DCP_INTRINSIC_DURATION);
+}
 
 void
 Film::set_content_digest (string d)
@@ -1409,12 +1419,12 @@ Film::audio_stream () const
 	return _external_audio_stream;
 }
 
-/** @param f Source frame index.
+/** @param f DCP frame index.
  *  @param t true to return a temporary file path, otherwise a permanent one.
  *  @return The path to write this video frame to.
  */
 string
-Film::frame_out_path (SourceFrame f, bool t) const
+Film::frame_out_path (int f, bool t) const
 {
 	stringstream s;
 	s << j2k_dir() << "/";
@@ -1429,7 +1439,7 @@ Film::frame_out_path (SourceFrame f, bool t) const
 }
 
 string
-Film::hash_out_path (SourceFrame f, bool t) const
+Film::hash_out_path (int f, bool t) const
 {
 	return frame_out_path (f, t) + ".md5";
 }
diff --git a/src/lib/film.h b/src/lib/film.h
index b03d84920..e10abfa4b 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -78,8 +78,8 @@ public:
 	std::string file (std::string f) const;
 	std::string dir (std::string d) const;
 
-	std::string frame_out_path (SourceFrame f, bool t) const;
-	std::string hash_out_path (SourceFrame f, bool t) const;
+	std::string frame_out_path (int f, bool t) const;
+	std::string hash_out_path (int f, bool t) const;
 	std::string multichannel_audio_out_path (int c, bool t) const;
 	
 	std::string content_path () const;
@@ -90,11 +90,14 @@ public:
 	void write_metadata () const;
 	void read_metadata ();
 
-	Size cropped_size (Size) const;
-	boost::optional<int> dcp_length () const;
+	libdcp::Size cropped_size (libdcp::Size) const;
 	std::string dci_name () const;
 	std::string dcp_name () const;
 
+	boost::optional<int> dcp_intrinsic_duration () const {
+		return _dcp_intrinsic_duration;
+	}
+
 	/** @return true if our state has changed since we last saved it */
 	bool dirty () const {
 		return _dirty;
@@ -137,6 +140,7 @@ public:
 		DCI_METADATA,
 		SIZE,
 		LENGTH,
+		DCP_INTRINSIC_DURATION,
 		CONTENT_AUDIO_STREAMS,
 		SUBTITLE_STREAMS,
 		FRAMES_PER_SECOND,
@@ -195,12 +199,12 @@ public:
 		return _scaler;
 	}
 
-	SourceFrame trim_start () const {
+	int trim_start () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _trim_start;
 	}
 
-	SourceFrame trim_end () const {
+	int trim_end () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _trim_end;
 	}
@@ -245,6 +249,8 @@ public:
 		return _still_duration;
 	}
 
+	int still_duration_in_frames () const;
+
 	boost::shared_ptr<SubtitleStream> subtitle_stream () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _subtitle_stream;
@@ -310,7 +316,7 @@ public:
 		return _package_type;
 	}
 
-	Size size () const {
+	libdcp::Size size () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _size;
 	}
@@ -387,9 +393,10 @@ public:
 	void set_studio (std::string);
 	void set_facility (std::string);
 	void set_package_type (std::string);
-	void set_size (Size);
+	void set_size (libdcp::Size);
 	void set_length (SourceFrame);
 	void unset_length ();
+	void set_dcp_intrinsic_duration (int);
 	void set_content_digest (std::string);
 	void set_content_audio_streams (std::vector<boost::shared_ptr<AudioStream> >);
 	void set_subtitle_streams (std::vector<boost::shared_ptr<SubtitleStream> >);
@@ -499,9 +506,10 @@ private:
 	/* Data which are cached to speed things up */
 
 	/** Size, in pixels, of the source (ignoring cropping) */
-	Size _size;
+	libdcp::Size _size;
 	/** The length of the source, in video frames (as far as we know) */
 	boost::optional<SourceFrame> _length;
+	boost::optional<int> _dcp_intrinsic_duration;
 	/** MD5 digest of our content file */
 	std::string _content_digest;
 	/** The audio streams in our content */
diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 376ab404f..86864a762 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -47,6 +47,7 @@ using std::stringstream;
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using libdcp::Size;
 
 /** Construct a FilterGraph for the settings in a film.
  *  @param film Film.
diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 9e6ac6252..7e4e8422b 100644
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -37,15 +37,15 @@ class FFmpegDecoder;
 class FilterGraph
 {
 public:
-	FilterGraph (boost::shared_ptr<Film> film, FFmpegDecoder* decoder, Size s, AVPixelFormat p);
+	FilterGraph (boost::shared_ptr<Film> film, FFmpegDecoder* decoder, libdcp::Size s, AVPixelFormat p);
 
-	bool can_process (Size s, AVPixelFormat p) const;
+	bool can_process (libdcp::Size s, AVPixelFormat p) const;
 	std::list<boost::shared_ptr<Image> > process (AVFrame const * frame);
 
 private:
 	AVFilterContext* _buffer_src_context;
 	AVFilterContext* _buffer_sink_context;
-	Size _size; ///< size of the images that this chain can process
+	libdcp::Size _size; ///< size of the images that this chain can process
 	AVPixelFormat _pixel_format; ///< pixel format of the images that this chain can process
 };
 
diff --git a/src/lib/format.cc b/src/lib/format.cc
index 975862411..a80fab619 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -35,6 +35,7 @@ using std::setprecision;
 using std::stringstream;
 using std::vector;
 using boost::shared_ptr;
+using libdcp::Size;
 
 vector<Format const *> Format::_formats;
 
diff --git a/src/lib/format.h b/src/lib/format.h
index 2118237a4..48a000480 100644
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -31,7 +31,7 @@ class Film;
 class Format
 {
 public:
-	Format (Size dcp, std::string id, std::string n, std::string d)
+	Format (libdcp::Size dcp, std::string id, std::string n, std::string d)
 		: _dcp_size (dcp)
 		, _id (id)
 		, _nickname (n)
@@ -52,7 +52,7 @@ public:
 	 *  put in a DCP for this ratio.  This size will not correspond
 	 *  to the ratio when we are doing things like 16:9 in a Flat frame.
 	 */
-	Size dcp_size () const {
+	libdcp::Size dcp_size () const {
 		return _dcp_size;
 	}
 
@@ -85,7 +85,7 @@ protected:
 	 *  put in a DCP for this ratio.  This size will not correspond
 	 *  to the ratio when we are doing things like 16:9 in a Flat frame.
 	 */
-	Size _dcp_size;
+	libdcp::Size _dcp_size;
 	/** id for use in metadata */
 	std::string _id;
 	/** nickname (e.g. Flat, Scope) */
@@ -104,7 +104,7 @@ private:
 class FixedFormat : public Format
 {
 public:
-	FixedFormat (int, Size, std::string, std::string, std::string);
+	FixedFormat (int, libdcp::Size, std::string, std::string, std::string);
 
 	int ratio_as_integer (boost::shared_ptr<const Film>) const {
 		return _ratio;
@@ -125,7 +125,7 @@ private:
 class VariableFormat : public Format
 {
 public:
-	VariableFormat (Size, std::string, std::string, std::string);
+	VariableFormat (libdcp::Size, std::string, std::string, std::string);
 
 	int ratio_as_integer (boost::shared_ptr<const Film> f) const;
 	float ratio_as_float (boost::shared_ptr<const Film> f) const;
diff --git a/src/lib/image.cc b/src/lib/image.cc
index f774f476f..c41558f02 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -42,6 +42,7 @@ extern "C" {
 
 using namespace std;
 using namespace boost;
+using libdcp::Size;
 
 void
 Image::swap (Image& other)
diff --git a/src/lib/image.h b/src/lib/image.h
index e19c6f54b..5ca3f337c 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -66,13 +66,13 @@ public:
 	virtual int * stride () const = 0;
 
 	/** @return Size of the image, in pixels */
-	virtual Size size () const = 0;
+	virtual libdcp::Size size () const = 0;
 
 	int components () const;
 	int lines (int) const;
 
-	boost::shared_ptr<Image> scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scaler, bool aligned) const;
-	boost::shared_ptr<Image> scale (Size, Scaler const *, bool aligned) const;
+	boost::shared_ptr<Image> scale_and_convert_to_rgb (libdcp::Size out_size, int padding, Scaler const * scaler, bool aligned) const;
+	boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, bool aligned) const;
 	boost::shared_ptr<Image> post_process (std::string, bool aligned) const;
 	void alpha_blend (boost::shared_ptr<const Image> image, Position pos);
 	boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
@@ -106,7 +106,7 @@ public:
 	uint8_t ** data () const;
 	int * line_size () const;
 	int * stride () const;
-	Size size () const;
+	libdcp::Size size () const;
 
 private:
 	/* Not allowed */
@@ -122,7 +122,7 @@ private:
 class SimpleImage : public Image
 {
 public:
-	SimpleImage (AVPixelFormat, Size, bool);
+	SimpleImage (AVPixelFormat, libdcp::Size, bool);
 	SimpleImage (SimpleImage const &);
 	SimpleImage& operator= (SimpleImage const &);
 	~SimpleImage ();
@@ -130,14 +130,14 @@ public:
 	uint8_t ** data () const;
 	int * line_size () const;
 	int * stride () const;
-	Size size () const;
+	libdcp::Size size () const;
 
 protected:
 	void allocate ();
 	void swap (SimpleImage &);
 	
 private:
-	Size _size; ///< size in pixels
+	libdcp::Size _size; ///< size in pixels
 	uint8_t** _data; ///< array of pointers to components
 	int* _line_size; ///< array of sizes of the data in each line, in pixels (without any alignment padding bytes)
 	int* _stride; ///< array of strides for each line (including any alignment padding bytes)
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 063730540..bab4f2f07 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -27,6 +27,7 @@
 
 using std::cout;
 using boost::shared_ptr;
+using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (
 	boost::shared_ptr<Film> f, DecodeOptions o, Job* j)
@@ -70,7 +71,7 @@ bool
 ImageMagickDecoder::pass ()
 {
 	if (_iter == _files.end()) {
-		if (!_film->dcp_length() || video_frame() >= _film->dcp_length().get()) {
+		if (video_frame() >= _film->still_duration_in_frames()) {
 			return true;
 		}
 
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 5dfcab6f0..84a6f15f9 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -33,7 +33,7 @@ public:
 		return 0;
 	}
 
-	Size native_size () const;
+	libdcp::Size native_size () const;
 
 	SourceFrame length () const {
 		/* We don't know */
diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index 3603298d9..6877e5e88 100644
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -61,10 +61,7 @@ MakeDCPJob::name () const
 string
 MakeDCPJob::j2c_path (int f, int offset) const
 {
-	DCPFrameRate dfr (_film->frames_per_second());
-	int const mult = dfr.skip ? 2 : 1;
-	SourceFrame const s = ((f + offset) * mult) + _film->trim_start();
-	return _film->frame_out_path (s, false);
+	return _film->frame_out_path (f, false);
 }
 
 string
@@ -76,8 +73,8 @@ MakeDCPJob::wav_path (libdcp::Channel c) const
 void
 MakeDCPJob::run ()
 {
-	if (!_film->dcp_length()) {
-		throw EncodeError ("cannot make a DCP when the source length is not known");
+	if (!_film->dcp_intrinsic_duration()) {
+		throw EncodeError ("cannot make a DCP when its intrinsic duration is not known");
 	}
 
 	descend (0.9);
@@ -87,22 +84,10 @@ MakeDCPJob::run ()
 	/* Remove any old DCP */
 	boost::filesystem::remove_all (dcp_path);
 
+	int const frames = _film->dcp_intrinsic_duration().get();
+	int const duration = frames - _film->trim_start() - _film->trim_end();
 	DCPFrameRate const dfr (_film->frames_per_second ());
 
-	int frames = 0;
-	switch (_film->content_type ()) {
-	case VIDEO:
-		/* Source frames -> DCP frames */
-		frames = _film->dcp_length().get();
-		if (dfr.skip) {
-			frames /= 2;
-		}
-		break;
-	case STILL:
-		frames = _film->still_duration() * 24;
-		break;
-	}
-
 	libdcp::DCP dcp (_film->dir (_film->dcp_name()));
 	dcp.Progress.connect (boost::bind (&MakeDCPJob::dcp_progress, this, _1));
 
@@ -138,13 +123,12 @@ MakeDCPJob::run ()
 				&dcp.Progress,
 				dfr.frames_per_second,
 				this_time,
-				_film->format()->dcp_size().width,
-				_film->format()->dcp_size().height
+				_film->format()->dcp_size()
 				)
 			);
 
 		pa->set_entry_point (_film->trim_start ());
-		pa->set_duration (_film->duration ());
+		pa->set_duration (duration);
 	
 		ascend ();
 		
@@ -166,7 +150,7 @@ MakeDCPJob::run ()
 				);
 
 			sa->set_entry_point (_film->trim_start ());
-			sa->set_duration (_film->duration ());
+			sa->set_duration (duration);
 			
 			ascend ();
 		}
diff --git a/src/lib/matcher.h b/src/lib/matcher.h
index b94c28446..60bb87432 100644
--- a/src/lib/matcher.h
+++ b/src/lib/matcher.h
@@ -35,6 +35,6 @@ private:
 	int _video_frames;
 	int64_t _audio_frames;
 	boost::optional<AVPixelFormat> _pixel_format;
-	boost::optional<Size> _size;
+	boost::optional<libdcp::Size> _size;
 	boost::optional<int> _channels;
 };
diff --git a/src/lib/server.cc b/src/lib/server.cc
index bea75cff8..134cb65a0 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -45,6 +45,7 @@ using boost::algorithm::is_any_of;
 using boost::algorithm::split;
 using boost::thread;
 using boost::bind;
+using libdcp::Size;
 
 /** Create a server description from a string of metadata returned from as_metadata().
  *  @param v Metadata.
diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
index c52d3ac66..a7aa7cd21 100644
--- a/src/lib/subtitle.cc
+++ b/src/lib/subtitle.cc
@@ -27,6 +27,7 @@
 
 using namespace std;
 using namespace boost;
+using libdcp::Size;
 
 /** Construct a TimedSubtitle.  This is a subtitle image, position,
  *  and a range of time over which it should be shown.
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index c9792ed2e..6dd74c36c 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -67,7 +67,10 @@ TranscodeJob::run ()
 		set_progress (1);
 		set_state (FINISHED_OK);
 
+		_film->set_dcp_intrinsic_duration (_encoder->video_frames_out ());
+
 		_film->log()->log ("Transcode job completed successfully");
+		_film->log()->log (String::compose ("DCP intrinsic duration is %1", _encoder->video_frames_out()));
 
 	} catch (std::exception& e) {
 
@@ -115,11 +118,19 @@ TranscodeJob::remaining_time () const
 		return 0;
 	}
 
-	if (!_film->dcp_length()) {
+	if (!_film->length()) {
 		return 0;
 	}
 
+	/* Compute approximate proposed length here, as it's only here that we need it */
+	int length = _film->length().get();
+	DCPFrameRate const dfr (_film->frames_per_second ());
+	if (dfr.skip) {
+		length /= 2;
+	}
+	/* If we are repeating it shouldn't affect transcode time, so don't take it into account */
+
 	/* We assume that dcp_length() is valid, if it is set */
-	SourceFrame const left = _film->trim_start() + _film->dcp_length().get() - _encoder->video_frame();
+	int const left = length - _encoder->video_frames_out();
 	return left / fps;
 }
diff --git a/src/lib/util.cc b/src/lib/util.cc
index b500ddc2f..0e250bb08 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -63,6 +63,7 @@ extern "C" {
 
 using namespace std;
 using namespace boost;
+using libdcp::Size;
 
 thread::id ui_thread;
 
@@ -455,16 +456,6 @@ dcp_audio_channels (int f)
 }
 
 
-bool operator== (Size const & a, Size const & b)
-{
-	return (a.width == b.width && a.height == b.height);
-}
-
-bool operator!= (Size const & a, Size const & b)
-{
-	return !(a == b);
-}
-
 bool operator== (Crop const & a, Crop const & b)
 {
 	return (a.left == b.left && a.right == b.right && a.top == b.top && a.bottom == b.bottom);
diff --git a/src/lib/util.h b/src/lib/util.h
index 1fd2c0150..c4940a5d7 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -29,6 +29,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <boost/asio.hpp>
+#include <libdcp/util.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
@@ -99,33 +100,6 @@ enum ContentType {
 	VIDEO  ///< content is a video
 };
 
-/** @class Size
- *  @brief Representation of the size of something */
-struct Size
-{
-	/** Construct a zero Size */
-	Size ()
-		: width (0)
-		, height (0)
-	{}
-
-	/** @param w Width.
-	 *  @param h Height.
-	 */
-	Size (int w, int h)
-		: width (w)
-		, height (h)
-	{}
-
-	/** width */
-	int width;
-	/** height */
-	int height;
-};
-
-extern bool operator== (Size const & a, Size const & b);
-extern bool operator!= (Size const & a, Size const & b);
-
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
  */
@@ -195,14 +169,14 @@ struct Rect
 		return Position (x, y);
 	}
 
-	Size size () const {
-		return Size (width, height);
+	libdcp::Size size () const {
+		return libdcp::Size (width, height);
 	}
 
 	Rect intersection (Rect const & other) const;
 };
 
-extern std::string crop_string (Position, Size);
+extern std::string crop_string (Position, libdcp::Size);
 extern int dcp_audio_sample_rate (int);
 extern int dcp_audio_channels (int);
 extern std::string colour_lut_index_to_name (int index);
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c0eab2140..ef1ab041a 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -32,7 +32,7 @@ public:
 	/** @return video frames per second, or 0 if unknown */
 	virtual float frames_per_second () const = 0;
 	/** @return native size in pixels */
-	virtual Size native_size () const = 0;
+	virtual libdcp::Size native_size () const = 0;
 	/** @return length (in source video frames), according to our content's header */
 	virtual SourceFrame length () const = 0;
 
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index f83518b88..bbaeb17c4 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -665,6 +665,8 @@ FilmEditor::film_changed (Film::Property p)
 			_trim_end->SetRange (0, _film->length().get());
 		}
 		break;
+	case Film::DCP_INTRINSIC_DURATION:
+		break;
 	case Film::DCP_CONTENT_TYPE:
 		checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
 		_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 347531cc2..e5da41d5e 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -44,6 +44,7 @@ using std::max;
 using std::cout;
 using std::list;
 using boost::shared_ptr;
+using libdcp::Size;
 
 FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
 	: wxPanel (p)
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index c34922ec4..0cf75cf51 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -91,9 +91,9 @@ PropertiesDialog::frames_already_encoded () const
 		return "";
 	}
 	
-	if (_film->dcp_length()) {
+	if (_film->length()) {
 		/* XXX: encoded_frames() should check which frames have been encoded */
-		u << " (" << ((_film->encoded_frames() - _film->trim_start()) * 100 / _film->dcp_length().get()) << "%)";
+		u << " (" << (_film->encoded_frames() * 100 / _film->length().get()) << "%)";
 	}
 	return u.str ();
 }
diff --git a/test/metadata.ref b/test/metadata.ref
index 90255e916..ff0c25118 100644
--- a/test/metadata.ref
+++ b/test/metadata.ref
@@ -34,6 +34,7 @@ package_type
 width 0
 height 0
 length 0
+dcp_intrinsic_duration 0
 content_digest 
 external_audio_stream external 0 0
 frames_per_second 0
diff --git a/test/test.cc b/test/test.cc
index 9143b87d5..7e1d92e06 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -325,7 +325,7 @@ do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription* descriptio
 
 BOOST_AUTO_TEST_CASE (client_server_test)
 {
-	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, Size (1998, 1080), false));
+	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, libdcp::Size (1998, 1080), false));
 	uint8_t* p = image->data()[0];
 	
 	for (int y = 0; y < 1080; ++y) {
@@ -336,7 +336,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 		}
 	}
 
-	shared_ptr<Image> sub_image (new SimpleImage (PIX_FMT_RGBA, Size (100, 200), false));
+	shared_ptr<Image> sub_image (new SimpleImage (PIX_FMT_RGBA, libdcp::Size (100, 200), false));
 	p = sub_image->data()[0];
 	for (int y = 0; y < 200; ++y) {
 		for (int x = 0; x < 100; ++x) {
@@ -355,7 +355,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 		new DCPVideoFrame (
 			image,
 			subtitle,
-			Size (1998, 1080),
+			libdcp::Size (1998, 1080),
 			0,
 			0,
 			1,
@@ -636,7 +636,7 @@ BOOST_AUTO_TEST_CASE (job_manager_test)
 
 BOOST_AUTO_TEST_CASE (compact_image_test)
 {
-	SimpleImage* s = new SimpleImage (PIX_FMT_RGB24, Size (50, 50), false);
+	SimpleImage* s = new SimpleImage (PIX_FMT_RGB24, libdcp::Size (50, 50), false);
 	BOOST_CHECK_EQUAL (s->components(), 1);
 	BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
 	BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
@@ -662,7 +662,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 	BOOST_CHECK (t->stride()[0] == s->stride()[0]);
 
 	/* assignment operator */
-	SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, Size (150, 150), true);
+	SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, libdcp::Size (150, 150), true);
 	*u = *s;
 	BOOST_CHECK_EQUAL (u->components(), 1);
 	BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
@@ -685,7 +685,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 
 BOOST_AUTO_TEST_CASE (aligned_image_test)
 {
-	SimpleImage* s = new SimpleImage (PIX_FMT_RGB24, Size (50, 50), true);
+	SimpleImage* s = new SimpleImage (PIX_FMT_RGB24, libdcp::Size (50, 50), true);
 	BOOST_CHECK_EQUAL (s->components(), 1);
 	/* 160 is 150 aligned to the nearest 32 bytes */
 	BOOST_CHECK_EQUAL (s->stride()[0], 160);
@@ -712,7 +712,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 	BOOST_CHECK (t->stride()[0] == s->stride()[0]);
 
 	/* assignment operator */
-	SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, Size (150, 150), false);
+	SimpleImage* u = new SimpleImage (PIX_FMT_YUV422P, libdcp::Size (150, 150), false);
 	*u = *s;
 	BOOST_CHECK_EQUAL (u->components(), 1);
 	BOOST_CHECK_EQUAL (u->stride()[0], 160);
-- 
cgit v1.2.3


From cadd50fe2609a1ad9963389d65d8e91f85226752 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Jan 2013 23:42:59 +0000
Subject: Sort of works to a first-order approximation.

---
 src/lib/dcp_video_frame.cc |  15 +++++
 src/lib/dcp_video_frame.h  |   2 +
 src/lib/encoder.cc         | 148 ++++++++++++++++++++++++++++++++++-----------
 src/lib/encoder.h          |  25 +++++---
 4 files changed, 146 insertions(+), 44 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 1c408270e..da864ad9f 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -380,6 +380,21 @@ EncodedData::EncodedData (int s)
 
 }
 
+EncodedData::EncodedData (string file)
+{
+	_size = boost::filesystem::file_size (file);
+	_data = new uint8_t[_size];
+
+	FILE* f = fopen (file.c_str(), "rb");
+	if (!f) {
+		throw FileError ("could not open file for reading", file);
+	}
+	
+	fread (_data, 1, _size, f);
+	fclose (f);
+}
+
+
 EncodedData::~EncodedData ()
 {
 	delete[] _data;
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index e311724d8..b446352c7 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -43,6 +43,8 @@ public:
 	 */
 	EncodedData (int s);
 
+	EncodedData (std::string f);
+
 	virtual ~EncodedData ();
 
 	void send (boost::shared_ptr<Socket> socket);
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 0f48310ef..c6960d0d1 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -24,6 +24,7 @@
 #include <iostream>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
+#include <libdcp/picture_asset.h>
 #include "encoder.h"
 #include "util.h"
 #include "options.h"
@@ -47,6 +48,7 @@ using std::make_pair;
 using namespace boost;
 
 int const Encoder::_history_size = 25;
+unsigned int const Encoder::_maximum_frames_in_memory = 8;
 
 /** @param f Film that we are encoding.
  *  @param o Options.
@@ -60,10 +62,12 @@ Encoder::Encoder (shared_ptr<const Film> f)
 	, _audio_frames_out (0)
 #ifdef HAVE_SWRESAMPLE	  
 	, _swr_context (0)
-#endif	  
+#endif
+	, _have_a_real_frame (false)
 	, _terminate_encoder (false)
 	, _writer_thread (0)
-	, _terminate_writer (false)
+	, _finish_writer (false)
+	, _last_written_frame (-1)
 {
 	if (_film->audio_stream()) {
 		/* Create sound output files with .tmp suffixes; we will rename
@@ -88,7 +92,7 @@ Encoder::~Encoder ()
 {
 	close_sound_files ();
 	terminate_worker_threads ();
-	terminate_writer_thread ();
+	finish_writer_thread ();
 }
 
 void
@@ -135,6 +139,17 @@ Encoder::process_begin ()
 		}
 	}
 
+	/* XXX! */
+	_picture_asset.reset (
+		new libdcp::MonoPictureAsset (
+			_film->dir (_film->dcp_name()),
+			String::compose ("video_%1.mxf", 0),
+			DCPFrameRate (_film->frames_per_second()).frames_per_second,
+			_film->format()->dcp_size()
+			)
+		);
+	
+	_picture_asset_writer = _picture_asset->start_write ();
 	_writer_thread = new boost::thread (boost::bind (&Encoder::writer_thread, this));
 }
 
@@ -192,7 +207,6 @@ Encoder::process_end ()
 	lock.unlock ();
 	
 	terminate_worker_threads ();
-	terminate_writer_thread ();
 
 	_film->log()->log ("Mopping up " + lexical_cast<string> (_encode_queue.size()));
 
@@ -209,23 +223,19 @@ Encoder::process_end ()
 		_film->log()->log (String::compose ("Encode left-over frame %1", (*i)->frame ()));
 		try {
 			shared_ptr<EncodedData> e = (*i)->encode_locally ();
-			e->write (_film, (*i)->frame ());
+			{
+				boost::mutex::scoped_lock lock2 (_writer_mutex);
+				_write_queue.push_back (make_pair (e, (*i)->frame ()));
+				_writer_condition.notify_all ();
+			}
 			frame_done ();
 		} catch (std::exception& e) {
 			_film->log()->log (String::compose ("Local encode failed (%1)", e.what ()));
 		}
 	}
 
-	/* Mop up any unwritten things in the writer's queue */
-	for (list<pair<shared_ptr<EncodedData>, int> >::iterator i = _write_queue.begin(); i != _write_queue.end(); ++i) {
-		i->first->write (_opt, i->second);
-	}
-
-	/* Now do links (or copies on windows) to duplicate frames */
-	for (list<pair<int, int> >::iterator i = _links_required.begin(); i != _links_required.end(); ++i) {
-		link (_film->frame_out_path (i->first, false), _film->frame_out_path (i->second, false));
-		link (_film->hash_out_path (i->first, false), _film->hash_out_path (i->second, false));
-	}
+	finish_writer_thread ();
+	_picture_asset_writer->finalize ();
 }	
 
 /** @return an estimate of the current number of frames we are encoding per second,
@@ -317,12 +327,13 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		return;
 	}
 
-	if (same && _last_real_frame) {
-		/* Use the last frame that we encoded.  We need to postpone doing the actual link,
-		   as on windows the link is really a copy and the reference frame might not have
-		   finished encoding yet.
+	if (same && _have_a_real_frame) {
+		/* Use the last frame that we encoded.  We do this by putting a null encoded
+		   frame straight onto the writer's queue.  It will know to duplicate the previous frame
+		   in this case.
 		*/
-		_links_required.push_back (make_pair (_last_real_frame.get(), _video_frames_out));
+		boost::mutex::scoped_lock lock2 (_writer_mutex);
+		_write_queue.push_back (make_pair (shared_ptr<EncodedData> (), _video_frames_out));
 	} else {
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
@@ -338,14 +349,15 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 					  ));
 		
 		_worker_condition.notify_all ();
-		_last_real_frame = _video_frames_out;
+		_have_a_real_frame = true;
 	}
 
 	++_video_frames_in;
 	++_video_frames_out;
 
 	if (dfr.repeat) {
-		_links_required.push_back (make_pair (_video_frames_out, _video_frames_out - 1));
+		boost::mutex::scoped_lock lock2 (_writer_mutex);
+		_write_queue.push_back (make_pair (shared_ptr<EncodedData> (), _video_frames_out));
 		++_video_frames_out;
 	}
 }
@@ -434,14 +446,14 @@ Encoder::terminate_worker_threads ()
 }
 
 void
-Encoder::terminate_writer_thread ()
+Encoder::finish_writer_thread ()
 {
 	if (!_writer_thread) {
 		return;
 	}
 	
 	boost::mutex::scoped_lock lock (_writer_mutex);
-	_terminate_writer = true;
+	_finish_writer = true;
 	_writer_condition.notify_all ();
 	lock.unlock ();
 
@@ -550,27 +562,95 @@ Encoder::link (string a, string b) const
 #endif			
 }
 
+struct WriteQueueSorter
+{
+	bool operator() (pair<shared_ptr<EncodedData>, int> const & a, pair<shared_ptr<EncodedData>, int> const & b) {
+		return a.second < b.second;
+	}
+};
+
 void
 Encoder::writer_thread ()
 {
 	while (1)
 	{
 		boost::mutex::scoped_lock lock (_writer_mutex);
-		TIMING ("writer sleeps with a queue of %1", _write_queue.size());
-		while (_write_queue.empty() && !_terminate_writer) {
-			_writer_condition.wait (lock);
+
+		while (1) {
+			if (_finish_writer ||
+			    _write_queue.size() > _maximum_frames_in_memory ||
+			    (!_write_queue.empty() && _write_queue.front().second == (_last_written_frame + 1))) {
+				    
+				    break;
+			    }
+
+			    TIMING ("writer sleeps with a queue of %1; %2 pending", _write_queue.size(), _pending.size());
+			    _writer_condition.wait (lock);
+			    TIMING ("writer wakes with a queue of %1", _write_queue.size());
+
+			    _write_queue.sort (WriteQueueSorter ());
 		}
-		TIMING ("writer wakes with a queue of %1", _write_queue.size());
 
-		if (_terminate_writer) {
+		if (_finish_writer && _write_queue.empty() && _pending.empty()) {
 			return;
 		}
 
-		pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.front ();
-		_write_queue.pop_front ();
+		/* Write any frames that we can write; i.e. those that are in sequence */
+		while (!_write_queue.empty() && _write_queue.front().second == (_last_written_frame + 1)) {
+			pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.front ();
+			_write_queue.pop_front ();
 
-		lock.unlock ();
-		encoded.first->write (_opt, encoded.second);
-		lock.lock ();
+			lock.unlock ();
+			/* XXX: write to mxf */
+			_film->log()->log (String::compose ("Writer writes %1 to MXF", encoded.second));
+			if (encoded.first) {
+				_picture_asset_writer->write (encoded.first->data(), encoded.first->size());
+				_last_written = encoded.first;
+			} else {
+				_picture_asset_writer->write (_last_written->data(), _last_written->size());
+			}
+			lock.lock ();
+
+			++_last_written_frame;
+		}
+
+		while (_write_queue.size() > _maximum_frames_in_memory) {
+			/* Too many frames in memory which can't yet be written to the stream.
+			   Put some to disk.
+			*/
+
+			pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.front ();
+			_write_queue.pop_back ();
+			if (!encoded.first) {
+				/* This is a `repeat-last' frame, so no need to write it to disk */
+				continue;
+			}
+
+			lock.unlock ();
+			_film->log()->log (String::compose ("Writer full; pushes %1 to disk", encoded.second));
+			encoded.first->write (_film, encoded.second);
+			lock.lock ();
+
+			_pending.push_back (encoded.second);
+		}
+
+		while (_write_queue.size() < _maximum_frames_in_memory && !_pending.empty()) {
+			/* We have some space in memory.  Fetch some frames back off disk. */
+
+			_pending.sort ();
+			int const fetch = _pending.front ();
+
+			lock.unlock ();
+			_film->log()->log (String::compose ("Writer pulls %1 back from disk", fetch));
+			shared_ptr<EncodedData> encoded;
+			if (boost::filesystem::exists (_film->frame_out_path (fetch, false))) {
+				/* It's an actual frame (not a repeat-last); load it in */
+				encoded.reset (new EncodedData (_film->frame_out_path (fetch, false)));
+			}
+			lock.lock ();
+
+			_write_queue.push_back (make_pair (encoded, fetch));
+			_pending.remove (fetch);
+		}
 	}
 }
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 96e7a1d25..3e2b5d957 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -52,6 +52,11 @@ class ServerDescription;
 class DCPVideoFrame;
 class EncodedData;
 
+namespace libdcp {
+	class MonoPictureAsset;
+	class MonoPictureAssetWriter;
+}
+
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
  *
@@ -121,22 +126,15 @@ private:
 	int64_t _audio_frames_out;
 
 	void writer_thread ();
-	void terminate_writer_thread ();
+	void finish_writer_thread ();
 
 #if HAVE_SWRESAMPLE	
 	SwrContext* _swr_context;
 #endif
 
-	/** List of links that we need to create when all frames have been processed;
-	 *  such that we need to call link (first, second) for each member of this list.
-	 *  In other words, `first' is a `real' frame and `second' should be a link to `first'.
-	 *  Frames are DCP frames.
-	 */
-	std::list<std::pair<int, int> > _links_required;
-
 	std::vector<SNDFILE*> _sound_files;
 
-	boost::optional<int> _last_real_frame;
+	bool _have_a_real_frame;
 	bool _terminate_encoder;
 	std::list<boost::shared_ptr<DCPVideoFrame> > _encode_queue;
 	std::list<boost::thread *> _worker_threads;
@@ -144,10 +142,17 @@ private:
 	boost::condition _worker_condition;
 
 	boost::thread* _writer_thread;
-	bool _terminate_writer;
+	bool _finish_writer;
 	std::list<std::pair<boost::shared_ptr<EncodedData>, int> > _write_queue;
 	mutable boost::mutex _writer_mutex;
 	boost::condition _writer_condition;
+	boost::shared_ptr<EncodedData> _last_written;
+	std::list<int> _pending;
+	int _last_written_frame;
+	static const unsigned int _maximum_frames_in_memory;
+
+	boost::shared_ptr<libdcp::MonoPictureAsset> _picture_asset;
+	boost::shared_ptr<libdcp::MonoPictureAssetWriter> _picture_asset_writer;
 };
 
 #endif
-- 
cgit v1.2.3


From a93bbd88eaa67a1e24471789335a2790b6cfbc78 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Jan 2013 23:56:49 +0000
Subject: Some fixes and logs.

---
 src/lib/encoder.cc | 5 ++---
 src/lib/log.cc     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index c6960d0d1..0d5fc1c6e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -601,7 +601,6 @@ Encoder::writer_thread ()
 			_write_queue.pop_front ();
 
 			lock.unlock ();
-			/* XXX: write to mxf */
 			_film->log()->log (String::compose ("Writer writes %1 to MXF", encoded.second));
 			if (encoded.first) {
 				_picture_asset_writer->write (encoded.first->data(), encoded.first->size());
@@ -619,7 +618,7 @@ Encoder::writer_thread ()
 			   Put some to disk.
 			*/
 
-			pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.front ();
+			pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.back ();
 			_write_queue.pop_back ();
 			if (!encoded.first) {
 				/* This is a `repeat-last' frame, so no need to write it to disk */
@@ -627,7 +626,7 @@ Encoder::writer_thread ()
 			}
 
 			lock.unlock ();
-			_film->log()->log (String::compose ("Writer full; pushes %1 to disk", encoded.second));
+			_film->log()->log (String::compose ("Writer full (awaiting %1); pushes %2 to disk", _last_written_frame + 1, encoded.second));
 			encoded.first->write (_film, encoded.second);
 			lock.lock ();
 
diff --git a/src/lib/log.cc b/src/lib/log.cc
index 06cff0495..7459700ea 100644
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -28,7 +28,7 @@
 using namespace std;
 
 Log::Log ()
-	: _level (VERBOSE)
+	: _level (STANDARD)
 {
 
 }
-- 
cgit v1.2.3


From d4024b9f794823a2808724ae9fae74195f1a0824 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 18 Jan 2013 00:19:21 +0000
Subject: Some missing frame_done()s.

---
 src/lib/encoder.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 0d5fc1c6e..b37a3c098 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -334,6 +334,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		*/
 		boost::mutex::scoped_lock lock2 (_writer_mutex);
 		_write_queue.push_back (make_pair (shared_ptr<EncodedData> (), _video_frames_out));
+		frame_done ();
 	} else {
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
@@ -359,6 +360,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		boost::mutex::scoped_lock lock2 (_writer_mutex);
 		_write_queue.push_back (make_pair (shared_ptr<EncodedData> (), _video_frames_out));
 		++_video_frames_out;
+		frame_done ();
 	}
 }
 
@@ -529,6 +531,7 @@ Encoder::encoder_thread (ServerDescription* server)
 			boost::mutex::scoped_lock lock2 (_writer_mutex);
 			_write_queue.push_back (make_pair (encoded, vf->frame ()));
 			_writer_condition.notify_all ();
+			frame_done ();
 		} else {
 			lock.lock ();
 			_film->log()->log (
-- 
cgit v1.2.3


From 479b67ec506289a4763b2dd4f07e72d1dd676483 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 18 Jan 2013 00:40:49 +0000
Subject: Add writer class to pull some stuff out of Encoder.

---
 NOTES              |   6 ++
 src/lib/encoder.cc | 172 ++++----------------------------------------------
 src/lib/encoder.h  |  23 +------
 src/lib/writer.cc  | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lib/writer.h   |  60 ++++++++++++++++++
 src/lib/wscript    |   1 +
 6 files changed, 261 insertions(+), 181 deletions(-)
 create mode 100644 NOTES
 create mode 100644 src/lib/writer.cc
 create mode 100644 src/lib/writer.h

(limited to 'src/lib/encoder.cc')

diff --git a/NOTES b/NOTES
new file mode 100644
index 000000000..5be074c90
--- /dev/null
+++ b/NOTES
@@ -0,0 +1,6 @@
+
+Encoder to write audio mxf; and sort out creation of those mxfs
+DCP job still to write XML; presumably.
+Write hashes of frames after successful write.
+Make check of hashes optional
+
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index b37a3c098..bad420f35 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -37,6 +37,7 @@
 #include "server.h"
 #include "format.h"
 #include "cross.h"
+#include "writer.h"
 
 using std::pair;
 using std::string;
@@ -48,7 +49,6 @@ using std::make_pair;
 using namespace boost;
 
 int const Encoder::_history_size = 25;
-unsigned int const Encoder::_maximum_frames_in_memory = 8;
 
 /** @param f Film that we are encoding.
  *  @param o Options.
@@ -65,9 +65,6 @@ Encoder::Encoder (shared_ptr<const Film> f)
 #endif
 	, _have_a_real_frame (false)
 	, _terminate_encoder (false)
-	, _writer_thread (0)
-	, _finish_writer (false)
-	, _last_written_frame (-1)
 {
 	if (_film->audio_stream()) {
 		/* Create sound output files with .tmp suffixes; we will rename
@@ -92,7 +89,9 @@ Encoder::~Encoder ()
 {
 	close_sound_files ();
 	terminate_worker_threads ();
-	finish_writer_thread ();
+	if (_writer) {
+		_writer->finish ();
+	}
 }
 
 void
@@ -139,18 +138,7 @@ Encoder::process_begin ()
 		}
 	}
 
-	/* XXX! */
-	_picture_asset.reset (
-		new libdcp::MonoPictureAsset (
-			_film->dir (_film->dcp_name()),
-			String::compose ("video_%1.mxf", 0),
-			DCPFrameRate (_film->frames_per_second()).frames_per_second,
-			_film->format()->dcp_size()
-			)
-		);
-	
-	_picture_asset_writer = _picture_asset->start_write ();
-	_writer_thread = new boost::thread (boost::bind (&Encoder::writer_thread, this));
+	_writer.reset (new Writer (_film));
 }
 
 
@@ -222,20 +210,15 @@ Encoder::process_end ()
 	for (list<shared_ptr<DCPVideoFrame> >::iterator i = _encode_queue.begin(); i != _encode_queue.end(); ++i) {
 		_film->log()->log (String::compose ("Encode left-over frame %1", (*i)->frame ()));
 		try {
-			shared_ptr<EncodedData> e = (*i)->encode_locally ();
-			{
-				boost::mutex::scoped_lock lock2 (_writer_mutex);
-				_write_queue.push_back (make_pair (e, (*i)->frame ()));
-				_writer_condition.notify_all ();
-			}
+			_writer->write ((*i)->encode_locally(), (*i)->frame ());
 			frame_done ();
 		} catch (std::exception& e) {
 			_film->log()->log (String::compose ("Local encode failed (%1)", e.what ()));
 		}
 	}
 
-	finish_writer_thread ();
-	_picture_asset_writer->finalize ();
+	_writer->finish ();
+	_writer.reset ();
 }	
 
 /** @return an estimate of the current number of frames we are encoding per second,
@@ -328,12 +311,8 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	}
 
 	if (same && _have_a_real_frame) {
-		/* Use the last frame that we encoded.  We do this by putting a null encoded
-		   frame straight onto the writer's queue.  It will know to duplicate the previous frame
-		   in this case.
-		*/
-		boost::mutex::scoped_lock lock2 (_writer_mutex);
-		_write_queue.push_back (make_pair (shared_ptr<EncodedData> (), _video_frames_out));
+		/* Use the last frame that we encoded. */
+		_writer->repeat (_video_frames_out);
 		frame_done ();
 	} else {
 		/* Queue this new frame for encoding */
@@ -357,8 +336,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	++_video_frames_out;
 
 	if (dfr.repeat) {
-		boost::mutex::scoped_lock lock2 (_writer_mutex);
-		_write_queue.push_back (make_pair (shared_ptr<EncodedData> (), _video_frames_out));
+		_writer->repeat (_video_frames_out);
 		++_video_frames_out;
 		frame_done ();
 	}
@@ -447,23 +425,6 @@ Encoder::terminate_worker_threads ()
 	}
 }
 
-void
-Encoder::finish_writer_thread ()
-{
-	if (!_writer_thread) {
-		return;
-	}
-	
-	boost::mutex::scoped_lock lock (_writer_mutex);
-	_finish_writer = true;
-	_writer_condition.notify_all ();
-	lock.unlock ();
-
-	_writer_thread->join ();
-	delete _writer_thread;
-	_writer_thread = 0;
-}
-
 void
 Encoder::encoder_thread (ServerDescription* server)
 {
@@ -528,9 +489,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		if (encoded) {
-			boost::mutex::scoped_lock lock2 (_writer_mutex);
-			_write_queue.push_back (make_pair (encoded, vf->frame ()));
-			_writer_condition.notify_all ();
+			_writer->write (encoded, vf->frame ());
 			frame_done ();
 		} else {
 			lock.lock ();
@@ -549,110 +508,3 @@ Encoder::encoder_thread (ServerDescription* server)
 		_worker_condition.notify_all ();
 	}
 }
-
-void
-Encoder::link (string a, string b) const
-{
-#ifdef DVDOMATIC_POSIX			
-	int const r = symlink (a.c_str(), b.c_str());
-	if (r) {
-		throw EncodeError (String::compose ("could not create symlink from %1 to %2", a, b));
-	}
-#endif
-	
-#ifdef DVDOMATIC_WINDOWS
-	boost::filesystem::copy_file (a, b);
-#endif			
-}
-
-struct WriteQueueSorter
-{
-	bool operator() (pair<shared_ptr<EncodedData>, int> const & a, pair<shared_ptr<EncodedData>, int> const & b) {
-		return a.second < b.second;
-	}
-};
-
-void
-Encoder::writer_thread ()
-{
-	while (1)
-	{
-		boost::mutex::scoped_lock lock (_writer_mutex);
-
-		while (1) {
-			if (_finish_writer ||
-			    _write_queue.size() > _maximum_frames_in_memory ||
-			    (!_write_queue.empty() && _write_queue.front().second == (_last_written_frame + 1))) {
-				    
-				    break;
-			    }
-
-			    TIMING ("writer sleeps with a queue of %1; %2 pending", _write_queue.size(), _pending.size());
-			    _writer_condition.wait (lock);
-			    TIMING ("writer wakes with a queue of %1", _write_queue.size());
-
-			    _write_queue.sort (WriteQueueSorter ());
-		}
-
-		if (_finish_writer && _write_queue.empty() && _pending.empty()) {
-			return;
-		}
-
-		/* Write any frames that we can write; i.e. those that are in sequence */
-		while (!_write_queue.empty() && _write_queue.front().second == (_last_written_frame + 1)) {
-			pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.front ();
-			_write_queue.pop_front ();
-
-			lock.unlock ();
-			_film->log()->log (String::compose ("Writer writes %1 to MXF", encoded.second));
-			if (encoded.first) {
-				_picture_asset_writer->write (encoded.first->data(), encoded.first->size());
-				_last_written = encoded.first;
-			} else {
-				_picture_asset_writer->write (_last_written->data(), _last_written->size());
-			}
-			lock.lock ();
-
-			++_last_written_frame;
-		}
-
-		while (_write_queue.size() > _maximum_frames_in_memory) {
-			/* Too many frames in memory which can't yet be written to the stream.
-			   Put some to disk.
-			*/
-
-			pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.back ();
-			_write_queue.pop_back ();
-			if (!encoded.first) {
-				/* This is a `repeat-last' frame, so no need to write it to disk */
-				continue;
-			}
-
-			lock.unlock ();
-			_film->log()->log (String::compose ("Writer full (awaiting %1); pushes %2 to disk", _last_written_frame + 1, encoded.second));
-			encoded.first->write (_film, encoded.second);
-			lock.lock ();
-
-			_pending.push_back (encoded.second);
-		}
-
-		while (_write_queue.size() < _maximum_frames_in_memory && !_pending.empty()) {
-			/* We have some space in memory.  Fetch some frames back off disk. */
-
-			_pending.sort ();
-			int const fetch = _pending.front ();
-
-			lock.unlock ();
-			_film->log()->log (String::compose ("Writer pulls %1 back from disk", fetch));
-			shared_ptr<EncodedData> encoded;
-			if (boost::filesystem::exists (_film->frame_out_path (fetch, false))) {
-				/* It's an actual frame (not a repeat-last); load it in */
-				encoded.reset (new EncodedData (_film->frame_out_path (fetch, false)));
-			}
-			lock.lock ();
-
-			_write_queue.push_back (make_pair (encoded, fetch));
-			_pending.remove (fetch);
-		}
-	}
-}
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 3e2b5d957..a277aca51 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -51,11 +51,7 @@ class Film;
 class ServerDescription;
 class DCPVideoFrame;
 class EncodedData;
-
-namespace libdcp {
-	class MonoPictureAsset;
-	class MonoPictureAssetWriter;
-}
+class Writer;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -100,7 +96,6 @@ private:
 
 	void encoder_thread (ServerDescription *);
 	void terminate_worker_threads ();
-	void link (std::string, std::string) const;
 
 	/** Film that we are encoding */
 	boost::shared_ptr<const Film> _film;
@@ -125,9 +120,6 @@ private:
 	/** Number of audio frames written for the DCP so far */
 	int64_t _audio_frames_out;
 
-	void writer_thread ();
-	void finish_writer_thread ();
-
 #if HAVE_SWRESAMPLE	
 	SwrContext* _swr_context;
 #endif
@@ -141,18 +133,7 @@ private:
 	mutable boost::mutex _worker_mutex;
 	boost::condition _worker_condition;
 
-	boost::thread* _writer_thread;
-	bool _finish_writer;
-	std::list<std::pair<boost::shared_ptr<EncodedData>, int> > _write_queue;
-	mutable boost::mutex _writer_mutex;
-	boost::condition _writer_condition;
-	boost::shared_ptr<EncodedData> _last_written;
-	std::list<int> _pending;
-	int _last_written_frame;
-	static const unsigned int _maximum_frames_in_memory;
-
-	boost::shared_ptr<libdcp::MonoPictureAsset> _picture_asset;
-	boost::shared_ptr<libdcp::MonoPictureAssetWriter> _picture_asset_writer;
+	boost::shared_ptr<Writer> _writer;
 };
 
 #endif
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
new file mode 100644
index 000000000..0381ee378
--- /dev/null
+++ b/src/lib/writer.cc
@@ -0,0 +1,180 @@
+/*
+    Copyright (C) 2012 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <libdcp/picture_asset.h>
+#include "writer.h"
+#include "compose.hpp"
+#include "film.h"
+#include "format.h"
+#include "log.h"
+#include "dcp_video_frame.h"
+
+using std::make_pair;
+using std::pair;
+using boost::shared_ptr;
+
+unsigned int const Writer::_maximum_frames_in_memory = 8;
+
+Writer::Writer (shared_ptr<const Film> f)
+	: _film (f)
+	, _thread (0)
+	, _finish (false)
+	, _last_written_frame (-1)
+{
+	_picture_asset.reset (
+		new libdcp::MonoPictureAsset (
+			_film->dir (_film->dcp_name()),
+			String::compose ("video_%1.mxf", 0),
+			DCPFrameRate (_film->frames_per_second()).frames_per_second,
+			_film->format()->dcp_size()
+			)
+		);
+	
+	_picture_asset_writer = _picture_asset->start_write ();
+
+	_thread = new boost::thread (boost::bind (&Writer::thread, this));
+}
+
+void
+Writer::write (shared_ptr<EncodedData> encoded, int frame)
+{
+	boost::mutex::scoped_lock lock (_mutex);
+	_queue.push_back (make_pair (encoded, frame));
+	_condition.notify_all ();
+}
+
+struct QueueSorter
+{
+	bool operator() (pair<shared_ptr<EncodedData>, int> const & a, pair<shared_ptr<EncodedData>, int> const & b) {
+		return a.second < b.second;
+	}
+};
+
+void
+Writer::thread ()
+{
+	while (1)
+	{
+		boost::mutex::scoped_lock lock (_mutex);
+
+		while (1) {
+			if (_finish ||
+			    _queue.size() > _maximum_frames_in_memory ||
+			    (!_queue.empty() && _queue.front().second == (_last_written_frame + 1))) {
+				    
+				    break;
+			    }
+
+			    TIMING ("writer sleeps with a queue of %1; %2 pending", _queue.size(), _pending.size());
+			    _condition.wait (lock);
+			    TIMING ("writer wakes with a queue of %1", _queue.size());
+
+			    _queue.sort (QueueSorter ());
+		}
+
+		if (_finish && _queue.empty() && _pending.empty()) {
+			return;
+		}
+
+		/* Write any frames that we can write; i.e. those that are in sequence */
+		while (!_queue.empty() && _queue.front().second == (_last_written_frame + 1)) {
+			pair<boost::shared_ptr<EncodedData>, int> encoded = _queue.front ();
+			_queue.pop_front ();
+
+			lock.unlock ();
+			_film->log()->log (String::compose ("Writer writes %1 to MXF", encoded.second));
+			if (encoded.first) {
+				_picture_asset_writer->write (encoded.first->data(), encoded.first->size());
+				_last_written = encoded.first;
+			} else {
+				_picture_asset_writer->write (_last_written->data(), _last_written->size());
+			}
+			lock.lock ();
+
+			++_last_written_frame;
+		}
+
+		while (_queue.size() > _maximum_frames_in_memory) {
+			/* Too many frames in memory which can't yet be written to the stream.
+			   Put some to disk.
+			*/
+
+			pair<boost::shared_ptr<EncodedData>, int> encoded = _queue.back ();
+			_queue.pop_back ();
+			if (!encoded.first) {
+				/* This is a `repeat-last' frame, so no need to write it to disk */
+				continue;
+			}
+
+			lock.unlock ();
+			_film->log()->log (String::compose ("Writer full (awaiting %1); pushes %2 to disk", _last_written_frame + 1, encoded.second));
+			encoded.first->write (_film, encoded.second);
+			lock.lock ();
+
+			_pending.push_back (encoded.second);
+		}
+
+		while (_queue.size() < _maximum_frames_in_memory && !_pending.empty()) {
+			/* We have some space in memory.  Fetch some frames back off disk. */
+
+			_pending.sort ();
+			int const fetch = _pending.front ();
+
+			lock.unlock ();
+			_film->log()->log (String::compose ("Writer pulls %1 back from disk", fetch));
+			shared_ptr<EncodedData> encoded;
+			if (boost::filesystem::exists (_film->frame_out_path (fetch, false))) {
+				/* It's an actual frame (not a repeat-last); load it in */
+				encoded.reset (new EncodedData (_film->frame_out_path (fetch, false)));
+			}
+			lock.lock ();
+
+			_queue.push_back (make_pair (encoded, fetch));
+			_pending.remove (fetch);
+		}
+	}
+
+}
+
+void
+Writer::finish ()
+{
+	if (!_thread) {
+		return;
+	}
+	
+	boost::mutex::scoped_lock lock (_mutex);
+	_finish = true;
+	_condition.notify_all ();
+	lock.unlock ();
+
+	_thread->join ();
+	delete _thread;
+	_thread = 0;
+
+	_picture_asset_writer->finalize ();
+}
+
+/** Tell the writer that frame `f' should be a repeat of the frame before it */
+void
+Writer::repeat (int f)
+{
+	boost::mutex::scoped_lock lock (_mutex);
+	_queue.push_back (make_pair (shared_ptr<EncodedData> (), f));
+}
diff --git a/src/lib/writer.h b/src/lib/writer.h
new file mode 100644
index 000000000..8156308a6
--- /dev/null
+++ b/src/lib/writer.h
@@ -0,0 +1,60 @@
+/*
+    Copyright (C) 2012 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <list>
+#include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
+
+class Film;
+class EncodedData;
+
+namespace libdcp {
+	class MonoPictureAsset;
+	class MonoPictureAssetWriter;
+}
+
+class Writer
+{
+public:
+	Writer (boost::shared_ptr<const Film>);
+	
+	void write (boost::shared_ptr<EncodedData>, int);
+	void repeat (int f);
+	void finish ();
+
+private:
+
+	void thread ();
+
+	boost::shared_ptr<const Film> _film;
+
+	boost::thread* _thread;
+	bool _finish;
+	std::list<std::pair<boost::shared_ptr<EncodedData>, int> > _queue;
+	mutable boost::mutex _mutex;
+	boost::condition _condition;
+	boost::shared_ptr<EncodedData> _last_written;
+	std::list<int> _pending;
+	int _last_written_frame;
+	static const unsigned int _maximum_frames_in_memory;
+
+	boost::shared_ptr<libdcp::MonoPictureAsset> _picture_asset;
+	boost::shared_ptr<libdcp::MonoPictureAssetWriter> _picture_asset_writer;
+};
diff --git a/src/lib/wscript b/src/lib/wscript
index b2b639f06..6d72f6480 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -56,6 +56,7 @@ def build(bld):
 		 version.cc
                  video_decoder.cc
                  video_source.cc
+                 writer.cc
 		 """
 
     obj.target = 'dvdomatic'
-- 
cgit v1.2.3


From 5e4ab7ebd9a6b62b64fbaf91d7aa1a2a9d4bdec4 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 18 Jan 2013 21:49:49 +0000
Subject: Untested direct write of audio to MXF.

---
 NOTES                      |  2 +-
 src/lib/dcp_video_frame.cc |  2 +-
 src/lib/dcp_video_frame.h  |  2 +-
 src/lib/encoder.cc         | 59 +++-------------------------------------------
 src/lib/encoder.h          |  8 -------
 src/lib/writer.cc          | 35 ++++++++++++++++++++++-----
 src/lib/writer.h           | 12 +++++++---
 7 files changed, 44 insertions(+), 76 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/NOTES b/NOTES
index a771e9bfd..b384cb6c0 100644
--- a/NOTES
+++ b/NOTES
@@ -4,4 +4,4 @@ Get rid of DCP job entirely and make encoder write XML (since it has the *Asset
 ... perhaps generate the CPL hash on the fly
 Write hashes of frames after successful write.
 Make check of hashes optional; recovery in general
-
+Fix multi-reel or remove it
\ No newline at end of file
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index da864ad9f..89db5761a 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -405,7 +405,7 @@ EncodedData::~EncodedData ()
  *  @param frame DCP Frame index.
  */
 void
-EncodedData::write (shared_ptr<const Film> film, int frame)
+EncodedData::write (shared_ptr<const Film> film, int frame) const
 {
 	string const tmp_j2k = film->frame_out_path (frame, true);
 
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index b446352c7..2ad2b0d44 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -48,7 +48,7 @@ public:
 	virtual ~EncodedData ();
 
 	void send (boost::shared_ptr<Socket> socket);
-	void write (boost::shared_ptr<const Film>, int);
+	void write (boost::shared_ptr<const Film>, int) const;
 
 	/** @return data */
 	uint8_t* data () const {
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index bad420f35..c2416b87e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -57,37 +57,18 @@ Encoder::Encoder (shared_ptr<const Film> f)
 	: _film (f)
 	, _just_skipped (false)
 	, _video_frames_in (0)
-	, _audio_frames_in (0)
 	, _video_frames_out (0)
-	, _audio_frames_out (0)
 #ifdef HAVE_SWRESAMPLE	  
 	, _swr_context (0)
 #endif
 	, _have_a_real_frame (false)
 	, _terminate_encoder (false)
 {
-	if (_film->audio_stream()) {
-		/* Create sound output files with .tmp suffixes; we will rename
-		   them if and when we complete.
-		*/
-		for (int i = 0; i < dcp_audio_channels (_film->audio_channels()); ++i) {
-			SF_INFO sf_info;
-			sf_info.samplerate = dcp_audio_sample_rate (_film->audio_stream()->sample_rate());
-			/* We write mono files */
-			sf_info.channels = 1;
-			sf_info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_24;
-			SNDFILE* f = sf_open (_film->multichannel_audio_out_path (i, true).c_str (), SFM_WRITE, &sf_info);
-			if (f == 0) {
-				throw CreateFileError (_film->multichannel_audio_out_path (i, true));
-			}
-			_sound_files.push_back (f);
-		}
-	}
+	
 }
 
 Encoder::~Encoder ()
 {
-	close_sound_files ();
 	terminate_worker_threads ();
 	if (_writer) {
 		_writer->finish ();
@@ -162,25 +143,13 @@ Encoder::process_end ()
 			}
 
 			out->set_frames (frames);
-			write_audio (out);
+			_writer->write (out);
 		}
 
 		swr_free (&_swr_context);
 	}
 #endif
 
-	if (_film->audio_stream()) {
-		close_sound_files ();
-		
-		/* Rename .wav.tmp files to .wav */
-		for (int i = 0; i < dcp_audio_channels (_film->audio_channels()); ++i) {
-			if (boost::filesystem::exists (_film->multichannel_audio_out_path (i, false))) {
-				boost::filesystem::remove (_film->multichannel_audio_out_path (i, false));
-			}
-			boost::filesystem::rename (_film->multichannel_audio_out_path (i, true), _film->multichannel_audio_out_path (i, false));
-		}
-	}
-
 	boost::mutex::scoped_lock lock (_worker_mutex);
 
 	_film->log()->log ("Clearing queue of " + lexical_cast<string> (_encode_queue.size ()));
@@ -386,31 +355,9 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 		data = b;
 	}
 
-	write_audio (data);
-	
-	_audio_frames_in += data->frames ();
+	_writer->write (data);
 }
 
-void
-Encoder::write_audio (shared_ptr<const AudioBuffers> audio)
-{
-	for (int i = 0; i < audio->channels(); ++i) {
-		sf_write_float (_sound_files[i], audio->data(i), audio->frames());
-	}
-
-	_audio_frames_out += audio->frames ();
-}
-
-void
-Encoder::close_sound_files ()
-{
-	for (vector<SNDFILE*>::iterator i = _sound_files.begin(); i != _sound_files.end(); ++i) {
-		sf_close (*i);
-	}
-
-	_sound_files.clear ();
-}	
-
 void
 Encoder::terminate_worker_threads ()
 {
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index a277aca51..fc89d674a 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -39,7 +39,6 @@ extern "C" {
 #include <libswresample/swresample.h>
 }
 #endif
-#include <sndfile.h>
 #include "util.h"
 #include "video_sink.h"
 #include "audio_sink.h"
@@ -91,7 +90,6 @@ private:
 	void frame_done ();
 	void frame_skipped ();
 	
-	void close_sound_files ();
 	void write_audio (boost::shared_ptr<const AudioBuffers> audio);
 
 	void encoder_thread (ServerDescription *);
@@ -113,19 +111,13 @@ private:
 
 	/** Number of video frames received so far */
 	SourceFrame _video_frames_in;
-	/** Number of audio frames received so far */
-	int64_t _audio_frames_in;
 	/** Number of video frames written for the DCP so far */
 	int _video_frames_out;
-	/** Number of audio frames written for the DCP so far */
-	int64_t _audio_frames_out;
 
 #if HAVE_SWRESAMPLE	
 	SwrContext* _swr_context;
 #endif
 
-	std::vector<SNDFILE*> _sound_files;
-
 	bool _have_a_real_frame;
 	bool _terminate_encoder;
 	std::list<boost::shared_ptr<DCPVideoFrame> > _encode_queue;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 0381ee378..fbd371550 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -18,6 +18,7 @@
 */
 
 #include <libdcp/picture_asset.h>
+#include <libdcp/sound_asset.h>
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"
@@ -48,20 +49,41 @@ Writer::Writer (shared_ptr<const Film> f)
 	
 	_picture_asset_writer = _picture_asset->start_write ();
 
+	if (_film->audio_channels() > 0) {
+		_sound_asset.reset (
+			new libdcp::SoundAsset (
+				_film->dir (_film->dcp_name()),
+				String::compose ("audio_%1.mxf", 0),
+				DCPFrameRate (_film->frames_per_second()).frames_per_second,
+				_film->audio_channels(),
+				_film->audio_stream()->sample_rate()
+				)
+			);
+
+		_sound_asset_writer = _sound_asset->start_write ();
+	}
+	
 	_thread = new boost::thread (boost::bind (&Writer::thread, this));
 }
 
 void
-Writer::write (shared_ptr<EncodedData> encoded, int frame)
+Writer::write (shared_ptr<const EncodedData> encoded, int frame)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 	_queue.push_back (make_pair (encoded, frame));
 	_condition.notify_all ();
 }
 
+/** This method is not thread safe */
+void
+Writer::write (shared_ptr<const AudioBuffers> audio)
+{
+	_sound_asset_writer->write (audio->data(), audio->frames());
+}
+
 struct QueueSorter
 {
-	bool operator() (pair<shared_ptr<EncodedData>, int> const & a, pair<shared_ptr<EncodedData>, int> const & b) {
+	bool operator() (pair<shared_ptr<const EncodedData>, int> const & a, pair<shared_ptr<const EncodedData>, int> const & b) {
 		return a.second < b.second;
 	}
 };
@@ -94,7 +116,7 @@ Writer::thread ()
 
 		/* Write any frames that we can write; i.e. those that are in sequence */
 		while (!_queue.empty() && _queue.front().second == (_last_written_frame + 1)) {
-			pair<boost::shared_ptr<EncodedData>, int> encoded = _queue.front ();
+			pair<boost::shared_ptr<const EncodedData>, int> encoded = _queue.front ();
 			_queue.pop_front ();
 
 			lock.unlock ();
@@ -115,7 +137,7 @@ Writer::thread ()
 			   Put some to disk.
 			*/
 
-			pair<boost::shared_ptr<EncodedData>, int> encoded = _queue.back ();
+			pair<boost::shared_ptr<const EncodedData>, int> encoded = _queue.back ();
 			_queue.pop_back ();
 			if (!encoded.first) {
 				/* This is a `repeat-last' frame, so no need to write it to disk */
@@ -138,7 +160,7 @@ Writer::thread ()
 
 			lock.unlock ();
 			_film->log()->log (String::compose ("Writer pulls %1 back from disk", fetch));
-			shared_ptr<EncodedData> encoded;
+			shared_ptr<const EncodedData> encoded;
 			if (boost::filesystem::exists (_film->frame_out_path (fetch, false))) {
 				/* It's an actual frame (not a repeat-last); load it in */
 				encoded.reset (new EncodedData (_film->frame_out_path (fetch, false)));
@@ -169,6 +191,7 @@ Writer::finish ()
 	_thread = 0;
 
 	_picture_asset_writer->finalize ();
+	_sound_asset_writer->finalize ();
 }
 
 /** Tell the writer that frame `f' should be a repeat of the frame before it */
@@ -176,5 +199,5 @@ void
 Writer::repeat (int f)
 {
 	boost::mutex::scoped_lock lock (_mutex);
-	_queue.push_back (make_pair (shared_ptr<EncodedData> (), f));
+	_queue.push_back (make_pair (shared_ptr<const EncodedData> (), f));
 }
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 8156308a6..77f98f160 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -24,10 +24,13 @@
 
 class Film;
 class EncodedData;
+class AudioBuffers;
 
 namespace libdcp {
 	class MonoPictureAsset;
 	class MonoPictureAssetWriter;
+	class SoundAsset;
+	class SoundAssetWriter;
 }
 
 class Writer
@@ -35,7 +38,8 @@ class Writer
 public:
 	Writer (boost::shared_ptr<const Film>);
 	
-	void write (boost::shared_ptr<EncodedData>, int);
+	void write (boost::shared_ptr<const EncodedData>, int);
+	void write (boost::shared_ptr<const AudioBuffers>);
 	void repeat (int f);
 	void finish ();
 
@@ -47,14 +51,16 @@ private:
 
 	boost::thread* _thread;
 	bool _finish;
-	std::list<std::pair<boost::shared_ptr<EncodedData>, int> > _queue;
+	std::list<std::pair<boost::shared_ptr<const EncodedData>, int> > _queue;
 	mutable boost::mutex _mutex;
 	boost::condition _condition;
-	boost::shared_ptr<EncodedData> _last_written;
+	boost::shared_ptr<const EncodedData> _last_written;
 	std::list<int> _pending;
 	int _last_written_frame;
 	static const unsigned int _maximum_frames_in_memory;
 
 	boost::shared_ptr<libdcp::MonoPictureAsset> _picture_asset;
 	boost::shared_ptr<libdcp::MonoPictureAssetWriter> _picture_asset_writer;
+	boost::shared_ptr<libdcp::SoundAsset> _sound_asset;
+	boost::shared_ptr<libdcp::SoundAssetWriter> _sound_asset_writer;
 };
-- 
cgit v1.2.3


From 657f735160fd8b0abc67d6e5f519da5786ed26f0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 21 Jan 2013 20:35:00 +0000
Subject: Fix a couple of things; go back to un-numbered MXF file names for a
 bit.

---
 src/lib/encoder.cc | 2 +-
 src/lib/encoder.h  | 4 ++--
 src/lib/writer.cc  | 8 ++++----
 src/lib/writer.h   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index c2416b87e..6b14b2698 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -53,7 +53,7 @@ int const Encoder::_history_size = 25;
 /** @param f Film that we are encoding.
  *  @param o Options.
  */
-Encoder::Encoder (shared_ptr<const Film> f)
+Encoder::Encoder (shared_ptr<Film> f)
 	: _film (f)
 	, _just_skipped (false)
 	, _video_frames_in (0)
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index fc89d674a..429b46a18 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -62,7 +62,7 @@ class Writer;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-	Encoder (boost::shared_ptr<const Film> f);
+	Encoder (boost::shared_ptr<Film> f);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
@@ -96,7 +96,7 @@ private:
 	void terminate_worker_threads ();
 
 	/** Film that we are encoding */
-	boost::shared_ptr<const Film> _film;
+	boost::shared_ptr<Film> _film;
 
 	/** Mutex for _time_history, _just_skipped and _last_frame */
 	mutable boost::mutex _history_mutex;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index df6f20791..56cfa43a7 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -33,7 +33,7 @@ using boost::shared_ptr;
 
 unsigned int const Writer::_maximum_frames_in_memory = 8;
 
-Writer::Writer (shared_ptr<const Film> f)
+Writer::Writer (shared_ptr<Film> f)
 	: _film (f)
 	, _thread (0)
 	, _finish (false)
@@ -42,7 +42,7 @@ Writer::Writer (shared_ptr<const Film> f)
 	_picture_asset.reset (
 		new libdcp::MonoPictureAsset (
 			_film->dir (_film->dcp_name()),
-			String::compose ("video_%1.mxf", 0),
+			"video.mxf",
 			DCPFrameRate (_film->frames_per_second()).frames_per_second,
 			_film->format()->dcp_size()
 			)
@@ -54,7 +54,7 @@ Writer::Writer (shared_ptr<const Film> f)
 		_sound_asset.reset (
 			new libdcp::SoundAsset (
 				_film->dir (_film->dcp_name()),
-				String::compose ("audio_%1.mxf", 0),
+				"audio.mxf",
 				DCPFrameRate (_film->frames_per_second()).frames_per_second,
 				_film->audio_channels(),
 				dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
@@ -199,7 +199,7 @@ Writer::finish ()
 	int const frames = _last_written_frame + 1;
 	int const duration = frames - _film->trim_start() - _film->trim_end();
 	
-	_film->set_intrinsic_duration (frames);
+	_film->set_dcp_intrinsic_duration (frames);
 	
 	_picture_asset->set_entry_point (_film->trim_start ());
 	_picture_asset->set_duration (duration);
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 77f98f160..1aaea4d9d 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -36,7 +36,7 @@ namespace libdcp {
 class Writer
 {
 public:
-	Writer (boost::shared_ptr<const Film>);
+	Writer (boost::shared_ptr<Film>);
 	
 	void write (boost::shared_ptr<const EncodedData>, int);
 	void write (boost::shared_ptr<const AudioBuffers>);
@@ -47,7 +47,7 @@ private:
 
 	void thread ();
 
-	boost::shared_ptr<const Film> _film;
+	boost::shared_ptr<Film> _film;
 
 	boost::thread* _thread;
 	bool _finish;
-- 
cgit v1.2.3


From 0b760c0526b0b9d13def519ab8afba1e511d8111 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 23 Jan 2013 20:49:26 +0000
Subject: Try to fix up paths for video MXFs, hashes and temporarily-stored
 frames.

---
 .gitignore                  |   5 +-
 src/lib/check_hashes_job.cc | 120 --------------------------------------------
 src/lib/check_hashes_job.h  |  39 --------------
 src/lib/dcp_video_frame.cc  |  12 ++---
 src/lib/encoder.cc          |  26 ----------
 src/lib/encoder.h           |   6 +--
 src/lib/film.cc             |  90 ++++++++++++++++-----------------
 src/lib/film.h              |  10 ++--
 src/lib/transcode_job.cc    |   5 --
 src/lib/writer.cc           |   6 +--
 src/lib/wscript             |   1 -
 11 files changed, 61 insertions(+), 259 deletions(-)
 delete mode 100644 src/lib/check_hashes_job.cc
 delete mode 100644 src/lib/check_hashes_job.h

(limited to 'src/lib/encoder.cc')

diff --git a/.gitignore b/.gitignore
index 4c0c1926d..cc3351558 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,7 @@ doc/manual/pdf
 doc/manual/extensions.ent
 .be/id-cache
 *.pyc
-
+GPATH
+GRTAGS
+GSYMS
+GTAGS
diff --git a/src/lib/check_hashes_job.cc b/src/lib/check_hashes_job.cc
deleted file mode 100644
index 55a744552..000000000
--- a/src/lib/check_hashes_job.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <fstream>
-#include <boost/lexical_cast.hpp>
-#include <boost/filesystem.hpp>
-#include "check_hashes_job.h"
-#include "options.h"
-#include "log.h"
-#include "job_manager.h"
-#include "ab_transcode_job.h"
-#include "transcode_job.h"
-#include "film.h"
-#include "exceptions.h"
-
-using std::string;
-using std::stringstream;
-using std::ifstream;
-using boost::shared_ptr;
-
-CheckHashesJob::CheckHashesJob (shared_ptr<Film> f, DecodeOptions o, shared_ptr<Job> req)
-	: Job (f, req)
-	, _decode_opt (o)
-	, _bad (0)
-{
-
-}
-
-string
-CheckHashesJob::name () const
-{
-	return String::compose ("Check hashes of %1", _film->name());
-}
-
-void
-CheckHashesJob::run ()
-{
-	_bad = 0;
-
-	if (!_film->dcp_intrinsic_duration()) {
-		throw EncodeError ("cannot check hashes of a DCP with unknown intrinsic duration");
-	}
-	
-	int const N = _film->dcp_intrinsic_duration().get();
-	for (int i = 0; i < N; ++i) {
-		string const j2k_file = _film->frame_out_path (i, false);
-		string const hash_file = _film->hash_out_path (i, false);
-
-		if (!boost::filesystem::exists (j2k_file)) {
-			_film->log()->log (String::compose ("Frame %1 has a missing J2K file.", i));
-			boost::filesystem::remove (hash_file);
-			++_bad;
-		} else if (!boost::filesystem::exists (hash_file)) {
-			_film->log()->log (String::compose ("Frame %1 has a missing hash file.", i));
-			boost::filesystem::remove (j2k_file);
-			++_bad;
-		} else {
-			ifstream ref (hash_file.c_str ());
-			string hash;
-			ref >> hash;
-			if (hash != md5_digest (j2k_file)) {
-				_film->log()->log (String::compose ("Frame %1 has wrong hash; deleting.", i));
-				boost::filesystem::remove (j2k_file);
-				boost::filesystem::remove (hash_file);
-				++_bad;
-			}
-		}
-
-		set_progress (float (i) / N);
-	}
-
-	if (_bad) {
-		shared_ptr<Job> tc;
-
-		if (_film->dcp_ab()) {
-			tc.reset (new ABTranscodeJob (_film, _decode_opt, shared_from_this()));
-		} else {
-			tc.reset (new TranscodeJob (_film, _decode_opt, shared_from_this()));
-		}
-		
-		JobManager::instance()->add_after (shared_from_this(), tc);
-		JobManager::instance()->add_after (tc, shared_ptr<Job> (new CheckHashesJob (_film, _decode_opt, tc)));
-	}
-		
-	set_progress (1);
-	set_state (FINISHED_OK);
-}
-
-string
-CheckHashesJob::status () const
-{
-	stringstream s;
-	s << Job::status ();
-	if (overall_progress() > 0) {
-		if (_bad == 0) {
-			s << "; no bad frames found";
-		} else if (_bad == 1) {
-			s << "; 1 bad frame found";
-		} else {
-			s << "; " << _bad << " bad frames found";
-		}
-	}
-	return s.str ();
-}
diff --git a/src/lib/check_hashes_job.h b/src/lib/check_hashes_job.h
deleted file mode 100644
index 5fa17382d..000000000
--- a/src/lib/check_hashes_job.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "job.h"
-#include "options.h"
-
-class CheckHashesJob : public Job
-{
-public:
-	CheckHashesJob (
-		boost::shared_ptr<Film> f,
-		DecodeOptions od,
-		boost::shared_ptr<Job> req
-		);
-
-	std::string name () const;
-	void run ();
-	std::string status () const;
-
-private:
-	DecodeOptions _decode_opt;
-	int _bad;
-};
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index c3f0fed03..5df2d7a46 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -407,27 +407,27 @@ EncodedData::~EncodedData ()
 void
 EncodedData::write (shared_ptr<const Film> film, int frame) const
 {
-	string const tmp_j2k = film->frame_out_path (frame, true);
+	string const tmp_j2c = film->j2c_path (frame, true);
 
-	FILE* f = fopen (tmp_j2k.c_str (), "wb");
+	FILE* f = fopen (tmp_j2c.c_str (), "wb");
 	
 	if (!f) {
-		throw WriteFileError (tmp_j2k, errno);
+		throw WriteFileError (tmp_j2c, errno);
 	}
 
 	fwrite (_data, 1, _size, f);
 	fclose (f);
 
-	string const real_j2k = film->frame_out_path (frame, false);
+	string const real_j2c = film->j2c_path (frame, false);
 
 	/* Rename the file from foo.j2c.tmp to foo.j2c now that it is complete */
-	boost::filesystem::rename (tmp_j2k, real_j2k);
+	boost::filesystem::rename (tmp_j2c, real_j2c);
 }
 
 void
 EncodedData::write_hash (shared_ptr<const Film> film, int frame) const
 {
-	string const hash = film->hash_out_path (frame, false);
+	string const hash = film->hash_path (frame);
 	ofstream h (hash.c_str());
 	h << md5_digest (_data, _size) << "\n";
 }
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 6b14b2698..978d787e8 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -55,7 +55,6 @@ int const Encoder::_history_size = 25;
  */
 Encoder::Encoder (shared_ptr<Film> f)
 	: _film (f)
-	, _just_skipped (false)
 	, _video_frames_in (0)
 	, _video_frames_out (0)
 #ifdef HAVE_SWRESAMPLE	  
@@ -207,14 +206,6 @@ Encoder::current_frames_per_second () const
 	return _history_size / (seconds (now) - seconds (_time_history.back ()));
 }
 
-/** @return true if the last frame to be processed was skipped as it already existed */
-bool
-Encoder::skipping () const
-{
-	boost::mutex::scoped_lock (_history_mutex);
-	return _just_skipped;
-}
-
 /** @return Number of video frames that have been sent out */
 int
 Encoder::video_frames_out () const
@@ -230,7 +221,6 @@ void
 Encoder::frame_done ()
 {
 	boost::mutex::scoped_lock lock (_history_mutex);
-	_just_skipped = false;
 	
 	struct timeval tv;
 	gettimeofday (&tv, 0);
@@ -240,16 +230,6 @@ Encoder::frame_done ()
 	}
 }
 
-/** Called by a subclass when it has just skipped the processing
-    of a frame because it has already been done.
-*/
-void
-Encoder::frame_skipped ()
-{
-	boost::mutex::scoped_lock lock (_history_mutex);
-	_just_skipped = true;
-}
-
 void
 Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub)
 {
@@ -273,12 +253,6 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		return;
 	}
 
-	/* Only do the processing if we don't already have a file for this frame */
-	if (boost::filesystem::exists (_film->frame_out_path (_video_frames_out, false))) {
-		frame_skipped ();
-		return;
-	}
-
 	if (same && _have_a_real_frame) {
 		/* Use the last frame that we encoded. */
 		_writer->repeat (_video_frames_out);
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 429b46a18..8b02f7004 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -82,13 +82,11 @@ public:
 	virtual void process_end ();
 
 	float current_frames_per_second () const;
-	bool skipping () const;
 	int video_frames_out () const;
 
 private:
 	
 	void frame_done ();
-	void frame_skipped ();
 	
 	void write_audio (boost::shared_ptr<const AudioBuffers> audio);
 
@@ -98,7 +96,7 @@ private:
 	/** Film that we are encoding */
 	boost::shared_ptr<Film> _film;
 
-	/** Mutex for _time_history, _just_skipped and _last_frame */
+	/** Mutex for _time_history and _last_frame */
 	mutable boost::mutex _history_mutex;
 	/** List of the times of completion of the last _history_size frames;
 	    first is the most recently completed.
@@ -106,8 +104,6 @@ private:
 	std::list<struct timeval> _time_history;
 	/** Number of frames that we should keep history for */
 	static int const _history_size;
-	/** true if the last frame we processed was skipped (because it was already done) */
-	bool _just_skipped;
 
 	/** Number of video frames received so far */
 	SourceFrame _video_frames_in;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index ae9edbfdb..dc308078c 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -46,7 +46,6 @@
 #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"
@@ -194,24 +193,14 @@ Film::~Film ()
 {
 	delete _log;
 }
-	  
-/** @return The path to the directory to write JPEG2000 files to */
+
 string
-Film::j2k_dir () const
+Film::video_state_identifier () const
 {
-	assert (format());
-
-	boost::filesystem::path p;
-
-	/* Start with j2c */
-	p /= "j2c";
+	assert (format ());
 
 	pair<string, string> f = Filter::ffmpeg_strings (filters());
 
-	/* 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()
@@ -221,19 +210,33 @@ Film::j2k_dir () const
 	  << "_" << j2k_bandwidth()
 	  << "_" << boost::lexical_cast<int> (colour_lut());
 
-	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 s.str ();
+}
+	  
+/** @return The path to the directory to write video frame hash files to */
+string
+Film::hash_dir () const
+{
+	boost::filesystem::path p;
+	p /= "hash";
+	p /= video_state_identifier ();
 	return dir (p.string());
 }
 
+string
+Film::video_mxf_path () const
+{
+	boost::filesystem::path p;
+	p /= "video";
+	p /= video_state_identifier ();
+	return file (p.string());
+}
+
 /** 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.
  */
@@ -302,8 +305,6 @@ Film::make_dcp (bool transcode)
 			r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this(), od, shared_ptr<Job> ())));
 		}
 	}
-
-	// r = JobManager::instance()->add (shared_ptr<Job> (new CheckHashesJob (shared_from_this(), od, r)));
 }
 
 /** Start a job to examine our content file */
@@ -344,7 +345,7 @@ Film::encoded_frames () const
 	}
 
 	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 (hash_dir ()); i != boost::filesystem::directory_iterator(); ++i) {
 		++N;
 		boost::this_thread::interruption_point ();
 	}
@@ -1391,44 +1392,37 @@ Film::audio_stream () const
 	return _external_audio_stream;
 }
 
-/** @param f DCP frame index.
- *  @param t true to return a temporary file path, otherwise a permanent one.
- *  @return The path to write this video frame to.
- */
 string
-Film::frame_out_path (int f, bool t) const
+Film::hash_path (int f) const
 {
+	boost::filesystem::path p;
+	p /= hash_dir ();
+
 	stringstream s;
-	s << j2k_dir() << "/";
 	s.width (8);
-	s << std::setfill('0') << f << ".j2c";
+	s << setfill('0') << f << ".md5";
 
-	if (t) {
-		s << ".tmp";
-	}
-
-	return s.str ();
+	p /= s.str();
+	return p.string ();
 }
 
 string
-Film::hash_out_path (int f, bool t) const
+Film::j2c_path (int f, bool t) const
 {
-	return frame_out_path (f, t) + ".md5";
-}
+	boost::filesystem::path p;
+	p /= "j2c";
+	p /= video_state_identifier ();
 
-/** @param c Audio channel index.
- *  @param t true to return a temporary file path, otherwise a permanent one.
- *  @return The path to write this audio file to.
- */
-string
-Film::multichannel_audio_out_path (int c, bool t) const
-{
 	stringstream s;
-	s << dir ("wavs") << "/" << (c + 1) << ".wav";
+	s.width (8);
+	s << setfill('0') << f << ".j2c";
+
 	if (t) {
 		s << ".tmp";
 	}
-	
-	return s.str ();
+
+	p /= s.str();
+	return p.string ();
 }
 
+
diff --git a/src/lib/film.h b/src/lib/film.h
index 60646b0c8..4d2819be3 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -59,7 +59,10 @@ public:
 	Film (Film const &);
 	~Film ();
 
-	std::string j2k_dir () const;
+	std::string hash_dir () const;
+	std::string j2c_path (int f, bool t) const;
+	std::string hash_path (int f) const;
+	std::string video_mxf_path () const;
 
 	void examine_content ();
 	void send_dcp_to_tms ();
@@ -78,10 +81,6 @@ public:
 	std::string file (std::string f) const;
 	std::string dir (std::string d) const;
 
-	std::string frame_out_path (int f, bool t) const;
-	std::string hash_out_path (int f, bool t) const;
-	std::string multichannel_audio_out_path (int c, bool t) const;
-	
 	std::string content_path () const;
 	ContentType content_type () const;
 	
@@ -413,6 +412,7 @@ private:
 
 	void signal_changed (Property);
 	void examine_content_finished ();
+	std::string video_state_identifier () const;
 
 	/** Complete path to directory containing the film metadata;
 	 *  must not be relative.
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 6dd74c36c..e9a59c743 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -89,11 +89,6 @@ TranscodeJob::status () const
 		return "0%";
 	}
 
-	if (_encoder->skipping () && !finished ()) {
-		return "skipping already-encoded frames";
-	}
-		
-	
 	float const fps = _encoder->current_frames_per_second ();
 	if (fps == 0) {
 		return Job::status ();
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index a434db0ec..16ed5c349 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -42,7 +42,7 @@ Writer::Writer (shared_ptr<Film> f)
 	_picture_asset.reset (
 		new libdcp::MonoPictureAsset (
 			_film->dir (_film->dcp_name()),
-			"video.mxf",
+			_film->video_mxf_path(),
 			DCPFrameRate (_film->frames_per_second()).frames_per_second,
 			_film->format()->dcp_size()
 			)
@@ -164,9 +164,9 @@ Writer::thread ()
 			lock.unlock ();
 			_film->log()->log (String::compose ("Writer pulls %1 back from disk", fetch));
 			shared_ptr<const EncodedData> encoded;
-			if (boost::filesystem::exists (_film->frame_out_path (fetch, false))) {
+			if (boost::filesystem::exists (_film->j2c_path (fetch, false))) {
 				/* It's an actual frame (not a repeat-last); load it in */
-				encoded.reset (new EncodedData (_film->frame_out_path (fetch, false)));
+				encoded.reset (new EncodedData (_film->j2c_path (fetch, false)));
 			}
 			lock.lock ();
 
diff --git a/src/lib/wscript b/src/lib/wscript
index 02c426373..5d676f249 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -14,7 +14,6 @@ def build(bld):
 		 ab_transcoder.cc
                  audio_decoder.cc
                  audio_source.cc
-                 check_hashes_job.cc
 		 config.cc
                  combiner.cc
                  cross.cc
-- 
cgit v1.2.3


From aeb20874df252fd8d36f5d3742ed8e34f2215367 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 2 Feb 2013 13:46:20 +0000
Subject: First try at doing fake writes.

---
 src/lib/encoder.cc |   5 +-
 src/lib/writer.cc  | 161 ++++++++++++++++++++++++++++++++++-------------------
 src/lib/writer.h   |  27 ++++++++-
 3 files changed, 134 insertions(+), 59 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 978d787e8..b92be84a8 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -253,7 +253,10 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		return;
 	}
 
-	if (same && _have_a_real_frame) {
+	if (_writer->can_fake_write (_video_frames_out)) {
+		_writer->fake_write (_video_frames_out);
+		_have_a_real_frame = false;
+	} else if (same && _have_a_real_frame) {
 		/* Use the last frame that we encoded. */
 		_writer->repeat (_video_frames_out);
 		frame_done ();
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 7f338e238..a444efad8 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -47,7 +47,7 @@ Writer::Writer (shared_ptr<Film> f)
 {
 	check_existing_picture_mxf ();
 	
-	/* Create our picture asset in a subdirectory, named according to the
+	/* Create our picture asset in a subdirectory, named according to those
 	   film's parameters which affect the video output.  We will hard-link
 	   it into the DCP later.
 	*/
@@ -60,8 +60,8 @@ Writer::Writer (shared_ptr<Film> f)
 			_film->format()->dcp_size()
 			)
 		);
-	
-	_picture_asset_writer = _picture_asset->start_write ();
+
+	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
 	if (_film->audio_channels() > 0) {
 		_sound_asset.reset (
@@ -84,7 +84,30 @@ void
 Writer::write (shared_ptr<const EncodedData> encoded, int frame)
 {
 	boost::mutex::scoped_lock lock (_mutex);
-	_queue.push_back (make_pair (encoded, frame));
+
+	QueueItem qi;
+	qi.type = QueueItem::FULL;
+	qi.encoded = encoded;
+	qi.frame = frame;
+	_queue.push_back (qi);
+
+	_condition.notify_all ();
+}
+
+void
+Writer::fake_write (int frame)
+{
+	boost::mutex::scoped_lock lock (_mutex);
+
+	ifstream ifi (_film->info_path (frame).c_str());
+	libdcp::FrameInfo info (ifi);
+	
+	QueueItem qi;
+	qi.type = QueueItem::FAKE;
+	qi.size = info.size;
+	qi.frame = frame;
+	_queue.push_back (qi);
+
 	_condition.notify_all ();
 }
 
@@ -95,13 +118,6 @@ Writer::write (shared_ptr<const AudioBuffers> audio)
 	_sound_asset_writer->write (audio->data(), audio->frames());
 }
 
-struct QueueSorter
-{
-	bool operator() (pair<shared_ptr<const EncodedData>, int> const & a, pair<shared_ptr<const EncodedData>, int> const & b) {
-		return a.second < b.second;
-	}
-};
-
 void
 Writer::thread ()
 {
@@ -112,7 +128,7 @@ Writer::thread ()
 		while (1) {
 			if (_finish ||
 			    _queue.size() > _maximum_frames_in_memory ||
-			    (!_queue.empty() && _queue.front().second == (_last_written_frame + 1))) {
+			    (!_queue.empty() && _queue.front().frame == (_last_written_frame + 1))) {
 				    
 				    break;
 			    }
@@ -121,7 +137,7 @@ Writer::thread ()
 			    _condition.wait (lock);
 			    TIMING ("writer wakes with a queue of %1", _queue.size());
 
-			    _queue.sort (QueueSorter ());
+			    _queue.sort ();
 		}
 
 		if (_finish && _queue.empty() && _pending.empty()) {
@@ -129,19 +145,32 @@ Writer::thread ()
 		}
 
 		/* Write any frames that we can write; i.e. those that are in sequence */
-		while (!_queue.empty() && _queue.front().second == (_last_written_frame + 1)) {
-			pair<boost::shared_ptr<const EncodedData>, int> encoded = _queue.front ();
+		while (!_queue.empty() && _queue.front().frame == (_last_written_frame + 1)) {
+			QueueItem qi = _queue.front ();
 			_queue.pop_front ();
 
 			lock.unlock ();
-			_film->log()->log (String::compose ("Writer writes %1 to MXF", encoded.second));
-			if (encoded.first) {
-				libdcp::FrameInfo const fin = _picture_asset_writer->write (encoded.first->data(), encoded.first->size());
-				encoded.first->write_info (_film, encoded.second, fin);
-				_last_written = encoded.first;
-			} else {
+			switch (qi.type) {
+			case QueueItem::FULL:
+			{
+				_film->log()->log (String::compose ("Writer FULL-writes %1 to MXF", qi.frame));
+				libdcp::FrameInfo const fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size());
+				qi.encoded->write_info (_film, qi.frame, fin);
+				_last_written = qi.encoded;
+				break;
+			}
+			case QueueItem::FAKE:
+				_film->log()->log (String::compose ("Writer FAKE-writes %1 to MXF", qi.frame));
+				_picture_asset_writer->fake_write (qi.size);
+				_last_written.reset ();
+				break;
+			case QueueItem::REPEAT:
+			{
+				_film->log()->log (String::compose ("Writer REPEAT-writes %1 to MXF", qi.frame));
 				libdcp::FrameInfo const fin = _picture_asset_writer->write (_last_written->data(), _last_written->size());
-				_last_written->write_info (_film, encoded.second, fin);
+				_last_written->write_info (_film, qi.frame, fin);
+				break;
+			}
 			}
 			lock.lock ();
 
@@ -150,41 +179,39 @@ Writer::thread ()
 
 		while (_queue.size() > _maximum_frames_in_memory) {
 			/* Too many frames in memory which can't yet be written to the stream.
-			   Put some to disk.
+			   Put some in our pending list (and write FULL queue items' data to disk)
 			*/
 
-			pair<boost::shared_ptr<const EncodedData>, int> encoded = _queue.back ();
+			QueueItem qi = _queue.back ();
 			_queue.pop_back ();
-			if (!encoded.first) {
-				/* This is a `repeat-last' frame, so no need to write it to disk */
-				continue;
-			}
 
-			lock.unlock ();
-			_film->log()->log (String::compose ("Writer full (awaiting %1); pushes %2 to disk", _last_written_frame + 1, encoded.second));
-			encoded.first->write (_film, encoded.second);
-			lock.lock ();
+			if (qi.type == QueueItem::FULL) {
+				lock.unlock ();
+				_film->log()->log (String::compose ("Writer full (awaiting %1); pushes %2 to disk", _last_written_frame + 1, qi.frame));
+				qi.encoded->write (_film, qi.frame);
+				lock.lock ();
+				qi.encoded.reset ();
+			}
 
-			_pending.push_back (encoded.second);
+			_pending.push_back (qi);
 		}
 
 		while (_queue.size() < _maximum_frames_in_memory && !_pending.empty()) {
 			/* We have some space in memory.  Fetch some frames back off disk. */
 
 			_pending.sort ();
-			int const fetch = _pending.front ();
-
-			lock.unlock ();
-			_film->log()->log (String::compose ("Writer pulls %1 back from disk", fetch));
-			shared_ptr<const EncodedData> encoded;
-			if (boost::filesystem::exists (_film->j2c_path (fetch, false))) {
-				/* It's an actual frame (not a repeat-last); load it in */
-				encoded.reset (new EncodedData (_film->j2c_path (fetch, false)));
+			QueueItem qi = _pending.front ();
+
+			if (qi.type == QueueItem::FULL) {
+				lock.unlock ();
+				_film->log()->log (String::compose ("Writer pulls %1 back from disk", qi.frame));
+				shared_ptr<const EncodedData> encoded;
+				qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, false)));
+				lock.lock ();
 			}
-			lock.lock ();
 
-			_queue.push_back (make_pair (encoded, fetch));
-			_pending.remove (fetch);
+			_queue.push_back (qi);
+			_pending.remove (qi);
 		}
 	}
 
@@ -266,20 +293,24 @@ void
 Writer::repeat (int f)
 {
 	boost::mutex::scoped_lock lock (_mutex);
-	_queue.push_back (make_pair (shared_ptr<const EncodedData> (), f));
+
+	QueueItem qi;
+	qi.type = QueueItem::REPEAT;
+	qi.frame = f;
+	
+	_queue.push_back (qi);
+
+	_condition.notify_all ();
 }
 
+
 void
 Writer::check_existing_picture_mxf ()
 {
+	/* Try to open the existing MXF */
 	boost::filesystem::path p;
 	p /= _film->video_mxf_dir ();
 	p /= _film->video_mxf_filename ();
-	if (!boost::filesystem::exists (p)) {
-		return;
-	}
-
-	/* Try to open the picture MXF */
 	FILE* mxf = fopen (p.string().c_str(), "rb");
 	if (!mxf) {
 		return;
@@ -293,20 +324,38 @@ Writer::check_existing_picture_mxf ()
 
 		/* Read the data from the MXF and hash it */
 		fseek (mxf, info.offset, SEEK_SET);
-		uint8_t* data = new uint8_t[info.length];
-		fread (data, 1, info.length, mxf);
-		string const existing_hash = md5_digest (data, info.length);
-		delete[] data;
+		EncodedData data (info.size);
+		fread (data.data(), 1, data.size(), mxf);
+		string const existing_hash = md5_digest (data.data(), data.size());
 		
 		if (existing_hash != info.hash) {
-			cout << "frame " << _first_nonexistant_frame << " failed hash check.\n";
+			_film->log()->log (String::compose ("Existing frame %1 failed hash check", _first_nonexistant_frame));
 			break;
 		}
 
-		cout << "frame " << _first_nonexistant_frame << " ok.\n";
+		_film->log()->log (String::compose ("Have existing frame %1", _first_nonexistant_frame));
 		++_first_nonexistant_frame;
 	}
 
 	fclose (mxf);
 }
 
+/** @return true if the fake write succeeded, otherwise false */
+bool
+Writer::can_fake_write (int frame) const
+{
+	return (frame != 0 && frame < _first_nonexistant_frame);
+}
+
+
+bool
+operator< (QueueItem const & a, QueueItem const & b)
+{
+	return a.frame < b.frame;
+}
+
+bool
+operator== (QueueItem const & a, QueueItem const & b)
+{
+	return a.frame == b.frame;
+}
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 768d63448..57609825d 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -33,12 +33,35 @@ namespace libdcp {
 	class SoundAssetWriter;
 }
 
+struct QueueItem
+{
+public:
+	enum Type {
+		FULL,
+		FAKE,
+		REPEAT
+	} type;
+
+	/** encoded data for FULL */
+	boost::shared_ptr<const EncodedData> encoded;
+	/** size of data for FAKE */
+	int size;
+	/** frame index */
+	int frame;
+};
+
+bool operator< (QueueItem const & a, QueueItem const & b);
+bool operator== (QueueItem const & a, QueueItem const & b);
+
 class Writer
 {
 public:
 	Writer (boost::shared_ptr<Film>);
+
+	bool can_fake_write (int) const;
 	
 	void write (boost::shared_ptr<const EncodedData>, int);
+	void fake_write (int);
 	void write (boost::shared_ptr<const AudioBuffers>);
 	void repeat (int f);
 	void finish ();
@@ -53,11 +76,11 @@ private:
 
 	boost::thread* _thread;
 	bool _finish;
-	std::list<std::pair<boost::shared_ptr<const EncodedData>, int> > _queue;
+	std::list<QueueItem> _queue;
 	mutable boost::mutex _mutex;
 	boost::condition _condition;
 	boost::shared_ptr<const EncodedData> _last_written;
-	std::list<int> _pending;
+	std::list<QueueItem> _pending;
 	int _last_written_frame;
 	static const unsigned int _maximum_frames_in_memory;
 
-- 
cgit v1.2.3


From 9298f5a03786be14cfe3c37871e76f749617e6ca Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 7 Feb 2013 14:53:14 +0000
Subject: Add believed missing frame done.

---
 src/lib/encoder.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index b92be84a8..ccca719a3 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -256,6 +256,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	if (_writer->can_fake_write (_video_frames_out)) {
 		_writer->fake_write (_video_frames_out);
 		_have_a_real_frame = false;
+		frame_done ();
 	} else if (same && _have_a_real_frame) {
 		/* Use the last frame that we encoded. */
 		_writer->repeat (_video_frames_out);
-- 
cgit v1.2.3


From 748995a13c2a6758ef867b2b78b945342768bae7 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 8 Feb 2013 12:47:51 +0000
Subject: Rename some things.

---
 src/lib/encoder.cc | 74 +++++++++++++++++++++++++++---------------------------
 src/lib/encoder.h  | 14 +++++------
 2 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index ccca719a3..8d8e8c0e4 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -61,14 +61,14 @@ Encoder::Encoder (shared_ptr<Film> f)
 	, _swr_context (0)
 #endif
 	, _have_a_real_frame (false)
-	, _terminate_encoder (false)
+	, _terminate (false)
 {
 	
 }
 
 Encoder::~Encoder ()
 {
-	terminate_worker_threads ();
+	terminate_threads ();
 	if (_writer) {
 		_writer->finish ();
 	}
@@ -107,14 +107,14 @@ Encoder::process_begin ()
 	}
 
 	for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
-		_worker_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, (ServerDescription *) 0)));
+		_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, (ServerDescription *) 0)));
 	}
 
 	vector<ServerDescription*> servers = Config::instance()->servers ();
 
 	for (vector<ServerDescription*>::iterator i = servers.begin(); i != servers.end(); ++i) {
 		for (int j = 0; j < (*i)->threads (); ++j) {
-			_worker_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, *i)));
+			_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, *i)));
 		}
 	}
 
@@ -149,33 +149,33 @@ Encoder::process_end ()
 	}
 #endif
 
-	boost::mutex::scoped_lock lock (_worker_mutex);
+	boost::mutex::scoped_lock lock (_mutex);
 
-	_film->log()->log ("Clearing queue of " + lexical_cast<string> (_encode_queue.size ()));
+	_film->log()->log ("Clearing queue of " + lexical_cast<string> (_queue.size ()));
 
 	/* Keep waking workers until the queue is empty */
-	while (!_encode_queue.empty ()) {
-		_film->log()->log ("Waking with " + lexical_cast<string> (_encode_queue.size ()), Log::VERBOSE);
-		_worker_condition.notify_all ();
-		_worker_condition.wait (lock);
+	while (!_queue.empty ()) {
+		_film->log()->log ("Waking with " + lexical_cast<string> (_queue.size ()), Log::VERBOSE);
+		_condition.notify_all ();
+		_condition.wait (lock);
 	}
 
 	lock.unlock ();
 	
-	terminate_worker_threads ();
+	terminate_threads ();
 
-	_film->log()->log ("Mopping up " + lexical_cast<string> (_encode_queue.size()));
+	_film->log()->log ("Mopping up " + lexical_cast<string> (_queue.size()));
 
 	/* The following sequence of events can occur in the above code:
 	     1. a remote worker takes the last image off the queue
 	     2. the loop above terminates
 	     3. the remote worker fails to encode the image and puts it back on the queue
-	     4. the remote worker is then terminated by terminate_worker_threads
+	     4. the remote worker is then terminated by terminate_threads
 
 	     So just mop up anything left in the queue here.
 	*/
 
-	for (list<shared_ptr<DCPVideoFrame> >::iterator i = _encode_queue.begin(); i != _encode_queue.end(); ++i) {
+	for (list<shared_ptr<DCPVideoFrame> >::iterator i = _queue.begin(); i != _queue.end(); ++i) {
 		_film->log()->log (String::compose ("Encode left-over frame %1", (*i)->frame ()));
 		try {
 			_writer->write ((*i)->encode_locally(), (*i)->frame ());
@@ -240,16 +240,16 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		return;
 	}
 
-	boost::mutex::scoped_lock lock (_worker_mutex);
+	boost::mutex::scoped_lock lock (_mutex);
 
 	/* Wait until the queue has gone down a bit */
-	while (_encode_queue.size() >= _worker_threads.size() * 2 && !_terminate_encoder) {
-		TIMING ("decoder sleeps with queue of %1", _encode_queue.size());
-		_worker_condition.wait (lock);
-		TIMING ("decoder wakes with queue of %1", _encode_queue.size());
+	while (_queue.size() >= _threads.size() * 2 && !_terminate) {
+		TIMING ("decoder sleeps with queue of %1", _queue.size());
+		_condition.wait (lock);
+		TIMING ("decoder wakes with queue of %1", _queue.size());
 	}
 
-	if (_terminate_encoder) {
+	if (_terminate) {
 		return;
 	}
 
@@ -264,8 +264,8 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	} else {
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
-		TIMING ("adding to queue of %1", _encode_queue.size ());
-		_encode_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
+		TIMING ("adding to queue of %1", _queue.size ());
+		_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
 						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
 						  _film->subtitle_offset(), _film->subtitle_scale(),
@@ -275,7 +275,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 						  )
 					  ));
 		
-		_worker_condition.notify_all ();
+		_condition.notify_all ();
 		_have_a_real_frame = true;
 	}
 
@@ -337,14 +337,14 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 }
 
 void
-Encoder::terminate_worker_threads ()
+Encoder::terminate_threads ()
 {
-	boost::mutex::scoped_lock lock (_worker_mutex);
-	_terminate_encoder = true;
-	_worker_condition.notify_all ();
+	boost::mutex::scoped_lock lock (_mutex);
+	_terminate = true;
+	_condition.notify_all ();
 	lock.unlock ();
 
-	for (list<boost::thread *>::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) {
+	for (list<boost::thread *>::iterator i = _threads.begin(); i != _threads.end(); ++i) {
 		(*i)->join ();
 		delete *i;
 	}
@@ -362,19 +362,19 @@ Encoder::encoder_thread (ServerDescription* server)
 	while (1) {
 
 		TIMING ("encoder thread %1 sleeps", boost::this_thread::get_id());
-		boost::mutex::scoped_lock lock (_worker_mutex);
-		while (_encode_queue.empty () && !_terminate_encoder) {
-			_worker_condition.wait (lock);
+		boost::mutex::scoped_lock lock (_mutex);
+		while (_queue.empty () && !_terminate) {
+			_condition.wait (lock);
 		}
 
-		if (_terminate_encoder) {
+		if (_terminate) {
 			return;
 		}
 
-		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _encode_queue.size());
-		boost::shared_ptr<DCPVideoFrame> vf = _encode_queue.front ();
+		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
+		boost::shared_ptr<DCPVideoFrame> vf = _queue.front ();
 		_film->log()->log (String::compose ("Encoder thread %1 pops frame %2 from queue", boost::this_thread::get_id(), vf->frame()), Log::VERBOSE);
-		_encode_queue.pop_front ();
+		_queue.pop_front ();
 		
 		lock.unlock ();
 
@@ -421,7 +421,7 @@ Encoder::encoder_thread (ServerDescription* server)
 			_film->log()->log (
 				String::compose ("Encoder thread %1 pushes frame %2 back onto queue after failure", boost::this_thread::get_id(), vf->frame())
 				);
-			_encode_queue.push_front (vf);
+			_queue.push_front (vf);
 			lock.unlock ();
 		}
 
@@ -430,6 +430,6 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		lock.lock ();
-		_worker_condition.notify_all ();
+		_condition.notify_all ();
 	}
 }
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 8b02f7004..69a5c5a23 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -21,7 +21,7 @@
 #define DVDOMATIC_ENCODER_H
 
 /** @file src/encoder.h
- *  @brief Parent class for classes which can encode video and audio frames.
+ *  @brief Encoder to J2K and WAV for DCP.
  */
 
 #include <boost/shared_ptr.hpp>
@@ -91,7 +91,7 @@ private:
 	void write_audio (boost::shared_ptr<const AudioBuffers> audio);
 
 	void encoder_thread (ServerDescription *);
-	void terminate_worker_threads ();
+	void terminate_threads ();
 
 	/** Film that we are encoding */
 	boost::shared_ptr<Film> _film;
@@ -115,11 +115,11 @@ private:
 #endif
 
 	bool _have_a_real_frame;
-	bool _terminate_encoder;
-	std::list<boost::shared_ptr<DCPVideoFrame> > _encode_queue;
-	std::list<boost::thread *> _worker_threads;
-	mutable boost::mutex _worker_mutex;
-	boost::condition _worker_condition;
+	bool _terminate;
+	std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
+	std::list<boost::thread *> _threads;
+	mutable boost::mutex _mutex;
+	boost::condition _condition;
 
 	boost::shared_ptr<Writer> _writer;
 };
-- 
cgit v1.2.3


From 567abac0d7824f27b8fdcd6fb7da7e5ddae62a0f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 8 Feb 2013 12:54:15 +0000
Subject: Some comments.

---
 src/lib/encoder.cc       |  4 +---
 src/lib/video_decoder.cc | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 8d8e8c0e4..0c810d12c 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -50,9 +50,7 @@ using namespace boost;
 
 int const Encoder::_history_size = 25;
 
-/** @param f Film that we are encoding.
- *  @param o Options.
- */
+/** @param f Film that we are encoding */
 Encoder::Encoder (shared_ptr<Film> f)
 	: _film (f)
 	, _video_frames_in (0)
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 0fa16bc32..c11b752ae 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -53,6 +53,10 @@ VideoDecoder::emit_video (shared_ptr<Image> image, double t)
 	_last_source_time = t;
 }
 
+/** Called by subclasses to repeat the last video frame that we
+ *  passed to emit_video().  If emit_video hasn't yet been called,
+ *  we will generate a black frame.
+ */
 void
 VideoDecoder::repeat_last_video ()
 {
@@ -64,6 +68,11 @@ VideoDecoder::repeat_last_video ()
 	signal_video (_last_image, true, _last_subtitle);
 }
 
+/** Emit our signal to say that some video data is ready.
+ *  @param image Video frame.
+ *  @param same true if `image' is the same as the last one we emitted.
+ *  @param sub Subtitle for this frame, or 0.
+ */
 void
 VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
 {
@@ -75,6 +84,11 @@ VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subti
 	_last_subtitle = sub;
 }
 
+/** Set up the current subtitle.  This will be put onto frames that
+ *  fit within its time specification.  s may be 0 to say that there
+ *  is no current subtitle.
+ *  @param s New current subtitle, or 0.
+ */
 void
 VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
 {
@@ -86,6 +100,9 @@ VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
 	}
 }
 
+/** Set which stream of subtitles we should use from our source.
+ *  @param s Stream to use.
+ */
 void
 VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
 {
-- 
cgit v1.2.3


From beea3beacba34c11b6b73323f4c3c8590a9aa73e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 11 Feb 2013 00:18:40 +0000
Subject: Basic attempt to catch exceptions in the writer thread and pass them
 safely back to the GUI.

---
 src/lib/encoder.cc   |  4 ++++
 src/lib/exceptions.h | 32 ++++++++++++++++++++++++++++++++
 src/lib/writer.cc    | 13 ++++++++++---
 src/lib/writer.h     |  5 +++--
 4 files changed, 49 insertions(+), 5 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 0c810d12c..d64622cba 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -251,6 +251,10 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		return;
 	}
 
+	if (_writer->thrown ()) {
+		_writer->rethrow ();
+	}
+
 	if (_writer->can_fake_write (_video_frames_out)) {
 		_writer->fake_write (_video_frames_out);
 		_have_a_real_frame = false;
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index bf8e85f0b..e757d2506 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DVDOMATIC_EXCEPTIONS_H
+#define DVDOMATIC_EXCEPTIONS_H
+
 /** @file  src/exceptions.h
  *  @brief Our exceptions.
  */
@@ -24,6 +27,8 @@
 #include <stdexcept>
 #include <sstream>
 #include <cstring>
+#include <boost/exception/all.hpp>
+#include <boost/thread.hpp>
 
 /** @class StringError
  *  @brief A parent class for exceptions using messages held in a std::string
@@ -224,3 +229,30 @@ public:
 		: StringError (s)
 	{}
 };
+
+class ExceptionStore
+{
+public:
+	bool thrown () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _exception;
+	}
+	
+	void rethrow () {
+		boost::mutex::scoped_lock lm (_mutex);
+		boost::rethrow_exception (_exception);
+	}
+
+protected:	
+	
+	void store_current () {
+		boost::mutex::scoped_lock lm (_mutex);
+		_exception = boost::current_exception ();
+	}
+
+private:
+	boost::exception_ptr _exception;
+	mutable boost::mutex _mutex;
+};
+
+#endif
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 1df8a4301..8a09f254b 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -85,7 +85,7 @@ Writer::Writer (shared_ptr<Film> f)
 
 		_sound_asset_writer = _sound_asset->start_write ();
 	}
-	
+
 	_thread = new boost::thread (boost::bind (&Writer::thread, this));
 }
 
@@ -130,6 +130,7 @@ Writer::write (shared_ptr<const AudioBuffers> audio)
 
 void
 Writer::thread ()
+try
 {
 	while (1)
 	{
@@ -221,7 +222,10 @@ Writer::thread ()
 			--_queued_full_in_memory;
 		}
 	}
-
+}
+catch (...)
+{
+	store_current ();
 }
 
 void
@@ -237,6 +241,10 @@ Writer::finish ()
 	lock.unlock ();
 
 	_thread->join ();
+	if (thrown ()) {
+		rethrow ();
+	}
+	
 	delete _thread;
 	_thread = 0;
 
@@ -361,7 +369,6 @@ Writer::can_fake_write (int frame) const
 	return (frame != 0 && frame < _first_nonexistant_frame);
 }
 
-
 bool
 operator< (QueueItem const & a, QueueItem const & b)
 {
diff --git a/src/lib/writer.h b/src/lib/writer.h
index cee20acb9..beb16c7b9 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -21,6 +21,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
+#include "exceptions.h"
 
 class Film;
 class EncodedData;
@@ -59,7 +60,7 @@ public:
 bool operator< (QueueItem const & a, QueueItem const & b);
 bool operator== (QueueItem const & a, QueueItem const & b);
 
-class Writer
+class Writer : public ExceptionStore
 {
 public:
 	Writer (boost::shared_ptr<Film>);
@@ -113,7 +114,7 @@ private:
 	    due to the limit of frames to be held in memory.
 	*/
 	int _pushed_to_disk;
-
+	
 	boost::shared_ptr<libdcp::MonoPictureAsset> _picture_asset;
 	boost::shared_ptr<libdcp::MonoPictureAssetWriter> _picture_asset_writer;
 	boost::shared_ptr<libdcp::SoundAsset> _sound_asset;
-- 
cgit v1.2.3


From c9831a8704aeae286be6c39bfbdc4b48cff1f087 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 18 Feb 2013 09:55:07 +0000
Subject: Try to fix crash on finishing off DCPs with mono -> 5.1 conversions.

---
 src/lib/encoder.cc | 42 ++++++++++++++++++++++++------------------
 src/lib/encoder.h  |  2 +-
 2 files changed, 25 insertions(+), 19 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index d64622cba..f25256379 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -140,7 +140,7 @@ Encoder::process_end ()
 			}
 
 			out->set_frames (frames);
-			_writer->write (out);
+			write_audio (out);
 		}
 
 		swr_free (&_swr_context);
@@ -319,23 +319,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 	}
 #endif
 
-	if (_film->audio_channels() == 1) {
-		/* We need to switch things around so that the mono channel is on
-		   the centre channel of a 5.1 set (with other channels silent).
-		*/
-
-		shared_ptr<AudioBuffers> b (new AudioBuffers (6, data->frames ()));
-		b->make_silent (libdcp::LEFT);
-		b->make_silent (libdcp::RIGHT);
-		memcpy (b->data()[libdcp::CENTRE], data->data()[0], data->frames() * sizeof(float));
-		b->make_silent (libdcp::LFE);
-		b->make_silent (libdcp::LS);
-		b->make_silent (libdcp::RS);
-
-		data = b;
-	}
-
-	_writer->write (data);
+	write_audio (data);
 }
 
 void
@@ -435,3 +419,25 @@ Encoder::encoder_thread (ServerDescription* server)
 		_condition.notify_all ();
 	}
 }
+
+void
+Encoder::write_audio (shared_ptr<const AudioBuffers> data)
+{
+	if (_film->audio_channels() == 1) {
+		/* We need to switch things around so that the mono channel is on
+		   the centre channel of a 5.1 set (with other channels silent).
+		*/
+
+		shared_ptr<AudioBuffers> b (new AudioBuffers (6, data->frames ()));
+		b->make_silent (libdcp::LEFT);
+		b->make_silent (libdcp::RIGHT);
+		memcpy (b->data()[libdcp::CENTRE], data->data()[0], data->frames() * sizeof(float));
+		b->make_silent (libdcp::LFE);
+		b->make_silent (libdcp::LS);
+		b->make_silent (libdcp::RS);
+
+		data = b;
+	}
+
+	_writer->write (data);
+}
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 69a5c5a23..86880bc34 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -88,7 +88,7 @@ private:
 	
 	void frame_done ();
 	
-	void write_audio (boost::shared_ptr<const AudioBuffers> audio);
+	void write_audio (boost::shared_ptr<const AudioBuffers> data);
 
 	void encoder_thread (ServerDescription *);
 	void terminate_threads ();
-- 
cgit v1.2.3


From eac941aed6e6eed7f0329e42c7a036ed620f8df0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 25 Feb 2013 20:52:20 +0000
Subject: Try to tidy up channel mapping a bit.

---
 src/lib/encoder.cc     | 26 ++++++++++----------
 src/lib/util.cc        | 65 ++++++++++++++++++++++++++++++++++++++++----------
 src/lib/util.h         | 15 +++++++++++-
 src/lib/writer.cc      |  6 +++--
 src/wx/audio_dialog.cc | 32 +++++++++++++++++--------
 5 files changed, 106 insertions(+), 38 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index f25256379..07139968d 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -423,18 +423,20 @@ Encoder::encoder_thread (ServerDescription* server)
 void
 Encoder::write_audio (shared_ptr<const AudioBuffers> data)
 {
-	if (_film->audio_channels() == 1) {
-		/* We need to switch things around so that the mono channel is on
-		   the centre channel of a 5.1 set (with other channels silent).
-		*/
-
-		shared_ptr<AudioBuffers> b (new AudioBuffers (6, data->frames ()));
-		b->make_silent (libdcp::LEFT);
-		b->make_silent (libdcp::RIGHT);
-		memcpy (b->data()[libdcp::CENTRE], data->data()[0], data->frames() * sizeof(float));
-		b->make_silent (libdcp::LFE);
-		b->make_silent (libdcp::LS);
-		b->make_silent (libdcp::RS);
+	AudioMapping m (_film->audio_channels ());
+	if (m.dcp_channels() != _film->audio_channels()) {
+
+		/* Remap (currently just for mono -> 5.1) */
+
+		shared_ptr<AudioBuffers> b (new AudioBuffers (m.dcp_channels(), data->frames ()));
+		for (int i = 0; i < m.dcp_channels(); ++i) {
+			optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (i));
+			if (!s) {
+				b->make_silent (i);
+			} else {
+				memcpy (b->data()[i], data->data()[s.get()], data->frames() * sizeof(float));
+			}
+		}
 
 		data = b;
 	}
diff --git a/src/lib/util.cc b/src/lib/util.cc
index f807bf329..8ad980361 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -445,19 +445,6 @@ dcp_audio_sample_rate (int fs)
 	return 96000;
 }
 
-int
-dcp_audio_channels (int f)
-{
-	if (f == 1) {
-		/* The source is mono, so to put the mono channel into
-		   the centre we need to generate a 5.1 soundtrack.
-		*/
-		return 6;
-	}
-
-	return f;
-}
-
 bool operator== (Crop const & a, Crop const & b)
 {
 	return (a.left == b.left && a.right == b.right && a.top == b.top && a.bottom == b.bottom);
@@ -918,3 +905,55 @@ audio_channel_name (int c)
 
 	return channels[c];
 }
+
+AudioMapping::AudioMapping (int c)
+	: _source_channels (c)
+{
+
+}
+
+optional<libdcp::Channel>
+AudioMapping::source_to_dcp (int c) const
+{
+	if (c >= _source_channels) {
+		return optional<libdcp::Channel> ();
+	}
+
+	if (_source_channels == 1) {
+		/* mono sources to centre */
+		return libdcp::CENTRE;
+	}
+	
+	return static_cast<libdcp::Channel> (c);
+}
+
+optional<int>
+AudioMapping::dcp_to_source (libdcp::Channel c) const
+{
+	if (_source_channels == 1) {
+		if (c == libdcp::CENTRE) {
+			return 0;
+		} else {
+			return optional<int> ();
+		}
+	}
+
+	if (static_cast<int> (c) >= _source_channels) {
+		return optional<int> ();
+	}
+	
+	return static_cast<int> (c);
+}
+
+int
+AudioMapping::dcp_channels () const
+{
+	if (_source_channels == 1) {
+		/* The source is mono, so to put the mono channel into
+		   the centre we need to generate a 5.1 soundtrack.
+		*/
+		return 6;
+	}
+
+	return _source_channels;
+}
diff --git a/src/lib/util.h b/src/lib/util.h
index b76aead41..22c6ea95b 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -29,6 +29,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <boost/asio.hpp>
+#include <boost/optional.hpp>
 #include <libdcp/util.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -179,7 +180,6 @@ struct Rect
 
 extern std::string crop_string (Position, libdcp::Size);
 extern int dcp_audio_sample_rate (int);
-extern int dcp_audio_channels (int);
 extern std::string colour_lut_index_to_name (int index);
 extern int stride_round_up (int, int const *, int);
 extern int stride_lookup (int c, int const * stride);
@@ -269,6 +269,19 @@ private:
 	float** _data;
 };
 
+class AudioMapping
+{
+public:
+	AudioMapping (int);
+
+	boost::optional<libdcp::Channel> source_to_dcp (int c) const;
+	boost::optional<int> dcp_to_source (libdcp::Channel c) const;
+	int dcp_channels () const;
+
+private:
+	int _source_channels;
+};
+
 extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second);
 extern bool still_image_file (std::string);
 extern std::pair<std::string, int> cpu_info ();
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index c2cc00328..1dad4357d 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -72,13 +72,15 @@ Writer::Writer (shared_ptr<Film> f)
 
 	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
-	if (dcp_audio_channels (_film->audio_channels()) > 0) {
+	AudioMapping m (_film->audio_channels ());
+	
+	if (m.dcp_channels() > 0) {
 		_sound_asset.reset (
 			new libdcp::SoundAsset (
 				_film->dir (_film->dcp_name()),
 				"audio.mxf",
 				DCPFrameRate (_film->frames_per_second()).frames_per_second,
-				dcp_audio_channels (_film->audio_channels()),
+				m.dcp_channels (),
 				dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
 				)
 			);
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index dc297e246..a422e4e46 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -26,6 +26,7 @@
 
 using boost::shared_ptr;
 using boost::bind;
+using boost::optional;
 
 AudioDialog::AudioDialog (wxWindow* parent)
 	: wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
@@ -89,13 +90,15 @@ AudioDialog::setup_channels ()
 	if (!_film->audio_stream()) {
 		return;
 	}
-	
-	for (int i = 0; i < _film->audio_stream()->channels(); ++i) {
-		_channel_checkbox[i]->Show ();
-	}
 
-	for (int i = _film->audio_stream()->channels(); i < MAX_AUDIO_CHANNELS; ++i) {
-		_channel_checkbox[i]->Hide ();
+	AudioMapping m (_film->audio_stream()->channels ());
+	
+	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+		if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
+			_channel_checkbox[i]->Show ();
+		} else {
+			_channel_checkbox[i]->Hide ();
+		}
 	}
 }	
 
@@ -113,8 +116,13 @@ AudioDialog::try_to_load_analysis ()
 	}
 		
 	_plot->set_analysis (a);
-	_channel_checkbox[0]->SetValue (true);
-	_plot->set_channel_visible (0, true);
+
+	AudioMapping m (_film->audio_stream()->channels ());
+	optional<libdcp::Channel> c = m.source_to_dcp (0);
+	if (c) {
+		_channel_checkbox[c.get()]->SetValue (true);
+		_plot->set_channel_visible (0, true);
+	}
 
 	for (int i = 0; i < AudioPoint::COUNT; ++i) {
 		_type_checkbox[i]->SetValue (true);
@@ -131,8 +139,12 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 	}
 
 	assert (c < MAX_AUDIO_CHANNELS);
-	
-	_plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
+
+	AudioMapping m (_film->audio_stream()->channels ());
+	optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (c));
+	if (s) {
+		_plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ());
+	}
 }
 
 void
-- 
cgit v1.2.3


From 0d3f5aae5b99832b7c5d55f32f5bccb365caa3fd Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 28 Feb 2013 22:20:07 +0000
Subject: Various markup and tweaks.

---
 TRANSLATORS                       |   2 +-
 i18n.py                           |  10 +-
 run/dvdomatic                     |   3 +
 src/lib/ab_transcode_job.cc       |   4 +-
 src/lib/config.cc                 |  54 ++++----
 src/lib/dci_metadata.cc           |  30 ++--
 src/lib/dcp_content_type.cc       |  22 +--
 src/lib/dcp_video_frame.cc        |  62 +++++----
 src/lib/decoder.cc                |   6 +-
 src/lib/dolby_cp750.cc            |   4 +-
 src/lib/encoder.cc                |  44 +++---
 src/lib/examine_content_job.cc    |  10 +-
 src/lib/external_audio_decoder.cc |  12 +-
 src/lib/ffmpeg_compatibility.cc   |  10 +-
 src/lib/ffmpeg_decoder.cc         |  50 +++----
 src/lib/film.cc                   | 284 +++++++++++++++++++-------------------
 src/lib/filter.cc                 |  54 ++++----
 src/lib/filter_graph.cc           |  48 ++++---
 src/lib/format.cc                 |  35 ++---
 src/lib/image.cc                  |   8 +-
 src/lib/imagemagick_decoder.cc    |   4 +-
 src/lib/job.cc                    |  23 +--
 src/lib/log.cc                    |  12 +-
 src/lib/matcher.cc                |  10 +-
 src/lib/scaler.cc                 |  20 +--
 src/lib/scp_dcp_job.cc            |  36 ++---
 src/lib/server.cc                 |  44 +++---
 src/lib/stream.cc                 |   4 +-
 src/lib/subtitle.cc               |   6 +-
 src/lib/timer.cc                  |  10 +-
 src/lib/transcode_job.cc          |  14 +-
 src/lib/util.cc                   |  80 ++++++-----
 src/lib/video_decoder.cc          |   4 +-
 src/lib/writer.cc                 |  28 ++--
 src/tools/dvdomatic.cc            |  10 +-
 src/wx/config_dialog.cc           |   4 +-
 src/wx/film_editor.cc             |  23 ++-
 src/wx/film_viewer.cc             |   2 +-
 src/wx/properties_dialog.cc       |   2 +-
 src/wx/server_dialog.cc           |   2 +-
 wscript                           |   4 +-
 41 files changed, 580 insertions(+), 514 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/TRANSLATORS b/TRANSLATORS
index cbfc875d4..625b03613 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -1,7 +1,7 @@
 Translating DVD-o-matic
 -----------------------
 
-1.  Run ./waf po
+1.  Run ./waf pot
 
 This will generate build/src/lib/dvdomatic.pot and build/src/wx/libdvdomatic-wx.pot.
 
diff --git a/i18n.py b/i18n.py
index 10eaa38e9..c22cbdb95 100644
--- a/i18n.py
+++ b/i18n.py
@@ -2,15 +2,19 @@ import glob
 import os
 from waflib import Logs
 
-def pot(dir, sources, name):
+def pot(dir, sources, name, all = False):
     s = ""
     for f in sources.split('\n'):
         t = f.strip()
         if len(t) > 0:
             s += (os.path.join(dir, t)) + " "
 
-    Logs.info('Making %s.pot' % os.path.join('build', dir, name))
-    os.system('xgettext -d %s -s --keyword=_ -p %s -o %s.pot %s' % (name, os.path.join('build', dir), name, s))
+    if all:
+        Logs.info('Making %s.pot (extracting all)' % os.path.join('build', dir, name))
+        os.system('xgettext -d %s -s --extract-all -p %s -o %s.pot %s' % (name, os.path.join('build', dir), name, s))
+    else:
+        Logs.info('Making %s.pot' % os.path.join('build', dir, name))
+        os.system('xgettext -d %s -s --keyword=_ --add-comments=/ -p %s -o %s.pot %s' % (name, os.path.join('build', dir), name, s))
     
 
 def po_to_mo(dir, name):
diff --git a/run/dvdomatic b/run/dvdomatic
index ff3897064..31fd09fb9 100755
--- a/run/dvdomatic
+++ b/run/dvdomatic
@@ -7,6 +7,9 @@ if [ "$1" == "--debug" ]; then
 elif [ "$1" == "--valgrind" ]; then
     shift
     valgrind --tool="memcheck" build/src/tools/dvdomatic $*
+elif [ "$1" == "--i18n" ]; then
+    shift
+    LANG=fr_FR.UTF8 build/src/tools/dvdomatic "$*"
 else
     build/src/tools/dvdomatic "$*"
 fi
diff --git a/src/lib/ab_transcode_job.cc b/src/lib/ab_transcode_job.cc
index 025c23c86..4ffdd9af6 100644
--- a/src/lib/ab_transcode_job.cc
+++ b/src/lib/ab_transcode_job.cc
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "encoder.h"
 
+#include "i18n.h"
+
 using std::string;
 using boost::shared_ptr;
 
@@ -44,7 +46,7 @@ ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, DecodeOptions o)
 string
 ABTranscodeJob::name () const
 {
-	return String::compose ("A/B transcode %1", _film->name());
+	return String::compose (_("A/B transcode %1"), _film->name());
 }
 
 void
diff --git a/src/lib/config.cc b/src/lib/config.cc
index c165859b0..82a31b3cf 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -28,6 +28,8 @@
 #include "filter.h"
 #include "sound_processor.h"
 
+#include "i18n.h"
+
 using std::vector;
 using std::ifstream;
 using std::string;
@@ -40,9 +42,9 @@ Config* Config::_instance = 0;
 Config::Config ()
 	: _num_local_encoding_threads (2)
 	, _server_port (6192)
-	, _reference_scaler (Scaler::from_id ("bicubic"))
-	, _tms_path (".")
-	, _sound_processor (SoundProcessor::from_id ("dolby_cp750"))
+	, _reference_scaler (Scaler::from_id (N_("bicubic")))
+	, _tms_path (N_("."))
+	, _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
 {
 	_allowed_dcp_frame_rates.push_back (24);
 	_allowed_dcp_frame_rates.push_back (25);
@@ -67,27 +69,27 @@ Config::Config ()
 		string const k = line.substr (0, s);
 		string const v = line.substr (s + 1);
 
-		if (k == "num_local_encoding_threads") {
+		if (k == N_("num_local_encoding_threads")) {
 			_num_local_encoding_threads = atoi (v.c_str ());
-		} else if (k == "default_directory") {
+		} else if (k == N_("default_directory")) {
 			_default_directory = v;
-		} else if (k == "server_port") {
+		} else if (k == N_("server_port")) {
 			_server_port = atoi (v.c_str ());
-		} else if (k == "reference_scaler") {
+		} else if (k == N_("reference_scaler")) {
 			_reference_scaler = Scaler::from_id (v);
-		} else if (k == "reference_filter") {
+		} else if (k == N_("reference_filter")) {
 			_reference_filters.push_back (Filter::from_id (v));
-		} else if (k == "server") {
+		} else if (k == N_("server")) {
 			_servers.push_back (ServerDescription::create_from_metadata (v));
-		} else if (k == "tms_ip") {
+		} else if (k == N_("tms_ip")) {
 			_tms_ip = v;
-		} else if (k == "tms_path") {
+		} else if (k == N_("tms_path")) {
 			_tms_path = v;
-		} else if (k == "tms_user") {
+		} else if (k == N_("tms_user")) {
 			_tms_user = v;
-		} else if (k == "tms_password") {
+		} else if (k == N_("tms_password")) {
 			_tms_password = v;
-		} else if (k == "sound_processor") {
+		} else if (k == N_("sound_processor")) {
 			_sound_processor = SoundProcessor::from_id (v);
 		}
 
@@ -101,7 +103,7 @@ Config::file () const
 {
 	boost::filesystem::path p;
 	p /= g_get_user_config_dir ();
-	p /= ".dvdomatic";
+	p /= N_(".dvdomatic");
 	return p.string ();
 }
 
@@ -121,24 +123,24 @@ void
 Config::write () const
 {
 	ofstream f (file().c_str ());
-	f << "num_local_encoding_threads " << _num_local_encoding_threads << "\n"
-	  << "default_directory " << _default_directory << "\n"
-	  << "server_port " << _server_port << "\n"
-	  << "reference_scaler " << _reference_scaler->id () << "\n";
+	f << N_("num_local_encoding_threads ") << _num_local_encoding_threads << N_("\n")
+	  << N_("default_directory ") << _default_directory << N_("\n")
+	  << N_("server_port ") << _server_port << N_("\n")
+	  << N_("reference_scaler ") << _reference_scaler->id () << N_("\n");
 
 	for (vector<Filter const *>::const_iterator i = _reference_filters.begin(); i != _reference_filters.end(); ++i) {
-		f << "reference_filter " << (*i)->id () << "\n";
+		f << N_("reference_filter ") << (*i)->id () << N_("\n");
 	}
 	
 	for (vector<ServerDescription*>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
-		f << "server " << (*i)->as_metadata () << "\n";
+		f << N_("server ") << (*i)->as_metadata () << N_("\n");
 	}
 
-	f << "tms_ip " << _tms_ip << "\n";
-	f << "tms_path " << _tms_path << "\n";
-	f << "tms_user " << _tms_user << "\n";
-	f << "tms_password " << _tms_password << "\n";
-	f << "sound_processor " << _sound_processor->id () << "\n";
+	f << N_("tms_ip ") << _tms_ip << N_("\n");
+	f << N_("tms_path ") << _tms_path << N_("\n");
+	f << N_("tms_user ") << _tms_user << N_("\n");
+	f << N_("tms_password ") << _tms_password << N_("\n");
+	f << N_("sound_processor ") << _sound_processor->id () << N_("\n");
 
 	_default_dci_metadata.write (f);
 }
diff --git a/src/lib/dci_metadata.cc b/src/lib/dci_metadata.cc
index 2b4cc3ae7..758886db4 100644
--- a/src/lib/dci_metadata.cc
+++ b/src/lib/dci_metadata.cc
@@ -20,36 +20,38 @@
 #include <iostream>
 #include "dci_metadata.h"
 
+#include "i18n.h"
+
 using namespace std;
 
 void
 DCIMetadata::write (ostream& f) const
 {
-	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 << N_("audio_language ") << audio_language << N_("\n");
+	f << N_("subtitle_language ") << subtitle_language << N_("\n");
+	f << N_("territory ") << territory << N_("\n");
+	f << N_("rating ") << rating << N_("\n");
+	f << N_("studio ") << studio << N_("\n");
+	f << N_("facility ") << facility << N_("\n");
+	f << N_("package_type ") << package_type << N_("\n");
 }
 
 void
 DCIMetadata::read (string k, string v)
 {
-	if (k == "audio_language") {
+	if (k == N_("audio_language")) {
 		audio_language = v;
-	} else if (k == "subtitle_language") {
+	} else if (k == N_("subtitle_language")) {
 		subtitle_language = v;
-	} else if (k == "territory") {
+	} else if (k == N_("territory")) {
 		territory = v;
-	} else if (k == "rating") {
+	} else if (k == N_("rating")) {
 		rating = v;
-	} else if (k == "studio") {
+	} else if (k == N_("studio")) {
 		studio = v;
-	} else if (k == "facility") {
+	} else if (k == N_("facility")) {
 		facility = v;
-	} else if (k == "package_type") {
+	} else if (k == N_("package_type")) {
 		package_type = v;
 	}
 }	
diff --git a/src/lib/dcp_content_type.cc b/src/lib/dcp_content_type.cc
index 1c96979e4..82bd5fa01 100644
--- a/src/lib/dcp_content_type.cc
+++ b/src/lib/dcp_content_type.cc
@@ -24,6 +24,8 @@
 #include <cassert>
 #include "dcp_content_type.h"
 
+#include "i18n.h"
+
 using namespace std;
 
 vector<DCPContentType const *> DCPContentType::_dcp_content_types;
@@ -39,16 +41,16 @@ DCPContentType::DCPContentType (string p, libdcp::ContentKind k, string d)
 void
 DCPContentType::setup_dcp_content_types ()
 {
-	_dcp_content_types.push_back (new DCPContentType ("Feature", libdcp::FEATURE, "FTR"));
-	_dcp_content_types.push_back (new DCPContentType ("Short", libdcp::SHORT, "SHR"));
-	_dcp_content_types.push_back (new DCPContentType ("Trailer", libdcp::TRAILER, "TLR"));
-	_dcp_content_types.push_back (new DCPContentType ("Test", libdcp::TEST, "TST"));
-	_dcp_content_types.push_back (new DCPContentType ("Transitional", libdcp::TRANSITIONAL, "XSN"));
-	_dcp_content_types.push_back (new DCPContentType ("Rating", libdcp::RATING, "RTG"));
-	_dcp_content_types.push_back (new DCPContentType ("Teaser", libdcp::TEASER, "TSR"));
-	_dcp_content_types.push_back (new DCPContentType ("Policy", libdcp::POLICY, "POL"));
-	_dcp_content_types.push_back (new DCPContentType ("Public Service Announcement", libdcp::PUBLIC_SERVICE_ANNOUNCEMENT, "PSA"));
-	_dcp_content_types.push_back (new DCPContentType ("Advertisement", libdcp::ADVERTISEMENT, "ADV"));
+	_dcp_content_types.push_back (new DCPContentType (_("Feature"), libdcp::FEATURE, N_("FTR")));
+	_dcp_content_types.push_back (new DCPContentType (_("Short"), libdcp::SHORT, N_("SHR")));
+	_dcp_content_types.push_back (new DCPContentType (_("Trailer"), libdcp::TRAILER, N_("TLR")));
+	_dcp_content_types.push_back (new DCPContentType (_("Test"), libdcp::TEST, N_("TST")));
+	_dcp_content_types.push_back (new DCPContentType (_("Transitional"), libdcp::TRANSITIONAL, N_("XSN")));
+	_dcp_content_types.push_back (new DCPContentType (_("Rating"), libdcp::RATING, N_("RTG")));
+	_dcp_content_types.push_back (new DCPContentType (_("Teaser"), libdcp::TEASER, N_("TSR")));
+	_dcp_content_types.push_back (new DCPContentType (_("Policy"), libdcp::POLICY, N_("POL")));
+	_dcp_content_types.push_back (new DCPContentType (_("Public Service Announcement"), libdcp::PUBLIC_SERVICE_ANNOUNCEMENT, N_("PSA")));
+	_dcp_content_types.push_back (new DCPContentType (_("Advertisement"), libdcp::ADVERTISEMENT, N_("ADV")));
 }
 
 DCPContentType const *
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 9b96724b0..098d222cd 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -56,6 +56,8 @@
 #include "log.h"
 #include "subtitle.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::stringstream;
 using std::ofstream;
@@ -119,7 +121,7 @@ DCPVideoFrame::create_openjpeg_container ()
 
 	_image = opj_image_create (3, &_cmptparm[0], CLRSPC_SRGB);
 	if (_image == 0) {
-		throw EncodeError ("could not create libopenjpeg image");
+		throw EncodeError (N_("could not create libopenjpeg image"));
 	}
 
 	_image->x0 = 0;
@@ -265,7 +267,7 @@ DCPVideoFrame::encode_locally ()
 	_parameters->tcp_numlayers++;
 	_parameters->cp_disto_alloc = 1;
 	_parameters->cp_rsiz = CINEMA2K;
-	_parameters->cp_comment = strdup ("DVD-o-matic");
+	_parameters->cp_comment = strdup (N_("DVD-o-matic"));
 	_parameters->cp_cinema = CINEMA2K_24;
 
 	/* 3 components, so use MCT */
@@ -278,7 +280,7 @@ DCPVideoFrame::encode_locally ()
 	/* get a J2K compressor handle */
 	_cinfo = opj_create_compress (CODEC_J2K);
 	if (_cinfo == 0) {
-		throw EncodeError ("could not create JPEG2000 encoder");
+		throw EncodeError (N_("could not create JPEG2000 encoder"));
 	}
 
 	/* Set event manager to null (openjpeg 1.3 bug) */
@@ -289,15 +291,15 @@ DCPVideoFrame::encode_locally ()
 
 	_cio = opj_cio_open ((opj_common_ptr) _cinfo, 0, 0);
 	if (_cio == 0) {
-		throw EncodeError ("could not open JPEG2000 stream");
+		throw EncodeError (N_("could not open JPEG2000 stream"));
 	}
 
 	int const r = opj_encode (_cinfo, _cio, _image, 0);
 	if (r == 0) {
-		throw EncodeError ("JPEG2000 encoding failed");
+		throw EncodeError (N_("JPEG2000 encoding failed"));
 	}
 
-	_log->log (String::compose ("Finished locally-encoded frame %1", _frame));
+	_log->log (String::compose (N_("Finished locally-encoded frame %1"), _frame));
 	
 	return shared_ptr<EncodedData> (new LocallyEncodedData (_cio->buffer, cio_tell (_cio)));
 }
@@ -319,35 +321,35 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
 	socket->connect (*endpoint_iterator);
 
 	stringstream s;
-	s << "encode please\n"
-	  << "input_width " << _input->size().width << "\n"
-	  << "input_height " << _input->size().height << "\n"
-	  << "input_pixel_format " << _input->pixel_format() << "\n"
-	  << "output_width " << _out_size.width << "\n"
-	  << "output_height " << _out_size.height << "\n"
-	  << "padding " <<  _padding << "\n"
-	  << "subtitle_offset " << _subtitle_offset << "\n"
-	  << "subtitle_scale " << _subtitle_scale << "\n"
-	  << "scaler " << _scaler->id () << "\n"
-	  << "frame " << _frame << "\n"
-	  << "frames_per_second " << _frames_per_second << "\n";
+	s << N_("encode please\n")
+	  << N_("input_width ") << _input->size().width << N_("\n")
+	  << N_("input_height ") << _input->size().height << N_("\n")
+	  << N_("input_pixel_format ") << _input->pixel_format() << N_("\n")
+	  << N_("output_width ") << _out_size.width << N_("\n")
+	  << N_("output_height ") << _out_size.height << N_("\n")
+	  << N_("padding ") <<  _padding << N_("\n")
+	  << N_("subtitle_offset ") << _subtitle_offset << N_("\n")
+	  << N_("subtitle_scale ") << _subtitle_scale << N_("\n")
+	  << N_("scaler ") << _scaler->id () << N_("\n")
+	  << N_("frame ") << _frame << N_("\n")
+	  << N_("frames_per_second ") << _frames_per_second << N_("\n");
 
 	if (!_post_process.empty()) {
-		s << "post_process " << _post_process << "\n";
+		s << N_("post_process ") << _post_process << N_("\n");
 	}
 	
-	s << "colour_lut " << _colour_lut << "\n"
-	  << "j2k_bandwidth " << _j2k_bandwidth << "\n";
+	s << N_("colour_lut ") << _colour_lut << N_("\n")
+	  << N_("j2k_bandwidth ") << _j2k_bandwidth << N_("\n");
 
 	if (_subtitle) {
-		s << "subtitle_x " << _subtitle->position().x << "\n"
-		  << "subtitle_y " << _subtitle->position().y << "\n"
-		  << "subtitle_width " << _subtitle->image()->size().width << "\n"
-		  << "subtitle_height " << _subtitle->image()->size().height << "\n";
+		s << N_("subtitle_x ") << _subtitle->position().x << N_("\n")
+		  << N_("subtitle_y ") << _subtitle->position().y << N_("\n")
+		  << N_("subtitle_width ") << _subtitle->image()->size().width << N_("\n")
+		  << N_("subtitle_height ") << _subtitle->image()->size().height << N_("\n");
 	}
 
 	_log->log (String::compose (
-			   "Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)",
+			   N_("Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)"),
 			   _input->pixel_format(), _input->components(),
 			   _input->lines(0), _input->lines(1), _input->lines(2),
 			   _input->line_size()[0], _input->line_size()[1], _input->line_size()[2]
@@ -364,7 +366,7 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
 	shared_ptr<EncodedData> e (new RemotelyEncodedData (socket->read_uint32 ()));
 	socket->read (e->data(), e->size());
 
-	_log->log (String::compose ("Finished remotely-encoded frame %1", _frame));
+	_log->log (String::compose (N_("Finished remotely-encoded frame %1"), _frame));
 	
 	return e;
 }
@@ -381,9 +383,9 @@ EncodedData::EncodedData (string file)
 	_size = boost::filesystem::file_size (file);
 	_data = new uint8_t[_size];
 
-	FILE* f = fopen (file.c_str(), "rb");
+	FILE* f = fopen (file.c_str(), N_("rb"));
 	if (!f) {
-		throw FileError ("could not open file for reading", file);
+		throw FileError (_("could not open file for reading"), file);
 	}
 	
 	fread (_data, 1, _size, f);
@@ -405,7 +407,7 @@ EncodedData::write (shared_ptr<const Film> film, int frame) const
 {
 	string const tmp_j2c = film->j2c_path (frame, true);
 
-	FILE* f = fopen (tmp_j2c.c_str (), "wb");
+	FILE* f = fopen (tmp_j2c.c_str (), N_("wb"));
 	
 	if (!f) {
 		throw WriteFileError (tmp_j2c, errno);
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 30009460f..52b22fa06 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -36,6 +36,8 @@
 #include "subtitle.h"
 #include "filter_graph.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::stringstream;
 using std::min;
@@ -60,7 +62,7 @@ Decoder::Decoder (boost::shared_ptr<Film> f, DecodeOptions o)
 bool
 Decoder::seek (double)
 {
-	throw DecodeError ("decoder does not support seek");
+	throw DecodeError (N_("decoder does not support seek"));
 }
 
 /** Seek so that the next frame we will produce is the same as the last one.
@@ -69,5 +71,5 @@ Decoder::seek (double)
 bool
 Decoder::seek_to_last ()
 {
-	throw DecodeError ("decoder does not support seek");
+	throw DecodeError (N_("decoder does not support seek"));
 }
diff --git a/src/lib/dolby_cp750.cc b/src/lib/dolby_cp750.cc
index 262e57bc7..b45e62b87 100644
--- a/src/lib/dolby_cp750.cc
+++ b/src/lib/dolby_cp750.cc
@@ -19,10 +19,12 @@
 
 #include "dolby_cp750.h"
 
+#include "i18n.h"
+
 using namespace std;
 
 DolbyCP750::DolbyCP750 ()
-	: SoundProcessor ("dolby_cp750", "Dolby CP750")
+        : SoundProcessor ("dolby_cp750", _("Dolby CP750"))
 {
 
 }
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index f25256379..d4a27d01b 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -39,6 +39,8 @@
 #include "cross.h"
 #include "writer.h"
 
+#include "i18n.h"
+
 using std::pair;
 using std::string;
 using std::stringstream;
@@ -79,7 +81,7 @@ Encoder::process_begin ()
 #ifdef HAVE_SWRESAMPLE
 
 		stringstream s;
-		s << "Will resample audio from " << _film->audio_stream()->sample_rate() << " to " << _film->target_audio_sample_rate();
+		s << String::compose (N_("Will resample audio from %1 to %2"), _film->audio_stream()->sample_rate(), _film->target_audio_sample_rate());
 		_film->log()->log (s.str ());
 
 		/* We will be using planar float data when we call the resampler */
@@ -96,7 +98,7 @@ Encoder::process_begin ()
 		
 		swr_init (_swr_context);
 #else
-		throw EncodeError ("Cannot resample audio as libswresample is not present");
+		throw EncodeError (_("Cannot resample audio as libswresample is not present"));
 #endif
 	} else {
 #ifdef HAVE_SWRESAMPLE
@@ -132,7 +134,7 @@ Encoder::process_end ()
 			int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0);
 
 			if (frames < 0) {
-				throw EncodeError ("could not run sample-rate converter");
+				throw EncodeError (_("could not run sample-rate converter"));
 			}
 
 			if (frames == 0) {
@@ -149,11 +151,11 @@ Encoder::process_end ()
 
 	boost::mutex::scoped_lock lock (_mutex);
 
-	_film->log()->log ("Clearing queue of " + lexical_cast<string> (_queue.size ()));
+	_film->log()->log (String::compose (N_("Clearing queue of %1"), _queue.size ()));
 
 	/* Keep waking workers until the queue is empty */
 	while (!_queue.empty ()) {
-		_film->log()->log ("Waking with " + lexical_cast<string> (_queue.size ()), Log::VERBOSE);
+		_film->log()->log (String::compose (N_("Waking with %1"), _queue.size ()), Log::VERBOSE);
 		_condition.notify_all ();
 		_condition.wait (lock);
 	}
@@ -162,7 +164,7 @@ Encoder::process_end ()
 	
 	terminate_threads ();
 
-	_film->log()->log ("Mopping up " + lexical_cast<string> (_queue.size()));
+	_film->log()->log (String::compose (N_("Mopping up %1"), _queue.size()));
 
 	/* The following sequence of events can occur in the above code:
 	     1. a remote worker takes the last image off the queue
@@ -174,12 +176,12 @@ Encoder::process_end ()
 	*/
 
 	for (list<shared_ptr<DCPVideoFrame> >::iterator i = _queue.begin(); i != _queue.end(); ++i) {
-		_film->log()->log (String::compose ("Encode left-over frame %1", (*i)->frame ()));
+		_film->log()->log (String::compose (N_("Encode left-over frame %1"), (*i)->frame ()));
 		try {
 			_writer->write ((*i)->encode_locally(), (*i)->frame ());
 			frame_done ();
 		} catch (std::exception& e) {
-			_film->log()->log (String::compose ("Local encode failed (%1)", e.what ()));
+			_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
 		}
 	}
 
@@ -242,9 +244,9 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 
 	/* Wait until the queue has gone down a bit */
 	while (_queue.size() >= _threads.size() * 2 && !_terminate) {
-		TIMING ("decoder sleeps with queue of %1", _queue.size());
+		TIMING (_("decoder sleeps with queue of %1"), _queue.size());
 		_condition.wait (lock);
-		TIMING ("decoder wakes with queue of %1", _queue.size());
+		TIMING (_("decoder wakes with queue of %1"), _queue.size());
 	}
 
 	if (_terminate) {
@@ -266,7 +268,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	} else {
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
-		TIMING ("adding to queue of %1", _queue.size ());
+		TIMING (_("adding to queue of %1"), _queue.size ());
 		_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
 						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
@@ -309,7 +311,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 			);
 		
 		if (resampled_frames < 0) {
-			throw EncodeError ("could not run sample-rate converter");
+			throw EncodeError (_("could not run sample-rate converter"));
 		}
 
 		resampled->set_frames (resampled_frames);
@@ -347,7 +349,7 @@ Encoder::encoder_thread (ServerDescription* server)
 	
 	while (1) {
 
-		TIMING ("encoder thread %1 sleeps", boost::this_thread::get_id());
+		TIMING (N_("encoder thread %1 sleeps"), boost::this_thread::get_id());
 		boost::mutex::scoped_lock lock (_mutex);
 		while (_queue.empty () && !_terminate) {
 			_condition.wait (lock);
@@ -357,9 +359,9 @@ Encoder::encoder_thread (ServerDescription* server)
 			return;
 		}
 
-		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
+		TIMING (N_("encoder thread %1 wakes with queue of %2"), boost::this_thread::get_id(), _queue.size());
 		boost::shared_ptr<DCPVideoFrame> vf = _queue.front ();
-		_film->log()->log (String::compose ("Encoder thread %1 pops frame %2 from queue", boost::this_thread::get_id(), vf->frame()), Log::VERBOSE);
+		_film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 from queue"), boost::this_thread::get_id(), vf->frame()), Log::VERBOSE);
 		_queue.pop_front ();
 		
 		lock.unlock ();
@@ -371,7 +373,7 @@ Encoder::encoder_thread (ServerDescription* server)
 				encoded = vf->encode_remotely (server);
 
 				if (remote_backoff > 0) {
-					_film->log()->log (String::compose ("%1 was lost, but now she is found; removing backoff", server->host_name ()));
+					_film->log()->log (String::compose (N_("%1 was lost, but now she is found; removing backoff"), server->host_name ()));
 				}
 				
 				/* This job succeeded, so remove any backoff */
@@ -384,18 +386,18 @@ Encoder::encoder_thread (ServerDescription* server)
 				}
 				_film->log()->log (
 					String::compose (
-						"Remote encode of %1 on %2 failed (%3); thread sleeping for %4s",
+						N_("Remote encode of %1 on %2 failed (%3); thread sleeping for %4s"),
 						vf->frame(), server->host_name(), e.what(), remote_backoff)
 					);
 			}
 				
 		} else {
 			try {
-				TIMING ("encoder thread %1 begins local encode of %2", boost::this_thread::get_id(), vf->frame());
+				TIMING (N_("encoder thread %1 begins local encode of %2"), boost::this_thread::get_id(), vf->frame());
 				encoded = vf->encode_locally ();
-				TIMING ("encoder thread %1 finishes local encode of %2", boost::this_thread::get_id(), vf->frame());
+				TIMING (N_("encoder thread %1 finishes local encode of %2"), boost::this_thread::get_id(), vf->frame());
 			} catch (std::exception& e) {
-				_film->log()->log (String::compose ("Local encode failed (%1)", e.what ()));
+				_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
 			}
 		}
 
@@ -405,7 +407,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		} else {
 			lock.lock ();
 			_film->log()->log (
-				String::compose ("Encoder thread %1 pushes frame %2 back onto queue after failure", boost::this_thread::get_id(), vf->frame())
+				String::compose (N_("Encoder thread %1 pushes frame %2 back onto queue after failure"), boost::this_thread::get_id(), vf->frame())
 				);
 			_queue.push_front (vf);
 			lock.unlock ();
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 31d76c4f7..4b30c9431 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -31,6 +31,8 @@
 #include "film.h"
 #include "video_decoder.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::vector;
 using std::pair;
@@ -50,10 +52,10 @@ string
 ExamineContentJob::name () const
 {
 	if (_film->name().empty ()) {
-		return "Examine content";
+		return _("Examine content");
 	}
 	
-	return String::compose ("Examine content of %1", _film->name());
+	return String::compose (_("Examine content of %1"), _film->name());
 }
 
 void
@@ -90,7 +92,7 @@ ExamineContentJob::run ()
 		
 		_film->set_length (decoders.video->video_frame());
 		
-		_film->log()->log (String::compose ("Video length examined as %1 frames", _film->length().get()));
+		_film->log()->log (String::compose (N_("Video length examined as %1 frames"), _film->length().get()));
 		
 	} else {
 
@@ -99,7 +101,7 @@ ExamineContentJob::run ()
 		Decoders d = decoder_factory (_film, DecodeOptions());
 		_film->set_length (d.video->length());
 	
-		_film->log()->log (String::compose ("Video length obtained from header as %1 frames", _film->length().get()));
+		_film->log()->log (String::compose (N_("Video length obtained from header as %1 frames"), _film->length().get()));
 	}
 
 	ascend ();
diff --git a/src/lib/external_audio_decoder.cc b/src/lib/external_audio_decoder.cc
index 9c01bfb34..1248b5a3b 100644
--- a/src/lib/external_audio_decoder.cc
+++ b/src/lib/external_audio_decoder.cc
@@ -23,6 +23,8 @@
 #include "film.h"
 #include "exceptions.h"
 
+#include "i18n.h"
+
 using std::vector;
 using std::string;
 using std::stringstream;
@@ -67,11 +69,11 @@ ExternalAudioDecoder::open_files (sf_count_t & frames)
 			SF_INFO info;
 			SNDFILE* s = sf_open (files[i].c_str(), SFM_READ, &info);
 			if (!s) {
-				throw DecodeError ("could not open external audio file for reading");
+				throw DecodeError (_("could not open external audio file for reading"));
 			}
 
 			if (info.channels != 1) {
-				throw DecodeError ("external audio files must be mono");
+				throw DecodeError (_("external audio files must be mono"));
 			}
 			
 			sndfiles.push_back (s);
@@ -89,7 +91,7 @@ ExternalAudioDecoder::open_files (sf_count_t & frames)
 				first = false;
 			} else {
 				if (info.frames != frames) {
-					throw DecodeError ("external audio files have differing lengths");
+					throw DecodeError (_("external audio files have differing lengths"));
 				}
 			}
 		}
@@ -158,7 +160,7 @@ ExternalAudioStream::create (string t, optional<int> v)
 	stringstream s (t);
 	string type;
 	s >> type;
-	if (type != "external") {
+	if (type != N_("external")) {
 		return shared_ptr<ExternalAudioStream> ();
 	}
 
@@ -182,5 +184,5 @@ ExternalAudioStream::ExternalAudioStream ()
 string
 ExternalAudioStream::to_string () const
 {
-	return String::compose ("external %1 %2", _sample_rate, _channel_layout);
+	return String::compose (N_("external %1 %2"), _sample_rate, _channel_layout);
 }
diff --git a/src/lib/ffmpeg_compatibility.cc b/src/lib/ffmpeg_compatibility.cc
index 09f9276ac..361fa7423 100644
--- a/src/lib/ffmpeg_compatibility.cc
+++ b/src/lib/ffmpeg_compatibility.cc
@@ -22,6 +22,8 @@ extern "C" {
 }
 #include "exceptions.h"
 
+#include "i18n.h"
+
 #if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 15
 
 typedef struct {
@@ -67,13 +69,13 @@ get_sink ()
 #if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 15
 	/* XXX does this leak stuff? */
 	AVFilter* buffer_sink = new AVFilter;
-	buffer_sink->name = av_strdup ("avsink");
+	buffer_sink->name = av_strdup (N_("avsink"));
 	buffer_sink->priv_size = sizeof (AVSinkContext);
 	buffer_sink->init = avsink_init;
 	buffer_sink->query_formats = avsink_query_formats;
 	buffer_sink->inputs = new AVFilterPad[2];
 	AVFilterPad* i0 = const_cast<AVFilterPad*> (&buffer_sink->inputs[0]);
-	i0->name = "default";
+	i0->name = N_("default");
 	i0->type = AVMEDIA_TYPE_VIDEO;
 	i0->min_perms = AV_PERM_READ;
 	i0->rej_perms = 0;
@@ -91,9 +93,9 @@ get_sink ()
 	const_cast<AVFilterPad*> (&buffer_sink->outputs[0])->name = 0;
 	return buffer_sink;
 #else
-	AVFilter* buffer_sink = avfilter_get_by_name("buffersink");
+	AVFilter* buffer_sink = avfilter_get_by_name(N_("buffersink"));
 	if (buffer_sink == 0) {
-		throw DecodeError ("Could not create buffer sink filter");
+		throw DecodeError (N_("Could not create buffer sink filter"));
 	}
 
 	return buffer_sink;
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index d4ed76e37..8834f28ed 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -50,6 +50,8 @@ extern "C" {
 #include "filter_graph.h"
 #include "subtitle.h"
 
+#include "i18n.h"
+
 using std::cout;
 using std::string;
 using std::vector;
@@ -113,7 +115,7 @@ FFmpegDecoder::setup_general ()
 	}
 
 	if (avformat_find_stream_info (_format_context, 0) < 0) {
-		throw DecodeError ("could not find stream information");
+		throw DecodeError (_("could not find stream information"));
 	}
 
 	/* Find video, audio and subtitle streams and choose the first of each */
@@ -148,12 +150,12 @@ FFmpegDecoder::setup_general ()
 	}
 
 	if (_video_stream < 0) {
-		throw DecodeError ("could not find video stream");
+		throw DecodeError (N_("could not find video stream"));
 	}
 
 	_frame = avcodec_alloc_frame ();
 	if (_frame == 0) {
-		throw DecodeError ("could not allocate frame");
+		throw DecodeError (N_("could not allocate frame"));
 	}
 }
 
@@ -164,11 +166,11 @@ FFmpegDecoder::setup_video ()
 	_video_codec = avcodec_find_decoder (_video_codec_context->codec_id);
 
 	if (_video_codec == 0) {
-		throw DecodeError ("could not find video decoder");
+		throw DecodeError (_("could not find video decoder"));
 	}
 
 	if (avcodec_open2 (_video_codec_context, _video_codec, 0) < 0) {
-		throw DecodeError ("could not open video decoder");
+		throw DecodeError (N_("could not open video decoder"));
 	}
 }
 
@@ -186,11 +188,11 @@ FFmpegDecoder::setup_audio ()
 	_audio_codec = avcodec_find_decoder (_audio_codec_context->codec_id);
 
 	if (_audio_codec == 0) {
-		throw DecodeError ("could not find audio decoder");
+		throw DecodeError (_("could not find audio decoder"));
 	}
 
 	if (avcodec_open2 (_audio_codec_context, _audio_codec, 0) < 0) {
-		throw DecodeError ("could not open audio decoder");
+		throw DecodeError (N_("could not open audio decoder"));
 	}
 }
 
@@ -205,11 +207,11 @@ FFmpegDecoder::setup_subtitle ()
 	_subtitle_codec = avcodec_find_decoder (_subtitle_codec_context->codec_id);
 
 	if (_subtitle_codec == 0) {
-		throw DecodeError ("could not find subtitle decoder");
+		throw DecodeError (_("could not find subtitle decoder"));
 	}
 	
 	if (avcodec_open2 (_subtitle_codec_context, _subtitle_codec, 0) < 0) {
-		throw DecodeError ("could not open subtitle decoder");
+		throw DecodeError (N_("could not open subtitle decoder"));
 	}
 }
 
@@ -224,7 +226,7 @@ FFmpegDecoder::pass ()
 			/* Maybe we should fail here, but for now we'll just finish off instead */
 			char buf[256];
 			av_strerror (r, buf, sizeof(buf));
-			_film->log()->log (String::compose ("error on av_read_frame (%1) (%2)", buf, r));
+			_film->log()->log (String::compose (N_("error on av_read_frame (%1) (%2)"), buf, r));
 		}
 		
 		/* Get any remaining frames */
@@ -265,7 +267,7 @@ FFmpegDecoder::pass ()
 		if (r >= 0 && frame_finished) {
 
 			if (r != _packet.size) {
-				_film->log()->log (String::compose ("Used only %1 bytes of %2 in packet", r, _packet.size));
+				_film->log()->log (String::compose (N_("Used only %1 bytes of %2 in packet"), r, _packet.size));
 			}
 
 			if (_opt.video_sync) {
@@ -303,7 +305,7 @@ FFmpegDecoder::pass ()
 					
 					_film->log()->log (
 						String::compose (
-							"First video at %1, first audio at %2, pushing %3 audio frames of silence for %4 channels (%5 bytes per sample)",
+							N_("First video at %1, first audio at %2, pushing %3 audio frames of silence for %4 channels (%5 bytes per sample)"),
 							_first_video.get(), _first_audio.get(), s, ffa->channels(), bytes_per_audio_sample()
 							)
 						);
@@ -443,7 +445,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size)
 	break;
 
 	default:
-		throw DecodeError (String::compose ("Unrecognised audio sample format (%1)", static_cast<int> (audio_sample_format())));
+		throw DecodeError (String::compose (_("Unrecognised audio sample format (%1)"), static_cast<int> (audio_sample_format())));
 	}
 
 	return audio;
@@ -512,21 +514,21 @@ FFmpegDecoder::stream_name (AVStream* s) const
 {
 	stringstream n;
 	
-	AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0);
+	AVDictionaryEntry const * lang = av_dict_get (s->metadata, N_("language"), 0, 0);
 	if (lang) {
 		n << lang->value;
 	}
 	
-	AVDictionaryEntry const * title = av_dict_get (s->metadata, "title", 0, 0);
+	AVDictionaryEntry const * title = av_dict_get (s->metadata, N_("title"), 0, 0);
 	if (title) {
 		if (!n.str().empty()) {
-			n << " ";
+			n << N_(" ");
 		}
 		n << title->value;
 	}
 
 	if (n.str().empty()) {
-		n << "unknown";
+		n << N_("unknown");
 	}
 
 	return n.str ();
@@ -568,7 +570,7 @@ FFmpegDecoder::filter_and_emit_video (AVFrame* frame)
 	if (i == _filter_graphs.end ()) {
 		graph.reset (new FilterGraph (_film, this, libdcp::Size (frame->width, frame->height), (AVPixelFormat) frame->format));
 		_filter_graphs.push_back (graph);
-		_film->log()->log (String::compose ("New graph for %1x%2, pixel format %3", frame->width, frame->height, frame->format));
+		_film->log()->log (String::compose (N_("New graph for %1x%2, pixel format %3"), frame->width, frame->height, frame->format));
 	} else {
 		graph = *i;
 	}
@@ -622,7 +624,7 @@ FFmpegAudioStream::create (string t, optional<int> v)
 	stringstream s (t);
 	string type;
 	s >> type;
-	if (type != "ffmpeg") {
+	if (type != N_("ffmpeg")) {
 		return shared_ptr<FFmpegAudioStream> ();
 	}
 
@@ -644,7 +646,7 @@ FFmpegAudioStream::FFmpegAudioStream (string t, optional<int> version)
 		string type;
 		/* Current (marked version 1) */
 		n >> type >> _id >> _sample_rate >> _channel_layout;
-		assert (type == "ffmpeg");
+		assert (type == N_("ffmpeg"));
 	}
 
 	for (int i = 0; i < name_index; ++i) {
@@ -660,7 +662,7 @@ FFmpegAudioStream::FFmpegAudioStream (string t, optional<int> version)
 string
 FFmpegAudioStream::to_string () const
 {
-	return String::compose ("ffmpeg %1 %2 %3 %4", _id, _sample_rate, _channel_layout, _name);
+	return String::compose (N_("ffmpeg %1 %2 %3 %4"), _id, _sample_rate, _channel_layout, _name);
 }
 
 void
@@ -674,7 +676,7 @@ FFmpegDecoder::out_with_sync ()
 		* av_frame_get_best_effort_timestamp(_frame);
 	
 	_film->log()->log (
-		String::compose ("Source video frame ready; source at %1, output at %2", source_pts_seconds, out_pts_seconds),
+		String::compose (N_("Source video frame ready; source at %1, output at %2"), source_pts_seconds, out_pts_seconds),
 		Log::VERBOSE
 		);
 	
@@ -693,7 +695,7 @@ FFmpegDecoder::out_with_sync ()
 			repeat_last_video ();
 			_film->log()->log (
 				String::compose (
-					"Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)",
+					N_("Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)"),
 					out_pts_seconds, video_frame(), source_pts_seconds, frames_per_second()
 					)
 				);
@@ -705,7 +707,7 @@ FFmpegDecoder::out_with_sync ()
 		filter_and_emit_video (_frame);
 	} else {
 		/* Otherwise we are omitting a frame to keep things right */
-		_film->log()->log (String::compose ("Frame removed at %1s", out_pts_seconds));
+		_film->log()->log (String::compose (N_("Frame removed at %1s"), out_pts_seconds));
 	}
 }
 
diff --git a/src/lib/film.cc b/src/lib/film.cc
index addaa0852..c119f1515 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -88,7 +88,7 @@ Film::Film (string d, bool must_exist)
 	, _trust_content_header (true)
 	, _dcp_content_type (0)
 	, _format (0)
-	, _scaler (Scaler::from_id ("bicubic"))
+	, _scaler (Scaler::from_id (N_("bicubic")))
 	, _trim_start (0)
 	, _trim_end (0)
 	, _dcp_ab (false)
@@ -114,13 +114,13 @@ Film::Film (string d, bool must_exist)
 	boost::filesystem::path p (boost::filesystem::system_complete (d));
 	boost::filesystem::path result;
 	for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) {
-		if (*i == "..") {
-			if (boost::filesystem::is_symlink (result) || result.filename() == "..") {
+		if (*i == N_("..")) {
+			if (boost::filesystem::is_symlink (result) || result.filename() == N_("..")) {
 				result /= *i;
 			} else {
 				result = result.parent_path ();
 			}
-		} else if (*i != ".") {
+		} else if (*i != N_(".")) {
 			result /= *i;
 		}
 	}
@@ -141,7 +141,7 @@ Film::Film (string d, bool must_exist)
 		read_metadata ();
 	}
 
-	_log = new FileLog (file ("log"));
+	_log = new FileLog (file (N_("log")));
 }
 
 Film::Film (Film const & o)
@@ -201,16 +201,16 @@ Film::video_state_identifier () const
 
 	stringstream s;
 	s << format()->id()
-	  << "_" << content_digest()
-	  << "_" << crop().left << "_" << crop().right << "_" << crop().top << "_" << crop().bottom
-	  << "_" << f.first << "_" << f.second
-	  << "_" << scaler()->id()
-	  << "_" << j2k_bandwidth()
-	  << "_" << boost::lexical_cast<int> (colour_lut());
+	  << N_("_") << content_digest()
+	  << N_("_") << crop().left << N_("_") << crop().right << N_("_") << crop().top << N_("_") << crop().bottom
+	  << N_("_") << f.first << N_("_") << f.second
+	  << N_("_") << scaler()->id()
+	  << N_("_") << j2k_bandwidth()
+	  << N_("_") << boost::lexical_cast<int> (colour_lut());
 
 	if (dcp_ab()) {
 		pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
-		s << "ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;
+		s << N_("ab_") << Config::instance()->reference_scaler()->id() << N_("_") << fa.first << N_("_") << fa.second;
 	}
 
 	return s.str ();
@@ -221,7 +221,7 @@ string
 Film::info_dir () const
 {
 	boost::filesystem::path p;
-	p /= "info";
+	p /= N_("info");
 	p /= video_state_identifier ();
 	return dir (p.string());
 }
@@ -230,13 +230,13 @@ string
 Film::video_mxf_dir () const
 {
 	boost::filesystem::path p;
-	return dir ("video");
+	return dir (N_("video"));
 }
 
 string
 Film::video_mxf_filename () const
 {
-	return video_state_identifier() + ".mxf";
+	return video_state_identifier() + N_(".mxf");
 }
 
 /** Add suitable Jobs to the JobManager to create a DCP for this Film */
@@ -245,52 +245,52 @@ Film::make_dcp ()
 {
 	set_dci_date_today ();
 	
-	if (dcp_name().find ("/") != string::npos) {
-		throw BadSettingError ("name", _("cannot contain slashes"));
+	if (dcp_name().find (N_("/")) != string::npos) {
+		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 (N_("DVD-o-matic %1 git %2 using %3"), dvdomatic_version, dvdomatic_git_commit, dependency_version_summary()));
 
 	{
 		char buffer[128];
 		gethostname (buffer, sizeof (buffer));
-		log()->log (String::compose ("Starting to make DCP on %1", buffer));
+		log()->log (String::compose (N_("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 (N_("Content is %1; type %2"), content_path(), (content_type() == STILL ? _("still") : _("video"))));
 	if (length()) {
-		log()->log (String::compose ("Content length %1", length().get()));
+		log()->log (String::compose (N_("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 (N_("Content digest %1"), content_digest()));
+	log()->log (String::compose (N_("%1 threads"), Config::instance()->num_local_encoding_threads()));
+	log()->log (String::compose (N_("J2K bandwidth %1"), j2k_bandwidth()));
 #ifdef DVDOMATIC_DEBUG
-	log()->log ("DVD-o-matic built in debug mode.");
+	log()->log (N_("DVD-o-matic built in debug mode."));
 #else
-	log()->log ("DVD-o-matic built in optimised mode.");
+	log()->log (N_("DVD-o-matic built in optimised mode."));
 #endif
 #ifdef LIBDCP_DEBUG
-	log()->log ("libdcp built in debug mode.");
+	log()->log (N_("libdcp built in debug mode."));
 #else
-	log()->log ("libdcp built in optimised mode.");
+	log()->log (N_("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));
+	log()->log (String::compose (N_("CPU: %1, %2 processors"), c.first, c.second));
 	
 	if (format() == 0) {
-		throw MissingSettingError ("format");
+		throw MissingSettingError (_("format"));
 	}
 
 	if (content().empty ()) {
-		throw MissingSettingError ("content");
+		throw MissingSettingError (_("content"));
 	}
 
 	if (dcp_content_type() == 0) {
-		throw MissingSettingError ("content type");
+		throw MissingSettingError (_("content type"));
 	}
 
 	if (name().empty()) {
-		throw MissingSettingError ("name");
+		throw MissingSettingError (_("name"));
 	}
 
 	DecodeOptions od;
@@ -359,73 +359,73 @@ Film::write_metadata () const
 
 	boost::filesystem::create_directories (directory());
 
-	string const m = file ("metadata");
+	string const m = file (N_("metadata"));
 	ofstream f (m.c_str ());
 	if (!f.good ()) {
 		throw CreateFileError (m);
 	}
 
-	f << "version " << state_version << "\n";
+	f << N_("version ") << state_version << N_("\n");
 
 	/* User stuff */
-	f << "name " << _name << "\n";
-	f << "use_dci_name " << _use_dci_name << "\n";
-	f << "content " << _content << "\n";
-	f << "trust_content_header " << (_trust_content_header ? "1" : "0") << "\n";
+	f << N_("name ") << _name << N_("\n");
+	f << N_("use_dci_name ") << _use_dci_name << N_("\n");
+	f << N_("content ") << _content << N_("\n");
+	f << N_("trust_content_header ") << (_trust_content_header ? N_("1") : N_("0")) << N_("\n");
 	if (_dcp_content_type) {
-		f << "dcp_content_type " << _dcp_content_type->dci_name () << "\n";
+		f << N_("dcp_content_type ") << _dcp_content_type->dci_name () << N_("\n");
 	}
 	if (_format) {
-		f << "format " << _format->as_metadata () << "\n";
+		f << N_("format ") << _format->as_metadata () << N_("\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";
+	f << N_("left_crop ") << _crop.left << N_("\n");
+	f << N_("right_crop ") << _crop.right << N_("\n");
+	f << N_("top_crop ") << _crop.top << N_("\n");
+	f << N_("bottom_crop ") << _crop.bottom << N_("\n");
 	for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
-		f << "filter " << (*i)->id () << "\n";
+		f << N_("filter ") << (*i)->id () << N_("\n");
 	}
-	f << "scaler " << _scaler->id () << "\n";
-	f << "trim_start " << _trim_start << "\n";
-	f << "trim_end " << _trim_end << "\n";
-	f << "dcp_ab " << (_dcp_ab ? "1" : "0") << "\n";
+	f << N_("scaler ") << _scaler->id () << N_("\n");
+	f << N_("trim_start ") << _trim_start << N_("\n");
+	f << N_("trim_end ") << _trim_end << N_("\n");
+	f << N_("dcp_ab ") << (_dcp_ab ? N_("1") : N_("0")) << N_("\n");
 	if (_content_audio_stream) {
-		f << "selected_content_audio_stream " << _content_audio_stream->to_string() << "\n";
+		f << N_("selected_content_audio_stream ") << _content_audio_stream->to_string() << N_("\n");
 	}
 	for (vector<string>::const_iterator i = _external_audio.begin(); i != _external_audio.end(); ++i) {
-		f << "external_audio " << *i << "\n";
+		f << N_("external_audio ") << *i << N_("\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 << N_("use_content_audio ") << (_use_content_audio ? N_("1") : N_("0")) << N_("\n");
+	f << N_("audio_gain ") << _audio_gain << N_("\n");
+	f << N_("audio_delay ") << _audio_delay << N_("\n");
+	f << N_("still_duration ") << _still_duration << N_("\n");
 	if (_subtitle_stream) {
-		f << "selected_subtitle_stream " << _subtitle_stream->to_string() << "\n";
+		f << N_("selected_subtitle_stream ") << _subtitle_stream->to_string() << N_("\n");
 	}
-	f << "with_subtitles " << _with_subtitles << "\n";
-	f << "subtitle_offset " << _subtitle_offset << "\n";
-	f << "subtitle_scale " << _subtitle_scale << "\n";
-	f << "colour_lut " << _colour_lut << "\n";
-	f << "j2k_bandwidth " << _j2k_bandwidth << "\n";
+	f << N_("with_subtitles ") << _with_subtitles << N_("\n");
+	f << N_("subtitle_offset ") << _subtitle_offset << N_("\n");
+	f << N_("subtitle_scale ") << _subtitle_scale << N_("\n");
+	f << N_("colour_lut ") << _colour_lut << N_("\n");
+	f << N_("j2k_bandwidth ") << _j2k_bandwidth << N_("\n");
 	_dci_metadata.write (f);
-	f << "dci_date " << boost::gregorian::to_iso_string (_dci_date) << "\n";
-	f << "width " << _size.width << "\n";
-	f << "height " << _size.height << "\n";
-	f << "length " << _length.get_value_or(0) << "\n";
-	f << "dcp_intrinsic_duration " << _dcp_intrinsic_duration.get_value_or(0) << "\n";
-	f << "content_digest " << _content_digest << "\n";
+	f << N_("dci_date ") << boost::gregorian::to_iso_string (_dci_date) << N_("\n");
+	f << N_("width ") << _size.width << N_("\n");
+	f << N_("height ") << _size.height << N_("\n");
+	f << N_("length ") << _length.get_value_or(0) << N_("\n");
+	f << N_("dcp_intrinsic_duration ") << _dcp_intrinsic_duration.get_value_or(0) << N_("\n");
+	f << N_("content_digest ") << _content_digest << N_("\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 << N_("content_audio_stream ") << (*i)->to_string () << N_("\n");
 	}
 
-	f << "external_audio_stream " << _external_audio_stream->to_string() << "\n";
+	f << N_("external_audio_stream ") << _external_audio_stream->to_string() << N_("\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 << N_("subtitle_stream ") << (*i)->to_string () << N_("\n");
 	}
 
-	f << "frames_per_second " << _frames_per_second << "\n";
+	f << N_("frames_per_second ") << _frames_per_second << N_("\n");
 	
 	_dirty = false;
 }
@@ -447,15 +447,15 @@ Film::read_metadata ()
 	boost::optional<int> audio_stream_index;
 	boost::optional<int> subtitle_stream_index;
 
-	ifstream f (file ("metadata").c_str());
+	ifstream f (file (N_("metadata")).c_str());
 	if (!f.good()) {
-		throw OpenFileError (file ("metadata"));
+		throw OpenFileError (file (N_("metadata")));
 	}
 	
 	multimap<string, string> kv = read_key_value (f);
 
 	/* We need version before anything else */
-	multimap<string, string>::iterator v = kv.find ("version");
+	multimap<string, string>::iterator v = kv.find (N_("version"));
 	if (v != kv.end ()) {
 		version = atoi (v->second.c_str());
 	}
@@ -464,107 +464,107 @@ Film::read_metadata ()
 		string const k = i->first;
 		string const v = i->second;
 
-		if (k == "audio_sample_rate") {
+		if (k == N_("audio_sample_rate")) {
 			audio_sample_rate = atoi (v.c_str());
 		}
 
 		/* User-specified stuff */
-		if (k == "name") {
+		if (k == N_("name")) {
 			_name = v;
-		} else if (k == "use_dci_name") {
-			_use_dci_name = (v == "1");
-		} else if (k == "content") {
+		} else if (k == N_("use_dci_name")) {
+			_use_dci_name = (v == N_("1"));
+		} else if (k == N_("content")) {
 			_content = v;
-		} else if (k == "trust_content_header") {
-			_trust_content_header = (v == "1");
-		} else if (k == "dcp_content_type") {
+		} else if (k == N_("trust_content_header")) {
+			_trust_content_header = (v == N_("1"));
+		} else if (k == N_("dcp_content_type")) {
 			if (version < 3) {
 				_dcp_content_type = DCPContentType::from_pretty_name (v);
 			} else {
 				_dcp_content_type = DCPContentType::from_dci_name (v);
 			}
-		} else if (k == "format") {
+		} else if (k == N_("format")) {
 			_format = Format::from_metadata (v);
-		} else if (k == "left_crop") {
+		} else if (k == N_("left_crop")) {
 			_crop.left = atoi (v.c_str ());
-		} else if (k == "right_crop") {
+		} else if (k == N_("right_crop")) {
 			_crop.right = atoi (v.c_str ());
-		} else if (k == "top_crop") {
+		} else if (k == N_("top_crop")) {
 			_crop.top = atoi (v.c_str ());
-		} else if (k == "bottom_crop") {
+		} else if (k == N_("bottom_crop")) {
 			_crop.bottom = atoi (v.c_str ());
-		} else if (k == "filter") {
+		} else if (k == N_("filter")) {
 			_filters.push_back (Filter::from_id (v));
-		} else if (k == "scaler") {
+		} else if (k == N_("scaler")) {
 			_scaler = Scaler::from_id (v);
-		} else if ( ((!version || version < 2) && k == "dcp_trim_start") || k == "trim_start") {
+		} else if ( ((!version || version < 2) && k == N_("dcp_trim_start")) || k == N_("trim_start")) {
 			_trim_start = atoi (v.c_str ());
-		} else if ( ((!version || version < 2) && k == "dcp_trim_end") || k == "trim_end") {
+		} else if ( ((!version || version < 2) && k == N_("dcp_trim_end")) || k == N_("trim_end")) {
 			_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")) {
+		} else if (k == N_("dcp_ab")) {
+			_dcp_ab = (v == N_("1"));
+		} else if (k == N_("selected_content_audio_stream") || (!version && k == N_("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") {
+		} else if (k == N_("external_audio")) {
 			_external_audio.push_back (v);
-		} else if (k == "use_content_audio") {
-			_use_content_audio = (v == "1");
-		} else if (k == "audio_gain") {
+		} else if (k == N_("use_content_audio")) {
+			_use_content_audio = (v == N_("1"));
+		} else if (k == N_("audio_gain")) {
 			_audio_gain = atof (v.c_str ());
-		} else if (k == "audio_delay") {
+		} else if (k == N_("audio_delay")) {
 			_audio_delay = atoi (v.c_str ());
-		} else if (k == "still_duration") {
+		} else if (k == N_("still_duration")) {
 			_still_duration = atoi (v.c_str ());
-		} else if (k == "selected_subtitle_stream") {
+		} else if (k == N_("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") {
+		} else if (k == N_("with_subtitles")) {
+			_with_subtitles = (v == N_("1"));
+		} else if (k == N_("subtitle_offset")) {
 			_subtitle_offset = atoi (v.c_str ());
-		} else if (k == "subtitle_scale") {
+		} else if (k == N_("subtitle_scale")) {
 			_subtitle_scale = atof (v.c_str ());
-		} else if (k == "colour_lut") {
+		} else if (k == N_("colour_lut")) {
 			_colour_lut = atoi (v.c_str ());
-		} else if (k == "j2k_bandwidth") {
+		} else if (k == N_("j2k_bandwidth")) {
 			_j2k_bandwidth = atoi (v.c_str ());
-		} else if (k == "dci_date") {
+		} else if (k == N_("dci_date")) {
 			_dci_date = boost::gregorian::from_undelimited_string (v);
 		}
 
 		_dci_metadata.read (k, v);
 		
 		/* Cached stuff */
-		if (k == "width") {
+		if (k == N_("width")) {
 			_size.width = atoi (v.c_str ());
-		} else if (k == "height") {
+		} else if (k == N_("height")) {
 			_size.height = atoi (v.c_str ());
-		} else if (k == "length") {
+		} else if (k == N_("length")) {
 			int const vv = atoi (v.c_str ());
 			if (vv) {
 				_length = vv;
 			}
-		} else if (k == "dcp_intrinsic_duration") {
+		} else if (k == N_("dcp_intrinsic_duration")) {
 			int const vv = atoi (v.c_str ());
 			if (vv) {
 				_dcp_intrinsic_duration = vv;
 			}
-		} else if (k == "content_digest") {
+		} else if (k == N_("content_digest")) {
 			_content_digest = v;
-		} else if (k == "content_audio_stream" || (!version && k == "audio_stream")) {
+		} else if (k == N_("content_audio_stream") || (!version && k == N_("audio_stream"))) {
 			_content_audio_streams.push_back (audio_stream_factory (v, version));
-		} else if (k == "external_audio_stream") {
+		} else if (k == N_("external_audio_stream")) {
 			_external_audio_stream = audio_stream_factory (v, version);
-		} else if (k == "subtitle_stream") {
+		} else if (k == N_("subtitle_stream")) {
 			_subtitle_streams.push_back (subtitle_stream_factory (v, version));
-		} else if (k == "frames_per_second") {
+		} else if (k == N_("frames_per_second")) {
 			_frames_per_second = atof (v.c_str ());
 		}
 	}
@@ -714,14 +714,14 @@ Film::dci_name (bool if_created_now) const
 		fixed_name = fixed_name.substr (0, 14);
 	}
 
-	d << fixed_name << "_";
+	d << fixed_name << N_("_");
 
 	if (dcp_content_type()) {
-		d << dcp_content_type()->dci_name() << "_";
+		d << dcp_content_type()->dci_name() << N_("_");
 	}
 
 	if (format()) {
-		d << format()->dci_name() << "_";
+		d << format()->dci_name() << N_("_");
 	}
 
 	DCIMetadata const dm = dci_metadata ();
@@ -729,51 +729,51 @@ Film::dci_name (bool if_created_now) const
 	if (!dm.audio_language.empty ()) {
 		d << dm.audio_language;
 		if (!dm.subtitle_language.empty() && with_subtitles()) {
-			d << "-" << dm.subtitle_language;
+			d << N_("-") << dm.subtitle_language;
 		} else {
-			d << "-XX";
+			d << N_("-XX");
 		}
 			
-		d << "_";
+		d << N_("_");
 	}
 
 	if (!dm.territory.empty ()) {
 		d << dm.territory;
 		if (!dm.rating.empty ()) {
-			d << "-" << dm.rating;
+			d << N_("-") << dm.rating;
 		}
-		d << "_";
+		d << N_("_");
 	}
 
 	switch (audio_channels()) {
 	case 1:
-		d << "10_";
+		d << N_("10_");
 		break;
 	case 2:
-		d << "20_";
+		d << N_("20_");
 		break;
 	case 6:
-		d << "51_";
+		d << N_("51_");
 		break;
 	case 8:
-		d << "71_";
+		d << N_("71_");
 		break;
 	}
 
-	d << "2K_";
+	d << N_("2K_");
 
 	if (!dm.studio.empty ()) {
-		d << dm.studio << "_";
+		d << dm.studio << N_("_");
 	}
 
 	if (if_created_now) {
-		d << boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ()) << "_";
+		d << boost::gregorian::to_iso_string (boost::gregorian::day_clock::local_day ()) << N_("_");
 	} else {
-		d << boost::gregorian::to_iso_string (_dci_date) << "_";
+		d << boost::gregorian::to_iso_string (_dci_date) << N_("_");
 	}
 
 	if (!dm.facility.empty ()) {
-		d << dm.facility << "_";
+		d << dm.facility << N_("_");
 	}
 
 	if (!dm.package_type.empty ()) {
@@ -828,7 +828,7 @@ Film::set_content (string c)
 {
 	string check = directory ();
 
-	boost::filesystem::path slash ("/");
+	boost::filesystem::path slash (N_("/"));
 	string platform_slash = slash.make_preferred().string ();
 
 	if (!ends_with (check, platform_slash)) {
@@ -901,10 +901,10 @@ Film::set_content (string c)
 	/* Default format */
 	switch (content_type()) {
 	case STILL:
-		set_format (Format::from_id ("var-185"));
+		set_format (Format::from_id (N_("var-185")));
 		break;
 	case VIDEO:
-		set_format (Format::from_id ("185"));
+		set_format (Format::from_id (N_("185")));
 		break;
 	}
 
@@ -1332,7 +1332,7 @@ Film::info_path (int f) const
 
 	stringstream s;
 	s.width (8);
-	s << setfill('0') << f << ".md5";
+	s << setfill('0') << f << N_(".md5");
 
 	p /= s.str();
 
@@ -1346,15 +1346,15 @@ string
 Film::j2c_path (int f, bool t) const
 {
 	boost::filesystem::path p;
-	p /= "j2c";
+	p /= N_("j2c");
 	p /= video_state_identifier ();
 
 	stringstream s;
 	s.width (8);
-	s << setfill('0') << f << ".j2c";
+	s << setfill('0') << f << N_(".j2c");
 
 	if (t) {
-		s << ".tmp";
+		s << N_(".tmp");
 	}
 
 	p /= s.str();
diff --git a/src/lib/filter.cc b/src/lib/filter.cc
index 9a662f90f..4d429b303 100644
--- a/src/lib/filter.cc
+++ b/src/lib/filter.cc
@@ -27,6 +27,8 @@ extern "C" {
 #include <libpostproc/postprocess.h>
 }
 
+#include "i18n.h"
+
 using namespace std;
 
 vector<Filter const *> Filter::_filters;
@@ -63,30 +65,30 @@ Filter::setup_filters ()
 {
 	/* Note: "none" is a magic id name, so don't use it here */
 	   
-	maybe_add ("pphb",      "Horizontal deblocking filter",                "De-blocking",     "",          "hb");
-	maybe_add ("ppvb",      "Vertical deblocking filter",                  "De-blocking",     "",          "vb");
-	maybe_add ("ppha",      "Horizontal deblocking filter A",              "De-blocking",     "",          "ha");
-	maybe_add ("ppva",      "Vertical deblocking filter A",                "De-blocking",     "",          "va");
-	maybe_add ("pph1",      "Experimental horizontal deblocking filter 1", "De-blocking",     "",          "h1");
-	maybe_add ("pphv",      "Experimental vertical deblocking filter 1",   "De-blocking",     "",          "v1");
-	maybe_add ("ppdr",      "Deringing filter",                            "Misc",            "",          "dr");
-	maybe_add ("pplb",      "Linear blend deinterlacer",                   "De-interlacing",  "",          "lb");
-	maybe_add ("ppli",      "Linear interpolating deinterlacer",           "De-interlacing",  "",          "li");
-	maybe_add ("ppci",      "Cubic interpolating deinterlacer",            "De-interlacing",  "",          "ci");
-	maybe_add ("ppmd",      "Median deinterlacer",                         "De-interlacing",  "",          "md");
-	maybe_add ("ppfd",      "FFMPEG deinterlacer",                         "De-interlacing",  "",          "fd");
-	maybe_add ("ppl5",      "FIR low-pass deinterlacer",                   "De-interlacing",  "",          "l5");
-	maybe_add ("mcdeint",   "Motion compensating deinterlacer",            "De-interlacing",  "mcdeint",   "");
-	maybe_add ("kerndeint", "Kernel deinterlacer",                         "De-interlacing",  "kerndeint", "");
-	maybe_add ("yadif",     "Yet Another Deinterlacing Filter",            "De-interlacing",  "yadif",     "");
-	maybe_add ("pptn",      "Temporal noise reducer",                      "Noise reduction", "",          "tn");
-	maybe_add ("ppfq",      "Force quantizer",                             "Misc",            "",          "fq");
-	maybe_add ("gradfun",   "Gradient debander",                           "Misc",            "gradfun",   "");
-	maybe_add ("unsharp",   "Unsharp mask and Gaussian blur",              "Misc",            "unsharp",   "");
-	maybe_add ("denoise3d", "3D denoiser",                                 "Noise reduction", "denoise3d", "");
-	maybe_add ("hqdn3d",    "High quality 3D denoiser",                    "Noise reduction", "hqdn3d",    "");
-	maybe_add ("telecine",  "Telecine filter",                             "Misc",            "telecine",  "");
-	maybe_add ("ow",        "Overcomplete wavelet denoiser",               "Noise reduction", "mp=ow",     "");
+	maybe_add (N_("pphb"),      _("Horizontal deblocking filter"),                _("De-blocking"),     N_(""),          N_("hb"));
+	maybe_add (N_("ppvb"),      _("Vertical deblocking filter"),                  _("De-blocking"),     N_(""),          N_("vb"));
+	maybe_add (N_("ppha"),      _("Horizontal deblocking filter A"),              _("De-blocking"),     N_(""),          N_("ha"));
+	maybe_add (N_("ppva"),      _("Vertical deblocking filter A"),                _("De-blocking"),     N_(""),          N_("va"));
+	maybe_add (N_("pph1"),      _("Experimental horizontal deblocking filter 1"), _("De-blocking"),     N_(""),          N_("h1"));
+	maybe_add (N_("pphv"),      _("Experimental vertical deblocking filter 1"),   _("De-blocking"),     N_(""),          N_("v1"));
+	maybe_add (N_("ppdr"),      _("Deringing filter"),                            _("Misc"),            N_(""),          N_("dr"));
+	maybe_add (N_("pplb"),      _("Linear blend deinterlacer"),                   _("De-interlacing"),  N_(""),          N_("lb"));
+	maybe_add (N_("ppli"),      _("Linear interpolating deinterlacer"),           _("De-interlacing"),  N_(""),          N_("li"));
+	maybe_add (N_("ppci"),      _("Cubic interpolating deinterlacer"),            _("De-interlacing"),  N_(""),          N_("ci"));
+	maybe_add (N_("ppmd"),      _("Median deinterlacer"),                         _("De-interlacing"),  N_(""),          N_("md"));
+	maybe_add (N_("ppfd"),      _("FFMPEG deinterlacer"),                         _("De-interlacing"),  N_(""),          N_("fd"));
+	maybe_add (N_("ppl5"),      _("FIR low-pass deinterlacer"),                   _("De-interlacing"),  N_(""),          N_("l5"));
+	maybe_add (N_("mcdeint"),   _("Motion compensating deinterlacer"),            _("De-interlacing"),  N_("mcdeint"),   N_(""));
+	maybe_add (N_("kerndeint"), _("Kernel deinterlacer"),                         _("De-interlacing"),  N_("kerndeint"), N_(""));
+	maybe_add (N_("yadif"),     _("Yet Another Deinterlacing Filter"),            _("De-interlacing"),  N_("yadif"),     N_(""));
+	maybe_add (N_("pptn"),      _("Temporal noise reducer"),                      _("Noise reduction"), N_(""),          N_("tn"));
+	maybe_add (N_("ppfq"),      _("Force quantizer"),                             _("Misc"),            N_(""),          N_("fq"));
+	maybe_add (N_("gradfun"),   _("Gradient debander"),                           _("Misc"),            N_("gradfun"),   N_(""));
+	maybe_add (N_("unsharp"),   _("Unsharp mask and Gaussian blur"),              _("Misc"),            N_("unsharp"),   N_(""));
+	maybe_add (N_("denoise3d"), _("3D denoiser"),                                 _("Noise reduction"), N_("denoise3d"), N_(""));
+	maybe_add (N_("hqdn3d"),    _("High quality 3D denoiser"),                    _("Noise reduction"), N_("hqdn3d"),    N_(""));
+	maybe_add (N_("telecine"),  _("Telecine filter"),                             _("Misc"),            N_("telecine"),  N_(""));
+	maybe_add (N_("ow"),        _("Overcomplete wavelet denoiser"),               _("Noise reduction"), N_("mp=ow"),     N_(""));
 }
 
 void
@@ -118,14 +120,14 @@ Filter::ffmpeg_strings (vector<Filter const *> const & filters)
 	for (vector<Filter const *>::const_iterator i = filters.begin(); i != filters.end(); ++i) {
 		if (!(*i)->vf().empty ()) {
 			if (!vf.empty ()) {
-				vf += ",";
+				vf += N_(",");
 			}
 			vf += (*i)->vf ();
 		}
 		
 		if (!(*i)->pp().empty ()) {
 			if (!pp.empty()) {
-				pp += ",";
+				pp += N_(",");
 			}
 			pp += (*i)->pp ();
 		}
diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index b0991a2da..045cbaa6a 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -43,6 +43,8 @@ extern "C" {
 #include "film.h"
 #include "ffmpeg_decoder.h"
 
+#include "i18n.h"
+
 using std::stringstream;
 using std::string;
 using std::list;
@@ -63,36 +65,36 @@ FilterGraph::FilterGraph (shared_ptr<Film> film, FFmpegDecoder* decoder, libdcp:
 {
 	string filters = Filter::ffmpeg_strings (film->filters()).first;
 	if (!filters.empty ()) {
-		filters += ",";
+		filters += N_(",");
 	}
 
 	filters += crop_string (Position (film->crop().left, film->crop().top), film->cropped_size (decoder->native_size()));
 
 	AVFilterGraph* graph = avfilter_graph_alloc();
 	if (graph == 0) {
-		throw DecodeError ("Could not create filter graph.");
+		throw DecodeError (N_("could not create filter graph."));
 	}
 
-	AVFilter* buffer_src = avfilter_get_by_name("buffer");
+	AVFilter* buffer_src = avfilter_get_by_name(N_("buffer"));
 	if (buffer_src == 0) {
-		throw DecodeError ("Could not find buffer src filter");
+		throw DecodeError (N_("could not find buffer src filter"));
 	}
 
 	AVFilter* buffer_sink = get_sink ();
 
 	stringstream a;
-	a << _size.width << ":"
-	  << _size.height << ":"
-	  << _pixel_format << ":"
-	  << decoder->time_base_numerator() << ":"
-	  << decoder->time_base_denominator() << ":"
-	  << decoder->sample_aspect_ratio_numerator() << ":"
+	a << _size.width << N_(":")
+	  << _size.height << N_(":")
+	  << _pixel_format << N_(":")
+	  << decoder->time_base_numerator() << N_(":")
+	  << decoder->time_base_denominator() << N_(":")
+	  << decoder->sample_aspect_ratio_numerator() << N_(":")
 	  << decoder->sample_aspect_ratio_denominator();
 
 	int r;
 
-	if ((r = avfilter_graph_create_filter (&_buffer_src_context, buffer_src, "in", a.str().c_str(), 0, graph)) < 0) {
-		throw DecodeError ("could not create buffer source");
+	if ((r = avfilter_graph_create_filter (&_buffer_src_context, buffer_src, N_("in"), a.str().c_str(), 0, graph)) < 0) {
+		throw DecodeError (N_("could not create buffer source"));
 	}
 
 	AVBufferSinkParams* sink_params = av_buffersink_params_alloc ();
@@ -101,34 +103,34 @@ FilterGraph::FilterGraph (shared_ptr<Film> film, FFmpegDecoder* decoder, libdcp:
 	pixel_fmts[1] = PIX_FMT_NONE;
 	sink_params->pixel_fmts = pixel_fmts;
 	
-	if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, "out", 0, sink_params, graph) < 0) {
-		throw DecodeError ("could not create buffer sink.");
+	if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, N_("out"), 0, sink_params, graph) < 0) {
+		throw DecodeError (N_("could not create buffer sink."));
 	}
 
 	AVFilterInOut* outputs = avfilter_inout_alloc ();
-	outputs->name = av_strdup("in");
+	outputs->name = av_strdup(N_("in"));
 	outputs->filter_ctx = _buffer_src_context;
 	outputs->pad_idx = 0;
 	outputs->next = 0;
 
 	AVFilterInOut* inputs = avfilter_inout_alloc ();
-	inputs->name = av_strdup("out");
+	inputs->name = av_strdup(N_("out"));
 	inputs->filter_ctx = _buffer_sink_context;
 	inputs->pad_idx = 0;
 	inputs->next = 0;
 
 #if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 15
 	if (avfilter_graph_parse (graph, filters.c_str(), inputs, outputs, 0) < 0) {
-		throw DecodeError ("could not set up filter graph.");
+		throw DecodeError (N_("could not set up filter graph."));
 	}
 #else	
 	if (avfilter_graph_parse (graph, filters.c_str(), &inputs, &outputs, 0) < 0) {
-		throw DecodeError ("could not set up filter graph.");
+		throw DecodeError (N_("could not set up filter graph."));
 	}
 #endif	
 	
 	if (avfilter_graph_config (graph, 0) < 0) {
-		throw DecodeError ("could not configure filter graph.");
+		throw DecodeError (N_("could not configure filter graph."));
 	}
 
 	/* XXX: leaking `inputs' / `outputs' ? */
@@ -145,7 +147,7 @@ FilterGraph::process (AVFrame const * frame)
 #if LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR >= 53 && LIBAVFILTER_VERSION_MINOR <= 61
 
 	if (av_vsrc_buffer_add_frame (_buffer_src_context, frame, 0) < 0) {
-		throw DecodeError ("could not push buffer into filter chain.");
+		throw DecodeError (N_("could not push buffer into filter chain."));
 	}
 
 #elif LIBAVFILTER_VERSION_MAJOR == 2 && LIBAVFILTER_VERSION_MINOR == 15
@@ -155,13 +157,13 @@ FilterGraph::process (AVFrame const * frame)
 	par.den = sample_aspect_ratio_denominator ();
 
 	if (av_vsrc_buffer_add_frame (_buffer_src_context, frame, 0, par) < 0) {
-		throw DecodeError ("could not push buffer into filter chain.");
+		throw DecodeError (N_("could not push buffer into filter chain."));
 	}
 
 #else
 
 	if (av_buffersrc_write_frame (_buffer_src_context, frame) < 0) {
-		throw DecodeError ("could not push buffer into filter chain.");
+		throw DecodeError (N_("could not push buffer into filter chain."));
 	}
 
 #endif	
@@ -176,7 +178,7 @@ FilterGraph::process (AVFrame const * frame)
 		
 		int r = avfilter_request_frame (_buffer_sink_context->inputs[0]);
 		if (r < 0) {
-			throw DecodeError ("could not request filtered frame");
+			throw DecodeError (N_("could not request filtered frame"));
 		}
 		
 		AVFilterBufferRef* filter_buffer = _buffer_sink_context->inputs[0]->cur_buf;
diff --git a/src/lib/format.cc b/src/lib/format.cc
index 016c21fde..0e4830cd7 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -30,6 +30,8 @@
 #include "format.h"
 #include "film.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::setprecision;
 using std::stringstream;
@@ -45,13 +47,13 @@ FixedFormat::name () const
 {
 	stringstream s;
 	if (!_nickname.empty ()) {
-		s << _nickname << " (";
+		s << _nickname << N_(" (");
 	}
 
-	s << setprecision(3) << (_ratio / 100.0) << ":1";
+	s << setprecision(3) << (_ratio / 100.0) << N_(":1");
 
 	if (!_nickname.empty ()) {
-		s << ")";
+		s << N_(")");
 	}
 
 	return s.str ();
@@ -68,19 +70,20 @@ Format::as_metadata () const
 void
 Format::setup_formats ()
 {
-	_formats.push_back (new FixedFormat (119, libdcp::Size (1285, 1080), "119", "1.19", "F"));
-	_formats.push_back (new FixedFormat (133, libdcp::Size (1436, 1080), "133", "1.33", "F"));
-	_formats.push_back (new FixedFormat (138, libdcp::Size (1485, 1080), "138", "1.375", "F"));
-	_formats.push_back (new FixedFormat (133, libdcp::Size (1998, 1080), "133-in-flat", "4:3 within Flat", "F"));
-	_formats.push_back (new FixedFormat (137, libdcp::Size (1480, 1080), "137", "Academy", "F"));
-	_formats.push_back (new FixedFormat (166, libdcp::Size (1793, 1080), "166", "1.66", "F"));
-	_formats.push_back (new FixedFormat (166, libdcp::Size (1998, 1080), "166-in-flat", "1.66 within Flat", "F"));
-	_formats.push_back (new FixedFormat (178, libdcp::Size (1998, 1080), "178-in-flat", "16:9 within Flat", "F"));
-	_formats.push_back (new FixedFormat (178, libdcp::Size (1920, 1080), "178", "16:9", "F"));
-	_formats.push_back (new FixedFormat (185, libdcp::Size (1998, 1080), "185", "Flat", "F"));
-	_formats.push_back (new FixedFormat (239, libdcp::Size (2048, 858), "239", "Scope", "S"));
-	_formats.push_back (new VariableFormat (libdcp::Size (1998, 1080), "var-185", "Flat", "F"));
-	_formats.push_back (new VariableFormat (libdcp::Size (2048, 858), "var-239", "Scope", "S"));
+	/// TRANSLATORS: these are film picture aspect ratios; "Academy" means 1.37, "Flat" 1.85 and "Scope" 2.39.
+	_formats.push_back (new FixedFormat (119, libdcp::Size (1285, 1080), N_("119"), _("1.19"), N_("F")));
+	_formats.push_back (new FixedFormat (133, libdcp::Size (1436, 1080), N_("133"), _("1.33"), N_("F")));
+	_formats.push_back (new FixedFormat (138, libdcp::Size (1485, 1080), N_("138"), _("1.375"), N_("F")));
+	_formats.push_back (new FixedFormat (133, libdcp::Size (1998, 1080), N_("133-in-flat"), _("4:3 within Flat"), N_("F")));
+	_formats.push_back (new FixedFormat (137, libdcp::Size (1480, 1080), N_("137"), _("Academy"), N_("F")));
+	_formats.push_back (new FixedFormat (166, libdcp::Size (1793, 1080), N_("166"), _("1.66"), N_("F")));
+	_formats.push_back (new FixedFormat (166, libdcp::Size (1998, 1080), N_("166-in-flat"), _("1.66 within Flat"), N_("F")));
+	_formats.push_back (new FixedFormat (178, libdcp::Size (1998, 1080), N_("178-in-flat"), _("16:9 within Flat"), N_("F")));
+	_formats.push_back (new FixedFormat (178, libdcp::Size (1920, 1080), N_("178"), _("16:9"), N_("F")));
+	_formats.push_back (new FixedFormat (185, libdcp::Size (1998, 1080), N_("185"), _("Flat"), N_("F")));
+	_formats.push_back (new FixedFormat (239, libdcp::Size (2048, 858), N_("239"), _("Scope"), N_("S")));
+	_formats.push_back (new VariableFormat (libdcp::Size (1998, 1080), N_("var-185"), _("Flat"), N_("F")));
+	_formats.push_back (new VariableFormat (libdcp::Size (2048, 858), N_("var-239"), _("Scope"), N_("S")));
 }
 
 /** @param n Nickname.
diff --git a/src/lib/image.cc b/src/lib/image.cc
index b7ac13ab1..268c08173 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -40,6 +40,8 @@ extern "C" {
 #include "exceptions.h"
 #include "scaler.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace boost;
 using libdcp::Size;
@@ -75,7 +77,7 @@ Image::lines (int n) const
 	case PIX_FMT_YUV444P10LE:
 		return size().height;
 	default:
-		throw PixelFormatError ("lines()", _pixel_format);
+		throw PixelFormatError (N_("lines()"), _pixel_format);
 	}
 
 	return 0;
@@ -99,7 +101,7 @@ Image::components () const
 	case PIX_FMT_RGBA:
 		return 1;
 	default:
-		throw PixelFormatError ("components()", _pixel_format);
+		throw PixelFormatError (N_("components()"), _pixel_format);
 	}
 
 	return 0;
@@ -218,7 +220,7 @@ Image::post_process (string pp, bool aligned) const
 	case PIX_FMT_YUV444P10LE:
 		pp_format = PP_FORMAT_444;
 	default:
-		throw PixelFormatError ("post_process", pixel_format());
+		throw PixelFormatError (N_("post_process"), pixel_format());
 	}
 		
 	pp_mode* mode = pp_get_mode_by_name_and_quality (pp.c_str (), PP_QUALITY_MAX);
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 42fe699d7..5dc0b7b06 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -25,6 +25,8 @@
 #include "film.h"
 #include "exceptions.h"
 
+#include "i18n.h"
+
 using std::cout;
 using boost::shared_ptr;
 using libdcp::Size;
@@ -55,7 +57,7 @@ libdcp::Size
 ImageMagickDecoder::native_size () const
 {
 	if (_files.empty ()) {
-		throw DecodeError ("no still image files found");
+		throw DecodeError (_("no still image files found"));
 	}
 
 	/* Look at the first file and assume its size holds for all */
diff --git a/src/lib/job.cc b/src/lib/job.cc
index bfad65a0a..77d367136 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -27,6 +27,8 @@
 #include "job.h"
 #include "util.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::list;
 using std::stringstream;
@@ -66,11 +68,12 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 		
-		string m = String::compose ("An error occurred whilst handling the file %1.", boost::filesystem::path (e.filename()).leaf());
+		string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 		
 		boost::filesystem::space_info const s = boost::filesystem::space (e.filename());
 		if (s.available < pow (1024, 3)) {
-			m += "\n\nThe drive that the film is stored on is low in disc space.  Free some more space and try again.";
+			m += N_("\n\n");
+			m += _("The drive that the film is stored on is low in disc space.  Free some more space and try again.");
 		}
 
 		set_error (e.what(), m);
@@ -81,7 +84,7 @@ Job::run_wrapper ()
 		set_state (FINISHED_ERROR);
 		set_error (
 			e.what (),
-			"It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+			_("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
 			);
 
 	} catch (...) {
@@ -89,8 +92,8 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 		set_error (
-			"Unknown error",
-			"It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+			_("Unknown error"),
+			_("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
 			);
 
 	}
@@ -273,14 +276,16 @@ Job::status () const
 
 	stringstream s;
 	if (!finished ()) {
-		s << pc << "%";
+		s << pc << N_("%");
 		if (p >= 0 && t > 10 && r > 0) {
-			s << "; " << seconds_to_approximate_hms (r) << " remaining";
+			/// TRANSLATORS: remaining here follows an amount of time that is remaining
+			/// on an operation.
+			s << "; " << seconds_to_approximate_hms (r) << " " << _("remaining");
 		}
 	} else if (finished_ok ()) {
-		s << "OK (ran for " << seconds_to_hms (_ran_for) << ")";
+		s << String::compose (_("OK (ran for %1)"), seconds_to_hms (_ran_for));
 	} else if (finished_in_error ()) {
-		s << "Error (" << error_summary() << ")";
+		s << String::compose (_("Error (%1)"), error_summary());
 	}
 
 	return s.str ();
diff --git a/src/lib/log.cc b/src/lib/log.cc
index 7459700ea..ef36a902c 100644
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -25,6 +25,8 @@
 #include <time.h>
 #include "log.h"
 
+#include "i18n.h"
+
 using namespace std;
 
 Log::Log ()
@@ -48,7 +50,7 @@ Log::log (string m, Level l)
 	string a = ctime (&t);
 
 	stringstream s;
-	s << a.substr (0, a.length() - 1) << ": " << m;
+	s << a.substr (0, a.length() - 1) << N_(": ") << m;
 	do_log (s.str ());
 }
 
@@ -65,7 +67,7 @@ Log::microsecond_log (string m, Level l)
 	gettimeofday (&tv, 0);
 
 	stringstream s;
-	s << tv.tv_sec << ":" << tv.tv_usec << " " << m;
+	s << tv.tv_sec << N_(":") << tv.tv_usec << N_(" ") << m;
 	do_log (s.str ());
 }	
 
@@ -79,10 +81,10 @@ Log::set_level (Level l)
 void
 Log::set_level (string l)
 {
-	if (l == "verbose") {
+	if (l == N_("verbose")) {
 		set_level (VERBOSE);
 		return;
-	} else if (l == "timing") {
+	} else if (l == N_("timing")) {
 		set_level (TIMING);
 		return;
 	}
@@ -101,6 +103,6 @@ void
 FileLog::do_log (string m)
 {
 	ofstream f (_file.c_str(), fstream::app);
-	f << m << "\n";
+	f << m << N_("\n");
 }
 
diff --git a/src/lib/matcher.cc b/src/lib/matcher.cc
index 182fb306c..4cd264338 100644
--- a/src/lib/matcher.cc
+++ b/src/lib/matcher.cc
@@ -21,6 +21,8 @@
 #include "image.h"
 #include "log.h"
 
+#include "i18n.h"
+
 using std::min;
 using boost::shared_ptr;
 
@@ -65,7 +67,7 @@ Matcher::process_end ()
 
 	_log->log (
 		String::compose (
-			"Matching processor has seen %1 video frames (which equals %2 audio frames) and %3 audio frames",
+			N_("Matching processor has seen %1 video frames (which equals %2 audio frames) and %3 audio frames"),
 			_video_frames,
 			video_frames_to_audio_frames (_video_frames, _sample_rate, _frames_per_second),
 			_audio_frames
@@ -74,12 +76,12 @@ Matcher::process_end ()
 	
 	if (audio_short_by_frames < 0) {
 		
-		_log->log (String::compose ("%1 too many audio frames", -audio_short_by_frames));
+		_log->log (String::compose (N_("%1 too many audio frames"), -audio_short_by_frames));
 		
 		/* We have seen more audio than video.  Emit enough black video frames so that we reverse this */
 		int const black_video_frames = ceil (-audio_short_by_frames * _frames_per_second / _sample_rate);
 		
-		_log->log (String::compose ("Emitting %1 frames of black video", black_video_frames));
+		_log->log (String::compose (N_("Emitting %1 frames of black video"), black_video_frames));
 
 		shared_ptr<Image> black (new SimpleImage (_pixel_format.get(), _size.get(), true));
 		black->make_black ();
@@ -92,7 +94,7 @@ Matcher::process_end ()
 	}
 	
 	if (audio_short_by_frames > 0) {
-		_log->log (String::compose ("Emitted %1 too few audio frames", audio_short_by_frames));
+		_log->log (String::compose (N_("Emitted %1 too few audio frames"), audio_short_by_frames));
 
 		/* Do things in half second blocks as I think there may be limits
 		   to what FFmpeg (and in particular the resampler) can cope with.
diff --git a/src/lib/scaler.cc b/src/lib/scaler.cc
index c81456a15..40a0f05b9 100644
--- a/src/lib/scaler.cc
+++ b/src/lib/scaler.cc
@@ -28,6 +28,8 @@ extern "C" {
 }
 #include "scaler.h"
 
+#include "i18n.h"
+
 using namespace std;
 
 vector<Scaler const *> Scaler::_scalers;
@@ -57,15 +59,15 @@ Scaler::all ()
 void
 Scaler::setup_scalers ()
 {
-	_scalers.push_back (new Scaler (SWS_BICUBIC, "bicubic", "Bicubic"));
-	_scalers.push_back (new Scaler (SWS_X, "x", "X"));
-	_scalers.push_back (new Scaler (SWS_AREA, "area", "Area"));
-	_scalers.push_back (new Scaler (SWS_GAUSS, "gauss", "Gaussian"));
-	_scalers.push_back (new Scaler (SWS_LANCZOS, "lanczos", "Lanczos"));
-	_scalers.push_back (new Scaler (SWS_SINC, "sinc", "Sinc"));
-	_scalers.push_back (new Scaler (SWS_SPLINE, "spline", "Spline"));
-	_scalers.push_back (new Scaler (SWS_BILINEAR, "bilinear", "Bilinear"));
-	_scalers.push_back (new Scaler (SWS_FAST_BILINEAR, "fastbilinear", "Fast Bilinear"));
+	_scalers.push_back (new Scaler (SWS_BICUBIC, N_("bicubic"), _("Bicubic")));
+	_scalers.push_back (new Scaler (SWS_X, N_("x"), _("X")));
+	_scalers.push_back (new Scaler (SWS_AREA, N_("area"), _("Area")));
+	_scalers.push_back (new Scaler (SWS_GAUSS, N_("gauss"), _("Gaussian")));
+	_scalers.push_back (new Scaler (SWS_LANCZOS, N_("lanczos"), _("Lanczos")));
+	_scalers.push_back (new Scaler (SWS_SINC, N_("sinc"), _("Sinc")));
+	_scalers.push_back (new Scaler (SWS_SPLINE, N_("spline"), _("Spline")));
+	_scalers.push_back (new Scaler (SWS_BILINEAR, N_("bilinear"), _("Bilinear")));
+	_scalers.push_back (new Scaler (SWS_FAST_BILINEAR, N_("fastbilinear"), _("Fast Bilinear")));
 }
 
 /** @param id One of our ids.
diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
index 30d02eff8..a9fdfefda 100644
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -34,6 +34,8 @@
 #include "log.h"
 #include "film.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::stringstream;
 using std::min;
@@ -47,7 +49,7 @@ public:
 	{
 		session = ssh_new ();
 		if (session == 0) {
-			throw NetworkError ("Could not start SSH session");
+			throw NetworkError (_("could not start SSH session"));
 		}
 	}
 
@@ -81,7 +83,7 @@ public:
 	{
 		scp = ssh_scp_new (s, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, Config::instance()->tms_path().c_str ());
 		if (!scp) {
-			throw NetworkError (String::compose ("Could not start SCP session (%1)", ssh_get_error (s)));
+			throw NetworkError (String::compose (_("could not start SCP session (%1)"), ssh_get_error (s)));
 		}
 	}
 
@@ -96,7 +98,7 @@ public:
 
 SCPDCPJob::SCPDCPJob (shared_ptr<Film> f)
 	: Job (f)
-	, _status ("Waiting")
+	, _status (_("Waiting"))
 {
 
 }
@@ -104,17 +106,17 @@ SCPDCPJob::SCPDCPJob (shared_ptr<Film> f)
 string
 SCPDCPJob::name () const
 {
-	return "Copy DCP to TMS";
+	return _("Copy DCP to TMS");
 }
 
 void
 SCPDCPJob::run ()
 {
-	_film->log()->log ("SCP DCP job starting");
+	_film->log()->log (N_("SCP DCP job starting"));
 	
 	SSHSession ss;
 	
-	set_status ("connecting");
+	set_status (_("connecting"));
 	
 	ssh_options_set (ss.session, SSH_OPTIONS_HOST, Config::instance()->tms_ip().c_str ());
 	ssh_options_set (ss.session, SSH_OPTIONS_USER, Config::instance()->tms_user().c_str ());
@@ -123,29 +125,29 @@ SCPDCPJob::run ()
 	
 	int r = ss.connect ();
 	if (r != SSH_OK) {
-		throw NetworkError (String::compose ("Could not connect to server %1 (%2)", Config::instance()->tms_ip(), ssh_get_error (ss.session)));
+		throw NetworkError (String::compose (_("Could not connect to server %1 (%2)"), Config::instance()->tms_ip(), ssh_get_error (ss.session)));
 	}
 	
 	int const state = ssh_is_server_known (ss.session);
 	if (state == SSH_SERVER_ERROR) {
-		throw NetworkError (String::compose ("SSH error (%1)", ssh_get_error (ss.session)));
+		throw NetworkError (String::compose (_("SSH error (%1)"), ssh_get_error (ss.session)));
 	}
 	
 	r = ssh_userauth_password (ss.session, 0, Config::instance()->tms_password().c_str ());
 	if (r != SSH_AUTH_SUCCESS) {
-		throw NetworkError (String::compose ("Failed to authenticate with server (%1)", ssh_get_error (ss.session)));
+		throw NetworkError (String::compose (_("Failed to authenticate with server (%1)"), ssh_get_error (ss.session)));
 	}
 	
 	SSHSCP sc (ss.session);
 	
 	r = ssh_scp_init (sc.scp);
 	if (r != SSH_OK) {
-		throw NetworkError (String::compose ("Could not start SCP session (%1)", ssh_get_error (ss.session)));
+		throw NetworkError (String::compose (_("Could not start SCP session (%1)"), ssh_get_error (ss.session)));
 	}
 	
 	r = ssh_scp_push_directory (sc.scp, _film->dcp_name().c_str(), S_IRWXU);
 	if (r != SSH_OK) {
-		throw NetworkError (String::compose ("Could not create remote directory %1 (%2)", _film->dcp_name(), ssh_get_error (ss.session)));
+		throw NetworkError (String::compose (_("Could not create remote directory %1 (%2)"), _film->dcp_name(), ssh_get_error (ss.session)));
 	}
 	
 	string const dcp_dir = _film->dir (_film->dcp_name());
@@ -163,14 +165,14 @@ SCPDCPJob::run ()
 		
 		string const leaf = boost::filesystem::path(*i).leaf().generic_string ();
 		
-		set_status ("copying " + leaf);
+		set_status (String::compose (_("copying %1"), leaf));
 		
 		boost::uintmax_t to_do = boost::filesystem::file_size (*i);
 		ssh_scp_push_file (sc.scp, leaf.c_str(), to_do, S_IRUSR | S_IWUSR);
 
-		FILE* f = fopen (boost::filesystem::path (*i).string().c_str(), "rb");
+		FILE* f = fopen (boost::filesystem::path (*i).string().c_str(), N_("rb"));
 		if (f == 0) {
-			throw NetworkError (String::compose ("Could not open %1 to send", *i));
+			throw NetworkError (String::compose (_("Could not open %1 to send"), *i));
 		}
 
 		while (to_do > 0) {
@@ -182,7 +184,7 @@ SCPDCPJob::run ()
 			
 			r = ssh_scp_write (sc.scp, buffer, t);
 			if (r != SSH_OK) {
-				throw NetworkError (String::compose ("Could not write to remote file (%1)", ssh_get_error (ss.session)));
+				throw NetworkError (String::compose (_("Could not write to remote file (%1)"), ssh_get_error (ss.session)));
 			}
 			to_do -= t;
 			bytes_transferred += t;
@@ -194,7 +196,7 @@ SCPDCPJob::run ()
 	}
 	
 	set_progress (1);
-	set_status ("");
+	set_status (N_(""));
 	set_state (FINISHED_OK);
 }
 
@@ -205,7 +207,7 @@ SCPDCPJob::status () const
 	stringstream s;
 	s << Job::status ();
 	if (!_status.empty ()) {
-		s << "; " << _status;
+		s << N_("; ") << _status;
 	}
 	return s.str ();
 }
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 3614ed9e4..76a25bfbb 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -37,6 +37,8 @@
 #include "config.h"
 #include "subtitle.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::stringstream;
 using std::multimap;
@@ -57,7 +59,7 @@ ServerDescription *
 ServerDescription::create_from_metadata (string v)
 {
 	vector<string> b;
-	split (b, v, is_any_of (" "));
+	split (b, v, is_any_of (N_(" ")));
 
 	if (b.size() != 2) {
 		return 0;
@@ -71,7 +73,7 @@ string
 ServerDescription::as_metadata () const
 {
 	stringstream s;
-	s << _host_name << " " << _threads;
+	s << _host_name << N_(" ") << _threads;
 	return s.str ();
 }
 
@@ -91,24 +93,24 @@ Server::process (shared_ptr<Socket> socket)
 	stringstream s (buffer.get());
 	multimap<string, string> kv = read_key_value (s);
 
-	if (get_required_string (kv, "encode") != "please") {
+	if (get_required_string (kv, N_("encode")) != N_("please")) {
 		return -1;
 	}
 
-	libdcp::Size in_size (get_required_int (kv, "input_width"), get_required_int (kv, "input_height"));
-	int pixel_format_int = get_required_int (kv, "input_pixel_format");
-	libdcp::Size out_size (get_required_int (kv, "output_width"), get_required_int (kv, "output_height"));
-	int padding = get_required_int (kv, "padding");
-	int subtitle_offset = get_required_int (kv, "subtitle_offset");
-	float subtitle_scale = get_required_float (kv, "subtitle_scale");
-	string scaler_id = get_required_string (kv, "scaler");
-	int frame = get_required_int (kv, "frame");
-	int frames_per_second = get_required_int (kv, "frames_per_second");
-	string post_process = get_optional_string (kv, "post_process");
-	int colour_lut_index = get_required_int (kv, "colour_lut");
-	int j2k_bandwidth = get_required_int (kv, "j2k_bandwidth");
-	Position subtitle_position (get_optional_int (kv, "subtitle_x"), get_optional_int (kv, "subtitle_y"));
-	libdcp::Size subtitle_size (get_optional_int (kv, "subtitle_width"), get_optional_int (kv, "subtitle_height"));
+	libdcp::Size in_size (get_required_int (kv, N_("input_width")), get_required_int (kv, N_("input_height")));
+	int pixel_format_int = get_required_int (kv, N_("input_pixel_format"));
+	libdcp::Size out_size (get_required_int (kv, N_("output_width")), get_required_int (kv, N_("output_height")));
+	int padding = get_required_int (kv, N_("padding"));
+	int subtitle_offset = get_required_int (kv, N_("subtitle_offset"));
+	float subtitle_scale = get_required_float (kv, N_("subtitle_scale"));
+	string scaler_id = get_required_string (kv, N_("scaler"));
+	int frame = get_required_int (kv, N_("frame"));
+	int frames_per_second = get_required_int (kv, N_("frames_per_second"));
+	string post_process = get_optional_string (kv, N_("post_process"));
+	int colour_lut_index = get_required_int (kv, N_("colour_lut"));
+	int j2k_bandwidth = get_required_int (kv, N_("j2k_bandwidth"));
+	Position subtitle_position (get_optional_int (kv, N_("subtitle_x")), get_optional_int (kv, N_("subtitle_y")));
+	libdcp::Size subtitle_size (get_optional_int (kv, N_("subtitle_width")), get_optional_int (kv, N_("subtitle_height")));
 
 	/* This checks that colour_lut_index is within range */
 	colour_lut_index_to_name (colour_lut_index);
@@ -137,7 +139,7 @@ Server::process (shared_ptr<Socket> socket)
 		encoded->send (socket);
 	} catch (std::exception& e) {
 		_log->log (String::compose (
-				   "Send failed; frame %1, data size %2, pixel format %3, image size %4x%5, %6 components",
+				   N_("Send failed; frame %1, data size %2, pixel format %3, image size %4x%5, %6 components"),
 				   frame, encoded->size(), image->pixel_format(), image->size().width, image->size().height, image->components()
 				   )
 			);
@@ -169,7 +171,7 @@ Server::worker_thread ()
 		try {
 			frame = process (socket);
 		} catch (std::exception& e) {
-			_log->log (String::compose ("Error: %1", e.what()));
+			_log->log (String::compose (N_("Error: %1"), e.what()));
 		}
 		
 		socket.reset ();
@@ -179,7 +181,7 @@ Server::worker_thread ()
 		if (frame >= 0) {
 			struct timeval end;
 			gettimeofday (&end, 0);
-			_log->log (String::compose ("Encoded frame %1 in %2", frame, seconds (end) - seconds (start)));
+			_log->log (String::compose (N_("Encoded frame %1 in %2"), frame, seconds (end) - seconds (start)));
 		}
 		
 		_worker_condition.notify_all ();
@@ -189,7 +191,7 @@ Server::worker_thread ()
 void
 Server::run (int num_threads)
 {
-	_log->log (String::compose ("Server starting with %1 threads", num_threads));
+	_log->log (String::compose (N_("Server starting with %1 threads"), num_threads));
 	
 	for (int i = 0; i < num_threads; ++i) {
 		_worker_threads.push_back (new thread (bind (&Server::worker_thread, this)));
diff --git a/src/lib/stream.cc b/src/lib/stream.cc
index 4f12f41b9..e5a2bbc2b 100644
--- a/src/lib/stream.cc
+++ b/src/lib/stream.cc
@@ -23,6 +23,8 @@
 #include "ffmpeg_decoder.h"
 #include "external_audio_decoder.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::stringstream;
 using boost::shared_ptr;
@@ -47,7 +49,7 @@ SubtitleStream::SubtitleStream (string t, boost::optional<int>)
 string
 SubtitleStream::to_string () const
 {
-	return String::compose ("%1 %2", _id, _name);
+	return String::compose (N_("%1 %2"), _id, _name);
 }
 
 /** Create a SubtitleStream from a value returned from to_string().
diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
index 5bb91af63..5c1ad9706 100644
--- a/src/lib/subtitle.cc
+++ b/src/lib/subtitle.cc
@@ -25,6 +25,8 @@
 #include "image.h"
 #include "exceptions.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace boost;
 using libdcp::Size;
@@ -47,13 +49,13 @@ TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
 	_to = packet_time + (double (sub.end_display_time) / 1e3);
 
 	if (sub.num_rects > 1) {
-		throw DecodeError ("multi-part subtitles not yet supported");
+		throw DecodeError (_("multi-part subtitles not yet supported"));
 	}
 
 	AVSubtitleRect const * rect = sub.rects[0];
 
 	if (rect->type != SUBTITLE_BITMAP) {
-		throw DecodeError ("non-bitmap subtitles not yet supported");
+		throw DecodeError (_("non-bitmap subtitles not yet supported"));
 	}
 	
 	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGBA, libdcp::Size (rect->w, rect->h), true));
diff --git a/src/lib/timer.cc b/src/lib/timer.cc
index a45e80dcb..69a7e3aa9 100644
--- a/src/lib/timer.cc
+++ b/src/lib/timer.cc
@@ -26,6 +26,8 @@
 #include "timer.h"
 #include "util.h"
 
+#include "i18n.h"
+
 using namespace std;
 
 /** @param n Name to use when giving output */
@@ -40,7 +42,7 @@ PeriodTimer::~PeriodTimer ()
 {
 	struct timeval stop;
 	gettimeofday (&stop, 0);
-	cout << "T: " << _name << ": " << (seconds (stop) - seconds (_start)) << "\n";
+	cout << N_("T: ") << _name << N_(": ") << (seconds (stop) - seconds (_start)) << N_("\n");
 }
 
 /** @param n Name to use when giving output.
@@ -80,10 +82,10 @@ StateTimer::~StateTimer ()
 	}
 
 	
-	set_state ("");
+	set_state (N_(""));
 
-	cout << _name << ":\n";
+	cout << _name << N_(":\n");
 	for (map<string, double>::iterator i = _totals.begin(); i != _totals.end(); ++i) {
-		cout << "\t" << i->first << " " << i->second << "\n";
+		cout << N_("\t") << i->first << " " << i->second << N_("\n");
 	}
 }
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index a4279ef8b..61fad2e2b 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -59,8 +59,8 @@ TranscodeJob::run ()
 {
 	try {
 
-		_film->log()->log ("Transcode job starting");
-		_film->log()->log (String::compose ("Audio delay is %1ms", _film->audio_delay()));
+		_film->log()->log (N_("Transcode job starting"));
+		_film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
 
 		_encoder.reset (new Encoder (_film));
 		Transcoder w (_film, _decode_opt, this, _encoder);
@@ -70,14 +70,14 @@ TranscodeJob::run ()
 
 		_film->set_dcp_intrinsic_duration (_encoder->video_frames_out ());
 
-		_film->log()->log ("Transcode job completed successfully");
-		_film->log()->log (String::compose ("DCP intrinsic duration is %1", _encoder->video_frames_out()));
+		_film->log()->log (N_("Transcode job completed successfully"));
+		_film->log()->log (String::compose (N_("DCP intrinsic duration is %1"), _encoder->video_frames_out()));
 
 	} catch (std::exception& e) {
 
 		set_progress (1);
 		set_state (FINISHED_ERROR);
-		_film->log()->log (String::compose ("Transcode job failed (%1)", e.what()));
+		_film->log()->log (String::compose (N_("Transcode job failed (%1)"), e.what()));
 
 		throw;
 	}
@@ -87,7 +87,7 @@ string
 TranscodeJob::status () const
 {
 	if (!_encoder) {
-		return "0%";
+		return _("0%");
 	}
 
 	float const fps = _encoder->current_frames_per_second ();
@@ -100,7 +100,7 @@ TranscodeJob::status () const
 	s << Job::status ();
 
 	if (!finished ()) {
-		s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
+		s << N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
 	}
 	
 	return s.str ();
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 4ee304600..892a7fd86 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -61,6 +61,8 @@ extern "C" {
 #include "sound_processor.h"
 #include "config.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace boost;
 using libdcp::Size;
@@ -83,9 +85,9 @@ seconds_to_hms (int s)
 	m -= (h * 60);
 
 	stringstream hms;
-	hms << h << ":";
+	hms << h << N_(":");
 	hms.width (2);
-	hms << setfill ('0') << m << ":";
+	hms << setfill ('0') << m << N_(":");
 	hms.width (2);
 	hms << setfill ('0') << s;
 
@@ -107,22 +109,22 @@ seconds_to_approximate_hms (int s)
 	
 	if (h > 0) {
 		if (m > 30) {
-			ap << (h + 1) << " hours";
+			ap << (h + 1) << N_(" ") << _("hours");
 		} else {
 			if (h == 1) {
-				ap << "1 hour";
+				ap << N_("1 ") << _("hour");
 			} else {
-				ap << h << " hours";
+				ap << h << N_(" ") << _("hours");
 			}
 		}
 	} else if (m > 0) {
 		if (m == 1) {
-			ap << "1 minute";
+			ap << N_("1 ") << _("minute");
 		} else {
-			ap << m << " minutes";
+			ap << m << N_(" ") << _("minutes");
 		}
 	} else {
-		ap << s << " seconds";
+		ap << s << N_(" ") << _("seconds");
 	}
 
 	return ap.str ();
@@ -135,12 +137,12 @@ seconds_to_approximate_hms (int s)
 static string
 demangle (string l)
 {
-	string::size_type const b = l.find_first_of ("(");
+	string::size_type const b = l.find_first_of (N_("("));
 	if (b == string::npos) {
 		return l;
 	}
 
-	string::size_type const p = l.find_last_of ("+");
+	string::size_type const p = l.find_last_of (N_("+"));
 	if (p == string::npos) {
 		return l;
 	}
@@ -183,7 +185,7 @@ stacktrace (ostream& out, int levels)
      
 	if (strings) {
 		for (i = 0; i < size && (levels == 0 || i < size_t(levels)); i++) {
-			out << "  " << demangle (strings[i]) << endl;
+			out << N_("  ") << demangle (strings[i]) << endl;
 		}
 		
 		free (strings);
@@ -198,7 +200,7 @@ static string
 ffmpeg_version_to_string (int v)
 {
 	stringstream s;
-	s << ((v & 0xff0000) >> 16) << "." << ((v & 0xff00) >> 8) << "." << (v & 0xff);
+	s << ((v & 0xff0000) >> 16) << N_(".") << ((v & 0xff00) >> 8) << N_(".") << (v & 0xff);
 	return s.str ();
 }
 
@@ -207,16 +209,16 @@ string
 dependency_version_summary ()
 {
 	stringstream s;
-	s << "libopenjpeg " << opj_version () << ", "
-	  << "libavcodec " << ffmpeg_version_to_string (avcodec_version()) << ", "
-	  << "libavfilter " << ffmpeg_version_to_string (avfilter_version()) << ", "
-	  << "libavformat " << ffmpeg_version_to_string (avformat_version()) << ", "
-	  << "libavutil " << ffmpeg_version_to_string (avutil_version()) << ", "
-	  << "libpostproc " << ffmpeg_version_to_string (postproc_version()) << ", "
-	  << "libswscale " << ffmpeg_version_to_string (swscale_version()) << ", "
-	  << MagickVersion << ", "
-	  << "libssh " << ssh_version (0) << ", "
-	  << "libdcp " << libdcp::version << " git " << libdcp::git_commit;
+	s << N_("libopenjpeg ") << opj_version () << N_(", ")
+	  << N_("libavcodec ") << ffmpeg_version_to_string (avcodec_version()) << N_(", ")
+	  << N_("libavfilter ") << ffmpeg_version_to_string (avfilter_version()) << N_(", ")
+	  << N_("libavformat ") << ffmpeg_version_to_string (avformat_version()) << N_(", ")
+	  << N_("libavutil ") << ffmpeg_version_to_string (avutil_version()) << N_(", ")
+	  << N_("libpostproc ") << ffmpeg_version_to_string (postproc_version()) << N_(", ")
+	  << N_("libswscale ") << ffmpeg_version_to_string (swscale_version()) << N_(", ")
+	  << MagickVersion << N_(", ")
+	  << N_("libssh ") << ssh_version (0) << N_(", ")
+	  << N_("libdcp ") << libdcp::version << N_(" git ") << libdcp::git_commit;
 
 	return s.str ();
 }
@@ -233,6 +235,8 @@ seconds (struct timeval t)
 void
 dvdomatic_setup ()
 {
+	bindtextdomain ("libdvdomatic", LOCALE_DIR);
+	
 	avfilter_register_all ();
 	
 	Format::setup_formats ();
@@ -252,7 +256,7 @@ string
 crop_string (Position start, libdcp::Size size)
 {
 	stringstream s;
-	s << "crop=" << size.width << ":" << size.height << ":" << start.x << ":" << start.y;
+	s << N_("crop=") << size.width << N_(":") << size.height << N_(":") << start.x << N_(":") << start.y;
 	return s.str ();
 }
 
@@ -268,7 +272,7 @@ split_at_spaces_considering_quotes (string s)
 	for (string::size_type i = 0; i < s.length(); ++i) {
 		if (s[i] == ' ' && !in_quotes) {
 			out.push_back (c);
-			c = "";
+			c = N_("");
 		} else if (s[i] == '"') {
 			in_quotes = !in_quotes;
 		} else {
@@ -423,7 +427,7 @@ DCPFrameRate::DCPFrameRate (float source_fps)
 	}
 
 	if (!best) {
-		throw EncodeError ("cannot find a suitable DCP frame rate for this source");
+		throw EncodeError (_("cannot find a suitable DCP frame rate for this source"));
 	}
 
 	frames_per_second = best->dcp;
@@ -476,13 +480,13 @@ colour_lut_index_to_name (int index)
 {
 	switch (index) {
 	case 0:
-		return "sRGB";
+		return _("sRGB");
 	case 1:
-		return "Rec 709";
+		return _("Rec 709");
 	}
 
 	assert (false);
-	return "";
+	return N_("");
 }
 
 Socket::Socket (int timeout)
@@ -519,7 +523,7 @@ Socket::connect (asio::ip::basic_resolver_entry<asio::ip::tcp> const & endpoint)
 	} while (ec == asio::error::would_block);
 
 	if (ec || !_socket.is_open ()) {
-		throw NetworkError ("connect timed out");
+		throw NetworkError (_("connect timed out"));
 	}
 }
 
@@ -656,13 +660,13 @@ string
 get_required_string (multimap<string, string> const & kv, string k)
 {
 	if (kv.count (k) > 1) {
-		throw StringError ("unexpected multiple keys in key-value set");
+		throw StringError (N_("unexpected multiple keys in key-value set"));
 	}
 
 	multimap<string, string>::const_iterator i = kv.find (k);
 	
 	if (i == kv.end ()) {
-		throw StringError (String::compose ("missing key %1 in key-value set", k));
+		throw StringError (String::compose (_("missing key %1 in key-value set"), k));
 	}
 
 	return i->second;
@@ -686,12 +690,12 @@ string
 get_optional_string (multimap<string, string> const & kv, string k)
 {
 	if (kv.count (k) > 1) {
-		throw StringError ("unexpected multiple keys in key-value set");
+		throw StringError (N_("unexpected multiple keys in key-value set"));
 	}
 
 	multimap<string, string>::const_iterator i = kv.find (k);
 	if (i == kv.end ()) {
-		return "";
+		return N_("");
 	}
 
 	return i->second;
@@ -701,7 +705,7 @@ int
 get_optional_int (multimap<string, string> const & kv, string k)
 {
 	if (kv.count (k) > 1) {
-		throw StringError ("unexpected multiple keys in key-value set");
+		throw StringError (N_("unexpected multiple keys in key-value set"));
 	}
 
 	multimap<string, string>::const_iterator i = kv.find (k);
@@ -870,7 +874,7 @@ still_image_file (string f)
 
 	transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
 	
-	return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp");
+	return (ext == N_(".tif") || ext == N_(".tiff") || ext == N_(".jpg") || ext == N_(".jpeg") || ext == N_(".png") || ext == N_(".bmp"));
 }
 
 /** @return A pair containing CPU model name and the number of processors */
@@ -881,16 +885,16 @@ cpu_info ()
 	info.second = 0;
 	
 #ifdef DVDOMATIC_POSIX
-	ifstream f ("/proc/cpuinfo");
+	ifstream f (N_("/proc/cpuinfo"));
 	while (f.good ()) {
 		string l;
 		getline (f, l);
-		if (boost::algorithm::starts_with (l, "model name")) {
+		if (boost::algorithm::starts_with (l, N_("model name"))) {
 			string::size_type const c = l.find (':');
 			if (c != string::npos) {
 				info.first = l.substr (c + 2);
 			}
-		} else if (boost::algorithm::starts_with (l, "processor")) {
+		} else if (boost::algorithm::starts_with (l, N_("processor"))) {
 			++info.second;
 		}
 	}
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index c1f48cb5e..891720f6b 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -25,6 +25,8 @@
 #include "options.h"
 #include "job.h"
 
+#include "i18n.h"
+
 using boost::shared_ptr;
 using boost::optional;
 
@@ -76,7 +78,7 @@ VideoDecoder::repeat_last_video ()
 void
 VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
 {
-	TIMING ("Decoder emits %1", _video_frame);
+	TIMING (N_("Decoder emits %1"), _video_frame);
 	Video (image, same, sub);
 	++_video_frame;
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index c2cc00328..d480d502a 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -29,6 +29,8 @@
 #include "log.h"
 #include "dcp_video_frame.h"
 
+#include "i18n.h"
+
 using std::make_pair;
 using std::pair;
 using std::string;
@@ -76,7 +78,7 @@ Writer::Writer (shared_ptr<Film> f)
 		_sound_asset.reset (
 			new libdcp::SoundAsset (
 				_film->dir (_film->dcp_name()),
-				"audio.mxf",
+				N_("audio.mxf"),
 				DCPFrameRate (_film->frames_per_second()).frames_per_second,
 				dcp_audio_channels (_film->audio_channels()),
 				dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
@@ -147,9 +149,9 @@ try
 				break;
 			}
 			
-			TIMING ("writer sleeps with a queue of %1", _queue.size());
+			TIMING (N_("writer sleeps with a queue of %1"), _queue.size());
 			_condition.wait (lock);
-			TIMING ("writer wakes with a queue of %1", _queue.size());
+			TIMING (N_("writer wakes with a queue of %1"), _queue.size());
 		}
 
 		if (_finish && _queue.empty()) {
@@ -168,7 +170,7 @@ try
 			switch (qi.type) {
 			case QueueItem::FULL:
 			{
-				_film->log()->log (String::compose ("Writer FULL-writes %1 to MXF", qi.frame));
+				_film->log()->log (String::compose (N_("Writer FULL-writes %1 to MXF"), qi.frame));
 				if (!qi.encoded) {
 					qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, false)));
 				}
@@ -179,14 +181,14 @@ try
 				break;
 			}
 			case QueueItem::FAKE:
-				_film->log()->log (String::compose ("Writer FAKE-writes %1 to MXF", qi.frame));
+				_film->log()->log (String::compose (N_("Writer FAKE-writes %1 to MXF"), qi.frame));
 				_picture_asset_writer->fake_write (qi.size);
 				_last_written.reset ();
 				++_fake_written;
 				break;
 			case QueueItem::REPEAT:
 			{
-				_film->log()->log (String::compose ("Writer REPEAT-writes %1 to MXF", qi.frame));
+				_film->log()->log (String::compose (N_("Writer REPEAT-writes %1 to MXF"), qi.frame));
 				libdcp::FrameInfo const fin = _picture_asset_writer->write (_last_written->data(), _last_written->size());
 				_last_written->write_info (_film, qi.frame, fin);
 				++_repeat_written;
@@ -215,7 +217,7 @@ try
 			++_pushed_to_disk;
 			
 			lock.unlock ();
-			_film->log()->log (String::compose ("Writer full (awaiting %1); pushes %2 to disk", _last_written_frame + 1, qi.frame));
+			_film->log()->log (String::compose (N_("Writer full (awaiting %1); pushes %2 to disk"), _last_written_frame + 1, qi.frame));
 			qi.encoded->write (_film, qi.frame);
 			lock.lock ();
 			qi.encoded.reset ();
@@ -270,14 +272,14 @@ Writer::finish ()
 	
 	boost::filesystem::path to;
 	to /= _film->dir (_film->dcp_name());
-	to /= "video.mxf";
+	to /= N_("video.mxf");
 	
 	boost::filesystem::create_hard_link (from, to);
 
 	/* And update the asset */
 
 	_picture_asset->set_directory (_film->dir (_film->dcp_name ()));
-	_picture_asset->set_file_name ("video.mxf");
+	_picture_asset->set_file_name (N_("video.mxf"));
 
 	if (_sound_asset) {
 		_sound_asset->set_entry_point (_film->trim_start ());
@@ -302,7 +304,7 @@ Writer::finish ()
 
 	dcp.write_xml ();
 
-	_film->log()->log (String::compose ("Wrote %1 FULL, %2 FAKE, %3 REPEAT; %4 pushed to disk", _full_written, _fake_written, _repeat_written, _pushed_to_disk));
+	_film->log()->log (String::compose (N_("Wrote %1 FULL, %2 FAKE, %3 REPEAT; %4 pushed to disk"), _full_written, _fake_written, _repeat_written, _pushed_to_disk));
 }
 
 /** Tell the writer that frame `f' should be a repeat of the frame before it */
@@ -328,7 +330,7 @@ Writer::check_existing_picture_mxf ()
 	boost::filesystem::path p;
 	p /= _film->video_mxf_dir ();
 	p /= _film->video_mxf_filename ();
-	FILE* mxf = fopen (p.string().c_str(), "rb");
+	FILE* mxf = fopen (p.string().c_str(), N_("rb"));
 	if (!mxf) {
 		return;
 	}
@@ -346,11 +348,11 @@ Writer::check_existing_picture_mxf ()
 		string const existing_hash = md5_digest (data.data(), data.size());
 		
 		if (existing_hash != info.hash) {
-			_film->log()->log (String::compose ("Existing frame %1 failed hash check", _first_nonexistant_frame));
+			_film->log()->log (String::compose (N_("Existing frame %1 failed hash check"), _first_nonexistant_frame));
 			break;
 		}
 
-		_film->log()->log (String::compose ("Have existing frame %1", _first_nonexistant_frame));
+		_film->log()->log (String::compose (N_("Have existing frame %1"), _first_nonexistant_frame));
 		++_first_nonexistant_frame;
 	}
 
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index d1760c327..52e551d2a 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -441,15 +441,9 @@ setup_i18n ()
  
 	if (wxLocale::IsAvailable (language)) {
 		locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT);
-		
+
 #ifdef __WXGTK__
-		locale->AddCatalogLookupPathPrefix (wxT ("/usr"));
-		locale->AddCatalogLookupPathPrefix (wxT ("/usr/local"));
-		locale->AddCatalogLookupPathPrefix (wxT ("build/src/wx/mo"));
-		locale->AddCatalogLookupPathPrefix (wxT ("build/src/tools/mo"));
-		wxStandardPaths* paths = (wxStandardPaths*) &wxStandardPaths::Get();
-		wxString prefix = paths->GetInstallPrefix();
-		locale->AddCatalogLookupPathPrefix (prefix);
+		locale->AddCatalogLookupPathPrefix (wxT (LOCALE_DIR));
 #endif
 
 		locale->AddCatalog ("libdvdomatic-wx");
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 07e32a457..bf97d0d3a 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -154,7 +154,7 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	_reference_scaler->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::reference_scaler_changed), 0, this);
 
 	pair<string, string> p = Filter::ffmpeg_strings (config->reference_filters ());
-	_reference_filters->SetLabel (std_to_wx (p.first + " " + p.second));
+	_reference_filters->SetLabel (std_to_wx (p.first + N_(" ") + p.second));
 	_reference_filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_reference_filters_clicked), 0, this);
 
 	vector<ServerDescription*> servers = config->servers ();
@@ -313,7 +313,7 @@ ConfigDialog::reference_filters_changed (vector<Filter const *> f)
 {
 	Config::instance()->set_reference_filters (f);
 	pair<string, string> p = Filter::ffmpeg_strings (Config::instance()->reference_filters ());
-	_reference_filters->SetLabel (std_to_wx (p.first + " " + p.second));
+	_reference_filters->SetLabel (std_to_wx (p.first + N_(" ") + p.second));
 }
 
 void
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 68291a812..b328f04c9 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -162,7 +162,7 @@ FilmEditor::make_film_panel ()
 		_still_duration = new wxSpinCtrl (_film_panel);
 		still_control (_still_duration);
 		s->Add (_still_duration, 1, wxEXPAND);
-		/* TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time */
+		/// TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
 		still_control (add_label_to_sizer (s, _film_panel, _("s")));
 		grid->Add (s);
 	}
@@ -320,7 +320,7 @@ FilmEditor::make_audio_panel ()
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_audio_delay = new wxSpinCtrl (_audio_panel);
 		s->Add (video_control (_audio_delay), 1);
-		/* TRANSLATORS: this is an abbreviation for milliseconds, the unit of time */
+		/// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
 		video_control (add_label_to_sizer (s, _audio_panel, _("ms")));
 		grid->Add (s);
 	}
@@ -342,9 +342,8 @@ FilmEditor::make_audio_panel ()
 
 	assert (MAX_AUDIO_CHANNELS == 6);
 
-	/* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
-	   enhancement channel (sub-woofer)./
-	*/
+	/// TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
+	/// enhancement channel (sub-woofer).
 	wxString const channels[] = {
 		_("Left"),
 		_("Right"),
@@ -617,9 +616,9 @@ FilmEditor::film_changed (Film::Property p)
 		break;
 	case Film::LENGTH:
 		if (_film->frames_per_second() > 0 && _film->length()) {
-			s << _film->length().get() << " frames; " << seconds_to_hms (_film->length().get() / _film->frames_per_second());
+			s << _film->length().get() << " " << _("frames") << "; " << seconds_to_hms (_film->length().get() / _film->frames_per_second());
 		} else if (_film->length()) {
-			s << _film->length().get() << " frames";
+			s << _film->length().get() << " " << _("frames");
 		} 
 		_length->SetLabel (std_to_wx (s.str ()));
 		if (_film->length()) {
@@ -754,7 +753,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	if (_film) {
 		FileChanged (_film->directory ());
 	} else {
-		FileChanged ("");
+		FileChanged (N_(""));
 	}
 	
 	film_changed (Film::NAME);
@@ -1132,11 +1131,11 @@ FilmEditor::setup_audio_details ()
 	} else {
 		stringstream s;
 		if (_film->audio_stream()->channels() == 1) {
-			s << "1 channel";
+			s << _("1 channel");
 		} else {
-			s << _film->audio_stream()->channels () << " channels";
+			s << _film->audio_stream()->channels () << " " << _("channels");
 		}
-		s << ", " << _film->audio_stream()->sample_rate() << "Hz";
+		s << ", " << _film->audio_stream()->sample_rate() << _("Hz");
 		_audio->SetLabel (std_to_wx (s.str ()));
 	}
 }
@@ -1169,7 +1168,7 @@ FilmEditor::setup_dcp_name ()
 {
 	string s = _film->dcp_name (true);
 	if (s.length() > 28) {
-		_dcp_name->SetLabel (std_to_wx (s.substr (0, 28) + "..."));
+		_dcp_name->SetLabel (std_to_wx (s.substr (0, 28) + N_("...")));
 		_dcp_name->SetToolTip (std_to_wx (s));
 	} else {
 		_dcp_name->SetLabel (std_to_wx (s));
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 96656ce09..3705f38bb 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -51,7 +51,7 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
 	: wxPanel (p)
 	, _panel (new wxPanel (this))
 	, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
-	, _play_button (new wxToggleButton (this, wxID_ANY, wxT ("Play")))
+	, _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
 	, _display_frame_x (0)
 	, _got_frame (false)
 	, _clear_required (false)
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index a57aaf5b9..e93d06dbe 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -54,7 +54,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 		_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().get())));
 		double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length().get() / (_film->frames_per_second () * 1073741824);
 		stringstream s;
-		s << fixed << setprecision (1) << disk << "Gb";
+		s << fixed << setprecision (1) << disk << _("Gb");
 		_disk->SetLabel (std_to_wx (s.str ()));
 	} else {
 		_frames->SetLabel (_("unknown"));
diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 1b5b71dc9..46e3f7127 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -27,7 +27,7 @@ ServerDialog::ServerDialog (wxWindow* parent, ServerDescription* server)
 	if (server) {
 		_server = server;
 	} else {
-		_server = new ServerDescription ("localhost", 1);
+		_server = new ServerDescription (N_("localhost"), 1);
 	}
 		
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, 4, 4);
diff --git a/wscript b/wscript
index edf01784b..16ef91f3b 100644
--- a/wscript
+++ b/wscript
@@ -21,7 +21,9 @@ def configure(conf):
     if conf.options.target_windows:
         conf.load('winres')
 
-    conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes', '-Wextra'])
+    conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing',
+                                       '-Wall', '-Wno-attributes', '-Wextra',
+                                       '-DLOCALE_DIR="%s/share/locale"' % conf.env.prefix])
 
     if conf.options.target_windows:
         conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
-- 
cgit v1.2.3


From 6a516da9a403ce05b2b78b3cf1376f4dfe4be3fe Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 1 Mar 2013 21:35:41 +0000
Subject: Make film hold its DCP frame rate.

---
 src/lib/ab_transcoder.cc     |   2 +-
 src/lib/analyse_audio_job.cc |   2 +-
 src/lib/dcp_video_frame.cc   |   4 +-
 src/lib/dcp_video_frame.h    |   4 +-
 src/lib/encoder.cc           |   8 +-
 src/lib/film.cc              |  45 +++++++----
 src/lib/film.h               |  19 +++--
 src/lib/transcode_job.cc     |   4 +-
 src/lib/transcoder.cc        |   2 +-
 src/lib/util.cc              |  37 +++++----
 src/lib/util.h               |  10 +--
 src/lib/writer.cc            |  15 ++--
 src/wx/film_editor.cc        |  16 ++--
 src/wx/film_editor.h         |   4 +-
 src/wx/film_viewer.cc        |   6 +-
 src/wx/properties_dialog.cc  |   4 +-
 test/metadata.ref            |   5 +-
 test/test.cc                 | 183 +++++++++++++++++++++++--------------------
 18 files changed, 210 insertions(+), 160 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index f47a99fda..4ed5d02ca 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -60,7 +60,7 @@ ABTranscoder::ABTranscoder (
 
 	if (_film_a->audio_stream()) {
 		shared_ptr<AudioStream> st = _film_a->audio_stream();
-		_matcher.reset (new Matcher (_film_a->log(), st->sample_rate(), _film_a->frames_per_second()));
+		_matcher.reset (new Matcher (_film_a->log(), st->sample_rate(), _film_a->source_frame_rate()));
 		_delay_line.reset (new DelayLine (_film_a->log(), st->channels(), _film_a->audio_delay() * st->sample_rate() / 1000));
 		_gain.reset (new Gain (_film_a->log(), _film_a->audio_gain()));
 	}
diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index ca316f70e..41f918f34 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -66,7 +66,7 @@ AnalyseAudioJob::run ()
 	decoders.audio->set_audio_stream (_film->audio_stream ());
 	decoders.audio->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
 
-	int64_t total_audio_frames = video_frames_to_audio_frames (_film->length().get(), _film->audio_stream()->sample_rate(), _film->frames_per_second());
+	int64_t total_audio_frames = video_frames_to_audio_frames (_film->length().get(), _film->audio_stream()->sample_rate(), _film->source_frame_rate());
 	_samples_per_point = total_audio_frames / _num_points;
 
 	_current.resize (_film->audio_stream()->channels ());
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 098d222cd..67617c63c 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -80,7 +80,7 @@ using libdcp::Size;
 DCPVideoFrame::DCPVideoFrame (
 	shared_ptr<const Image> yuv, shared_ptr<Subtitle> sub,
 	Size out, int p, int subtitle_offset, float subtitle_scale,
-	Scaler const * s, int f, float fps, string pp, int clut, int bw, Log* l
+	Scaler const * s, int f, int dcp_fps, string pp, int clut, int bw, Log* l
 	)
 	: _input (yuv)
 	, _subtitle (sub)
@@ -90,7 +90,7 @@ DCPVideoFrame::DCPVideoFrame (
 	, _subtitle_scale (subtitle_scale)
 	, _scaler (s)
 	, _frame (f)
-	, _frames_per_second (DCPFrameRate(fps).frames_per_second)
+	, _frames_per_second (dcp_fps)
 	, _post_process (pp)
 	, _colour_lut (clut)
 	, _j2k_bandwidth (bw)
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index ab458b58f..6794765ac 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -107,7 +107,7 @@ class DCPVideoFrame
 public:
 	DCPVideoFrame (
 		boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, libdcp::Size,
-		int, int, float, Scaler const *, int, float, std::string, int, int, Log *
+		int, int, float, Scaler const *, int, int, std::string, int, int, Log *
 		);
 	
 	virtual ~DCPVideoFrame ();
@@ -130,7 +130,7 @@ private:
 	float _subtitle_scale;
 	Scaler const * _scaler;          ///< scaler to use
 	int _frame;                      ///< frame index within the DCP's intrinsic duration
-	int _frames_per_second;          ///< Frames per second that we will use for the DCP (rounded)
+	int _frames_per_second;          ///< Frames per second that we will use for the DCP
 	std::string _post_process;       ///< FFmpeg post-processing string to use
 	int _colour_lut;                 ///< Colour look-up table to use
 	int _j2k_bandwidth;              ///< J2K bandwidth to use
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 3cc643cd6..687dfdd2b 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -233,9 +233,9 @@ Encoder::frame_done ()
 void
 Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub)
 {
-	DCPFrameRate dfr (_film->frames_per_second ());
+	FrameRateConversion frc (_film->source_frame_rate(), _film->dcp_frame_rate());
 	
-	if (dfr.skip && (_video_frames_in % 2)) {
+	if (frc.skip && (_video_frames_in % 2)) {
 		++_video_frames_in;
 		return;
 	}
@@ -273,7 +273,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 					  new DCPVideoFrame (
 						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
 						  _film->subtitle_offset(), _film->subtitle_scale(),
-						  _film->scaler(), _video_frames_out, _film->frames_per_second(), s.second,
+						  _film->scaler(), _video_frames_out, _film->dcp_frame_rate(), s.second,
 						  _film->colour_lut(), _film->j2k_bandwidth(),
 						  _film->log()
 						  )
@@ -286,7 +286,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	++_video_frames_in;
 	++_video_frames_out;
 
-	if (dfr.repeat) {
+	if (frc.repeat) {
 		_writer->repeat (_video_frames_out);
 		++_video_frames_out;
 		frame_done ();
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 510158e94..a661adcc6 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -74,7 +74,7 @@ using boost::starts_with;
 using boost::optional;
 using libdcp::Size;
 
-int const Film::state_version = 3;
+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
@@ -103,7 +103,8 @@ Film::Film (string d, bool must_exist)
 	, _colour_lut (0)
 	, _j2k_bandwidth (200000000)
 	, _dci_metadata (Config::instance()->default_dci_metadata ())
-	, _frames_per_second (0)
+	, _dcp_frame_rate (0)
+	, _source_frame_rate (0)
 	, _dirty (false)
 {
 	set_dci_date_today ();
@@ -175,6 +176,7 @@ Film::Film (Film const & o)
 	, _j2k_bandwidth     (o._j2k_bandwidth)
 	, _dci_metadata      (o._dci_metadata)
 	, _dci_date          (o._dci_date)
+	, _dcp_frame_rate    (o._dcp_frame_rate)
 	, _size              (o._size)
 	, _length            (o._length)
 	, _dcp_intrinsic_duration (o._dcp_intrinsic_duration)
@@ -182,7 +184,7 @@ Film::Film (Film const & o)
 	, _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)
+	, _source_frame_rate (o._source_frame_rate)
 	, _dirty             (o._dirty)
 {
 
@@ -204,6 +206,7 @@ Film::video_state_identifier () const
 	s << format()->id()
 	  << N_("_") << content_digest()
 	  << N_("_") << crop().left << N_("_") << crop().right << N_("_") << crop().top << N_("_") << crop().bottom
+	  << N_("_") << _dcp_frame_rate
 	  << N_("_") << f.first << N_("_") << f.second
 	  << N_("_") << scaler()->id()
 	  << N_("_") << j2k_bandwidth()
@@ -441,6 +444,7 @@ Film::write_metadata () const
 	f << N_("j2k_bandwidth ") << _j2k_bandwidth << N_("\n");
 	_dci_metadata.write (f);
 	f << N_("dci_date ") << boost::gregorian::to_iso_string (_dci_date) << N_("\n");
+	f << N_("dcp_frame_rate ") << _dcp_frame_rate << "\n";
 	f << N_("width ") << _size.width << N_("\n");
 	f << N_("height ") << _size.height << N_("\n");
 	f << N_("length ") << _length.get_value_or(0) << N_("\n");
@@ -457,7 +461,7 @@ Film::write_metadata () const
 		f << N_("subtitle_stream ") << (*i)->to_string () << N_("\n");
 	}
 
-	f << N_("frames_per_second ") << _frames_per_second << N_("\n");
+	f << N_("source_frame_rate ") << _source_frame_rate << N_("\n");
 	
 	_dirty = false;
 }
@@ -569,6 +573,8 @@ Film::read_metadata ()
 			_j2k_bandwidth = atoi (v.c_str ());
 		} else if (k == N_("dci_date")) {
 			_dci_date = boost::gregorian::from_undelimited_string (v);
+		} else if (k == "dcp_frame_rate") {
+			_dcp_frame_rate = atoi (v.c_str ());
 		}
 
 		_dci_metadata.read (k, v);
@@ -596,8 +602,8 @@ Film::read_metadata ()
 			_external_audio_stream = audio_stream_factory (v, version);
 		} else if (k == N_("subtitle_stream")) {
 			_subtitle_streams.push_back (subtitle_stream_factory (v, version));
-		} else if (k == N_("frames_per_second")) {
-			_frames_per_second = atof (v.c_str ());
+		} else if (k == N_("source_frame_rate") || (version < 4 && k == "frames_per_second")) {
+			_source_frame_rate = atof (v.c_str ());
 		}
 	}
 
@@ -707,7 +713,7 @@ Film::target_audio_sample_rate () const
 	/* Resample to a DCI-approved sample rate */
 	double t = dcp_audio_sample_rate (audio_stream()->sample_rate());
 
-	DCPFrameRate dfr (frames_per_second ());
+	FrameRateConversion frc (source_frame_rate(), dcp_frame_rate());
 
 	/* Compensate if the DCP is being run at a different frame rate
 	   to the source; that is, if the video is run such that it will
@@ -715,8 +721,8 @@ Film::target_audio_sample_rate () const
 	   skip/repeat doesn't come into effect here.
 	*/
 
-	if (dfr.change_speed) {
-		t *= _frames_per_second * dfr.factor() / dfr.frames_per_second;
+	if (frc.change_speed) {
+		t *= source_frame_rate() * frc.factor() / dcp_frame_rate();
 	}
 
 	return rint (t);
@@ -725,7 +731,7 @@ Film::target_audio_sample_rate () const
 int
 Film::still_duration_in_frames () const
 {
-	return still_duration() * frames_per_second();
+	return still_duration() * source_frame_rate();
 }
 
 /** @return a DCI-compliant name for a DCP of this film */
@@ -898,7 +904,7 @@ Film::set_content (string c)
 		Decoders d = decoder_factory (shared_from_this(), DecodeOptions());
 		
 		set_size (d.video->native_size ());
-		set_frames_per_second (d.video->frames_per_second ());
+		set_source_frame_rate (d.video->frames_per_second ());
 		set_subtitle_streams (d.video->subtitle_streams ());
 		if (d.audio) {
 			set_content_audio_streams (d.audio->audio_streams ());
@@ -1236,6 +1242,17 @@ Film::set_dci_metadata (DCIMetadata m)
 	signal_changed (DCI_METADATA);
 }
 
+
+void
+Film::set_dcp_frame_rate (int f)
+{
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_dcp_frame_rate = f;
+	}
+	signal_changed (DCP_FRAME_RATE);
+}
+
 void
 Film::set_size (libdcp::Size s)
 {
@@ -1307,13 +1324,13 @@ Film::set_subtitle_streams (vector<shared_ptr<SubtitleStream> > s)
 }
 
 void
-Film::set_frames_per_second (float f)
+Film::set_source_frame_rate (float f)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_frames_per_second = f;
+		_source_frame_rate = f;
 	}
-	signal_changed (FRAMES_PER_SECOND);
+	signal_changed (SOURCE_FRAME_RATE);
 }
 	
 void
diff --git a/src/lib/film.h b/src/lib/film.h
index 847ab434e..9921acbb4 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -148,7 +148,8 @@ public:
 		DCP_INTRINSIC_DURATION,
 		CONTENT_AUDIO_STREAMS,
 		SUBTITLE_STREAMS,
-		FRAMES_PER_SECOND,
+		SOURCE_FRAME_RATE,
+		DCP_FRAME_RATE
 	};
 
 
@@ -285,6 +286,11 @@ public:
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _dci_metadata;
 	}
+
+	int dcp_frame_rate () const {
+		boost::mutex::scoped_lock lm (_state_mutex);
+		return _dcp_frame_rate;
+	}
 	
 	libdcp::Size size () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
@@ -311,13 +317,13 @@ public:
 		return _subtitle_streams;
 	}
 	
-	float frames_per_second () const {
+	float source_frame_rate () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		if (content_type() == STILL) {
 			return 24;
 		}
 		
-		return _frames_per_second;
+		return _source_frame_rate;
 	}
 
 	boost::shared_ptr<AudioStream> audio_stream () const;
@@ -355,6 +361,7 @@ public:
 	void set_colour_lut (int);
 	void set_j2k_bandwidth (int);
 	void set_dci_metadata (DCIMetadata);
+	void set_dcp_frame_rate (int);
 	void set_size (libdcp::Size);
 	void set_length (SourceFrame);
 	void unset_length ();
@@ -362,7 +369,7 @@ public:
 	void set_content_digest (std::string);
 	void set_content_audio_streams (std::vector<boost::shared_ptr<AudioStream> >);
 	void set_subtitle_streams (std::vector<boost::shared_ptr<SubtitleStream> >);
-	void set_frames_per_second (float);
+	void set_source_frame_rate (float);
 
 	/** Emitted when some property has changed */
 	mutable boost::signals2::signal<void (Property)> Changed;
@@ -461,6 +468,8 @@ private:
 	DCIMetadata _dci_metadata;
 	/** The date that we should use in a DCI name */
 	boost::gregorian::date _dci_date;
+	/** Frames per second to run our DCP at */
+	int _dcp_frame_rate;
 
 	/* Data which are cached to speed things up */
 
@@ -478,7 +487,7 @@ private:
 	/** the subtitle streams that we can use */
 	std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
 	/** Frames per second of the source */
-	float _frames_per_second;
+	float _source_frame_rate;
 
 	/** true if our state has changed since we last saved it */
 	mutable bool _dirty;
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 61fad2e2b..f7cc500fe 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -120,8 +120,8 @@ TranscodeJob::remaining_time () const
 
 	/* Compute approximate proposed length here, as it's only here that we need it */
 	int length = _film->length().get();
-	DCPFrameRate const dfr (_film->frames_per_second ());
-	if (dfr.skip) {
+	FrameRateConversion const frc (_film->source_frame_rate(), _film->dcp_frame_rate());
+	if (frc.skip) {
 		length /= 2;
 	}
 	/* If we are repeating it shouldn't affect transcode time, so don't take it into account */
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 959fac857..9720ca56a 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -57,7 +57,7 @@ Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<
 
 	if (f->audio_stream()) {
 		shared_ptr<AudioStream> st = f->audio_stream();
-		_matcher.reset (new Matcher (f->log(), st->sample_rate(), f->frames_per_second()));
+		_matcher.reset (new Matcher (f->log(), st->sample_rate(), f->source_frame_rate()));
 		_delay_line.reset (new DelayLine (f->log(), st->channels(), f->audio_delay() * st->sample_rate() / 1000));
 		_gain.reset (new Gain (f->log(), f->audio_gain()));
 	}
diff --git a/src/lib/util.cc b/src/lib/util.cc
index de69636da..85a04ed17 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -375,21 +375,12 @@ public:
 		, dcp (dcp_)
 	{}
 
-	bool skip () const {
-		return !about_equal (source, dcp) && source > dcp;
-	}
-
-	bool repeat () const {
-		return !about_equal (source, dcp) && source < dcp;
-	}
-
 	float source;
 	int dcp;
 };
 
-/** @param fps Arbitrary source frames-per-second value */
-/** XXX: this could be slow-ish */
-DCPFrameRate::DCPFrameRate (float source_fps)
+int
+best_dcp_frame_rate (float source_fps)
 {
 	list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
 
@@ -427,14 +418,8 @@ DCPFrameRate::DCPFrameRate (float source_fps)
 		++i;
 	}
 
-	if (!best) {
-		throw EncodeError (_("cannot find a suitable DCP frame rate for this source"));
-	}
-
-	frames_per_second = best->dcp;
-	skip = best->skip ();
-	repeat = best->repeat ();
-	change_speed = !about_equal (source_fps * factor(), frames_per_second);
+	assert (best);
+	return best->dcp;
 }
 
 /** @param An arbitrary sampling rate.
@@ -962,3 +947,17 @@ AudioMapping::dcp_channels () const
 
 	return _source_channels;
 }
+
+FrameRateConversion::FrameRateConversion (float source, int dcp)
+	: skip (false)
+	, repeat (false)
+	, change_speed (false)
+{
+	if (fabs (source / 2.0 - dcp) < (fabs (source - dcp))) {
+		skip = true;
+	} else if (fabs (source * 2 - dcp) < fabs (source - dcp)) {
+		repeat = true;
+	}
+
+	change_speed = !about_equal (source * factor(), dcp);
+}
diff --git a/src/lib/util.h b/src/lib/util.h
index 22c6ea95b..103907151 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -62,9 +62,9 @@ extern std::string audio_channel_name (int);
 
 typedef int SourceFrame;
 
-struct DCPFrameRate
+struct FrameRateConversion
 {
-	DCPFrameRate (float);
+	FrameRateConversion (float, int);
 
 	/** @return factor by which to multiply a source frame rate
 	    to get the effective rate after any skip or repeat has happened.
@@ -79,14 +79,12 @@ struct DCPFrameRate
 		return 1;
 	}
 	
-	/** frames per second for the DCP */
-	int frames_per_second;
 	/** true to skip every other frame */
 	bool skip;
 	/** true to repeat every frame once */
 	bool repeat;
 	/** true if this DCP will run its video faster or slower than the source
-	 *  without taking into account `repeat'.
+	 *  without taking into account `repeat' nor `skip'.
 	 *  (e.g. change_speed will be true if
 	 *          source is 29.97fps, DCP is 30fps
 	 *          source is 14.50fps, DCP is 30fps
@@ -97,6 +95,8 @@ struct DCPFrameRate
 	bool change_speed;
 };
 
+int best_dcp_frame_rate (float);
+
 enum ContentType {
 	STILL, ///< content is still images
 	VIDEO  ///< content is a video
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 334ecec65..5a2f7c9a9 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -67,8 +67,8 @@ Writer::Writer (shared_ptr<Film> f)
 		new libdcp::MonoPictureAsset (
 			_film->video_mxf_dir (),
 			_film->video_mxf_filename (),
-			DCPFrameRate (_film->frames_per_second()).frames_per_second,
-			_film->format()->dcp_size()
+			_film->dcp_frame_rate (),
+			_film->format()->dcp_size ()
 			)
 		);
 
@@ -81,7 +81,7 @@ Writer::Writer (shared_ptr<Film> f)
 			new libdcp::SoundAsset (
 				_film->dir (_film->dcp_name()),
 				N_("audio.mxf"),
-				DCPFrameRate (_film->frames_per_second()).frames_per_second,
+				_film->dcp_frame_rate (),
 				m.dcp_channels (),
 				dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
 				)
@@ -289,10 +289,15 @@ Writer::finish ()
 	}
 	
 	libdcp::DCP dcp (_film->dir (_film->dcp_name()));
-	DCPFrameRate dfr (_film->frames_per_second ());
 
 	shared_ptr<libdcp::CPL> cpl (
-		new libdcp::CPL (_film->dir (_film->dcp_name()), _film->dcp_name(), _film->dcp_content_type()->libdcp_kind (), frames, dfr.frames_per_second)
+		new libdcp::CPL (
+			_film->dir (_film->dcp_name()),
+			_film->dcp_name(),
+			_film->dcp_content_type()->libdcp_kind (),
+			frames,
+			_film->dcp_frame_rate ()
+			)
 		);
 	
 	dcp.add_cpl (cpl);
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 362243ef3..0a6a35273 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -127,8 +127,8 @@ FilmEditor::make_film_panel ()
 	grid->Add (_dcp_content_type);
 
 	video_control (add_label_to_sizer (grid, _film_panel, _("Original Frame Rate")));
-	_frames_per_second = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
-	grid->Add (video_control (_frames_per_second), 1, wxALIGN_CENTER_VERTICAL);
+	_source_frame_rate = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
+	grid->Add (video_control (_source_frame_rate), 1, wxALIGN_CENTER_VERTICAL);
 	
 	video_control (add_label_to_sizer (grid, _film_panel, _("Original Size")));
 	_original_size = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
@@ -596,9 +596,9 @@ FilmEditor::film_changed (Film::Property p)
 		checked_set (_name, _film->name());
 		setup_dcp_name ();
 		break;
-	case Film::FRAMES_PER_SECOND:
-		s << fixed << setprecision(2) << _film->frames_per_second();
-		_frames_per_second->SetLabel (std_to_wx (s.str ()));
+	case Film::SOURCE_FRAME_RATE:
+		s << fixed << setprecision(2) << _film->source_frame_rate();
+		_source_frame_rate->SetLabel (std_to_wx (s.str ()));
 		break;
 	case Film::SIZE:
 		if (_film->size().width == 0 && _film->size().height == 0) {
@@ -609,8 +609,8 @@ FilmEditor::film_changed (Film::Property p)
 		}
 		break;
 	case Film::LENGTH:
-		if (_film->frames_per_second() > 0 && _film->length()) {
-			s << _film->length().get() << " " << _("frames") << "; " << seconds_to_hms (_film->length().get() / _film->frames_per_second());
+		if (_film->source_frame_rate() > 0 && _film->length()) {
+			s << _film->length().get() << " " << _("frames") << "; " << seconds_to_hms (_film->length().get() / _film->source_frame_rate());
 		} else if (_film->length()) {
 			s << _film->length().get() << " " << _("frames");
 		} 
@@ -782,7 +782,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::LENGTH);
 	film_changed (Film::CONTENT_AUDIO_STREAMS);
 	film_changed (Film::SUBTITLE_STREAMS);
-	film_changed (Film::FRAMES_PER_SECOND);
+	film_changed (Film::SOURCE_FRAME_RATE);
 }
 
 /** Updates the sensitivity of lots of widgets to a given value.
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 2af747bb0..da9bb0301 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -157,8 +157,8 @@ private:
 	wxSpinCtrl* _j2k_bandwidth;
 	/** The Film's DCP content type */
 	wxChoice* _dcp_content_type;
-	/** The Film's frames per second */
-	wxStaticText* _frames_per_second;
+	/** The Film's source frame rate */
+	wxStaticText* _source_frame_rate;
 	/** The Film's original size */
 	wxStaticText* _original_size;
 	/** The Film's length */
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 5eba7fd80..a40a3c78d 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -188,7 +188,7 @@ FilmViewer::timer (wxTimerEvent &)
 	get_frame ();
 
 	if (_film->length()) {
-		int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->frames_per_second());
+		int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->source_frame_rate());
 		if (new_slider_position != _slider->GetValue()) {
 			_slider->SetValue (new_slider_position);
 		}
@@ -237,7 +237,7 @@ FilmViewer::slider_moved (wxScrollEvent &)
 		return;
 	}
 	
-	if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->frames_per_second()))) {
+	if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->source_frame_rate()))) {
 		return;
 	}
 	
@@ -369,7 +369,7 @@ FilmViewer::check_play_state ()
 	}
 	
 	if (_play_button->GetValue()) {
-		_timer.Start (1000 / _film->frames_per_second());
+		_timer.Start (1000 / _film->source_frame_rate());
 	} else {
 		_timer.Stop ();
 	}
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index e93d06dbe..f4acb6b1a 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -52,7 +52,9 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 
 	if (_film->length()) {
 		_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().get())));
-		double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length().get() / (_film->frames_per_second () * 1073741824);
+		FrameRateConversion frc (_film->source_frame_rate(), _film->dcp_frame_rate());
+		int const dcp_length = _film->length().get() * frc.factor();
+		double const disk = ((double) _film->j2k_bandwidth() / 8) * dcp_length / (_film->dcp_frame_rate() * 1073741824);
 		stringstream s;
 		s << fixed << setprecision (1) << disk << _("Gb");
 		_disk->SetLabel (std_to_wx (s.str ()));
diff --git a/test/metadata.ref b/test/metadata.ref
index ab40dfe8d..10702f8a0 100644
--- a/test/metadata.ref
+++ b/test/metadata.ref
@@ -1,4 +1,4 @@
-version 3
+version 4
 name fred
 use_dci_name 1
 content 
@@ -32,10 +32,11 @@ studio
 facility 
 package_type 
 dci_date 20130211
+dcp_frame_rate 0
 width 0
 height 0
 length 0
 dcp_intrinsic_duration 0
 content_digest 
 external_audio_stream external 0 0
-frames_per_second 0
+source_frame_rate 0
diff --git a/test/test.cc b/test/test.cc
index 8cfc6e467..b4a459fe7 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -500,8 +500,8 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
 	BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
 }
 
-/* Test the constructor of DCPFrameRate */
-BOOST_AUTO_TEST_CASE (dcp_frame_rate_test)
+/* Test best_dcp_frame_rate and FrameRateConversion */
+BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test)
 {
 	/* Run some tests with a limited range of allowed rates */
 	
@@ -511,71 +511,82 @@ BOOST_AUTO_TEST_CASE (dcp_frame_rate_test)
 	afr.push_back (30);
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-	DCPFrameRate dfr = DCPFrameRate (60);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 30);
-	BOOST_CHECK_EQUAL (dfr.skip, true);
-	BOOST_CHECK_EQUAL (dfr.repeat, false);
-	BOOST_CHECK_EQUAL (dfr.change_speed, false);
+	int best = best_dcp_frame_rate (60);
+	FrameRateConversion frc = FrameRateConversion (60, best);
+	BOOST_CHECK_EQUAL (best, 30);
+	BOOST_CHECK_EQUAL (frc.skip, true);
+	BOOST_CHECK_EQUAL (frc.repeat, false);
+	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	
-	dfr = DCPFrameRate (50);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 25);
-	BOOST_CHECK_EQUAL (dfr.skip, true);
-	BOOST_CHECK_EQUAL (dfr.repeat, false);
-	BOOST_CHECK_EQUAL (dfr.change_speed, false);
-
-	dfr = DCPFrameRate (48);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 24);
-	BOOST_CHECK_EQUAL (dfr.skip, true);
-	BOOST_CHECK_EQUAL (dfr.repeat, false);
-	BOOST_CHECK_EQUAL (dfr.change_speed, false);
+	best = best_dcp_frame_rate (50);
+	frc = FrameRateConversion (50, best);
+	BOOST_CHECK_EQUAL (best, 25);
+	BOOST_CHECK_EQUAL (frc.skip, true);
+	BOOST_CHECK_EQUAL (frc.repeat, false);
+	BOOST_CHECK_EQUAL (frc.change_speed, false);
+
+	best = best_dcp_frame_rate (48);
+	frc = FrameRateConversion (48, best);
+	BOOST_CHECK_EQUAL (best, 24);
+	BOOST_CHECK_EQUAL (frc.skip, true);
+	BOOST_CHECK_EQUAL (frc.repeat, false);
+	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	
-	dfr = DCPFrameRate (30);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 30);
-	BOOST_CHECK_EQUAL (dfr.repeat, false);
-	BOOST_CHECK_EQUAL (dfr.change_speed, false);
-
-	dfr = DCPFrameRate (29.97);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 30);
-	BOOST_CHECK_EQUAL (dfr.repeat, false);
-	BOOST_CHECK_EQUAL (dfr.change_speed, true);
+	best = best_dcp_frame_rate (30);
+	frc = FrameRateConversion (30, best);
+	BOOST_CHECK_EQUAL (best, 30);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, false);
+	BOOST_CHECK_EQUAL (frc.change_speed, false);
+
+	best = best_dcp_frame_rate (29.97);
+	frc = FrameRateConversion (29.97, best);
+	BOOST_CHECK_EQUAL (best, 30);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, false);
+	BOOST_CHECK_EQUAL (frc.change_speed, true);
 	
-	dfr = DCPFrameRate (25);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 25);
-	BOOST_CHECK_EQUAL (dfr.repeat, false);
-	BOOST_CHECK_EQUAL (dfr.change_speed, false);
-
-	dfr = DCPFrameRate (24);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 24);
-	BOOST_CHECK_EQUAL (dfr.repeat, false);
-	BOOST_CHECK_EQUAL (dfr.change_speed, false);
-
-	dfr = DCPFrameRate (14.5);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 30);
-	BOOST_CHECK_EQUAL (dfr.repeat, true);
-	BOOST_CHECK_EQUAL (dfr.change_speed, true);
-
-	dfr = DCPFrameRate (12.6);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 25);
-	BOOST_CHECK_EQUAL (dfr.repeat, true);
-	BOOST_CHECK_EQUAL (dfr.change_speed, true);
-
-	dfr = DCPFrameRate (12.4);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 25);
-	BOOST_CHECK_EQUAL (dfr.repeat, true);
-	BOOST_CHECK_EQUAL (dfr.change_speed, true);
-
-	dfr = DCPFrameRate (12);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 24);
-	BOOST_CHECK_EQUAL (dfr.repeat, true);
-	BOOST_CHECK_EQUAL (dfr.change_speed, false);
+	best = best_dcp_frame_rate (25);
+	frc = FrameRateConversion (25, best);
+	BOOST_CHECK_EQUAL (best, 25);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, false);
+	BOOST_CHECK_EQUAL (frc.change_speed, false);
+
+	best = best_dcp_frame_rate (24);
+	frc = FrameRateConversion (24, best);
+	BOOST_CHECK_EQUAL (best, 24);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, false);
+	BOOST_CHECK_EQUAL (frc.change_speed, false);
+
+	best = best_dcp_frame_rate (14.5);
+	frc = FrameRateConversion (14.5, best);
+	BOOST_CHECK_EQUAL (best, 30);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, true);
+	BOOST_CHECK_EQUAL (frc.change_speed, true);
+
+	best = best_dcp_frame_rate (12.6);
+	frc = FrameRateConversion (12.6, best);
+	BOOST_CHECK_EQUAL (best, 25);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, true);
+	BOOST_CHECK_EQUAL (frc.change_speed, true);
+
+	best = best_dcp_frame_rate (12.4);
+	frc = FrameRateConversion (12.4, best);
+	BOOST_CHECK_EQUAL (best, 25);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, true);
+	BOOST_CHECK_EQUAL (frc.change_speed, true);
+
+	best = best_dcp_frame_rate (12);
+	frc = FrameRateConversion (12, best);
+	BOOST_CHECK_EQUAL (best, 24);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, true);
+	BOOST_CHECK_EQUAL (frc.change_speed, false);
 
 	/* Now add some more rates and see if it will use them
 	   in preference to skip/repeat.
@@ -586,29 +597,33 @@ BOOST_AUTO_TEST_CASE (dcp_frame_rate_test)
 	afr.push_back (60);
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
-	dfr = DCPFrameRate (60);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 60);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.repeat, false);
-	BOOST_CHECK_EQUAL (dfr.change_speed, false);
+	best = best_dcp_frame_rate (60);
+	frc = FrameRateConversion (60, best);
+	BOOST_CHECK_EQUAL (best, 60);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, false);
+	BOOST_CHECK_EQUAL (frc.change_speed, false);
 	
-	dfr = DCPFrameRate (50);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 50);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.repeat, false);
-	BOOST_CHECK_EQUAL (dfr.change_speed, false);
-
-	dfr = DCPFrameRate (48);
-	BOOST_CHECK_EQUAL (dfr.frames_per_second, 48);
-	BOOST_CHECK_EQUAL (dfr.skip, false);
-	BOOST_CHECK_EQUAL (dfr.repeat, false);
-	BOOST_CHECK_EQUAL (dfr.change_speed, false);
+	best = best_dcp_frame_rate (50);
+	frc = FrameRateConversion (50, best);
+	BOOST_CHECK_EQUAL (best, 50);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, false);
+	BOOST_CHECK_EQUAL (frc.change_speed, false);
+
+	best = best_dcp_frame_rate (48);
+	frc = FrameRateConversion (48, best);
+	BOOST_CHECK_EQUAL (best, 48);
+	BOOST_CHECK_EQUAL (frc.skip, false);
+	BOOST_CHECK_EQUAL (frc.repeat, false);
+	BOOST_CHECK_EQUAL (frc.change_speed, false);
 }
 
 BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 {
 	shared_ptr<Film> f = new_test_film ("audio_sampling_rate_test");
-	f->set_frames_per_second (24);
+	f->set_source_frame_rate (24);
+	f->set_dcp_frame_rate (24);
 
 	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
@@ -619,11 +634,13 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 80000, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000);
 
-	f->set_frames_per_second (23.976);
+	f->set_source_frame_rate (23.976);
+	f->set_dcp_frame_rate (best_dcp_frame_rate (23.976));
 	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
 
-	f->set_frames_per_second (29.97);
+	f->set_source_frame_rate (29.97);
+	f->set_dcp_frame_rate (best_dcp_frame_rate (29.97));
 	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
 }
-- 
cgit v1.2.3


From bd79dcbba3a58eae1ff366bb0c3b95791dc6010a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 24 Mar 2013 21:44:25 +0000
Subject: Un-mark some strings that do not need translation.

---
 src/lib/encoder.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 687dfdd2b..7b338407e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -244,9 +244,9 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 
 	/* Wait until the queue has gone down a bit */
 	while (_queue.size() >= _threads.size() * 2 && !_terminate) {
-		TIMING (_("decoder sleeps with queue of %1"), _queue.size());
+		TIMING ("decoder sleeps with queue of %1", _queue.size());
 		_condition.wait (lock);
-		TIMING (_("decoder wakes with queue of %1"), _queue.size());
+		TIMING ("decoder wakes with queue of %1", _queue.size());
 	}
 
 	if (_terminate) {
@@ -268,7 +268,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 	} else {
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
-		TIMING (_("adding to queue of %1"), _queue.size ());
+		TIMING ("adding to queue of %1", _queue.size ());
 		_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
 						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
@@ -349,7 +349,7 @@ Encoder::encoder_thread (ServerDescription* server)
 	
 	while (1) {
 
-		TIMING (N_("encoder thread %1 sleeps"), boost::this_thread::get_id());
+		TIMING ("encoder thread %1 sleeps", boost::this_thread::get_id());
 		boost::mutex::scoped_lock lock (_mutex);
 		while (_queue.empty () && !_terminate) {
 			_condition.wait (lock);
@@ -359,7 +359,7 @@ Encoder::encoder_thread (ServerDescription* server)
 			return;
 		}
 
-		TIMING (N_("encoder thread %1 wakes with queue of %2"), boost::this_thread::get_id(), _queue.size());
+		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
 		boost::shared_ptr<DCPVideoFrame> vf = _queue.front ();
 		_film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 from queue"), boost::this_thread::get_id(), vf->frame()), Log::VERBOSE);
 		_queue.pop_front ();
@@ -393,9 +393,9 @@ Encoder::encoder_thread (ServerDescription* server)
 				
 		} else {
 			try {
-				TIMING (N_("encoder thread %1 begins local encode of %2"), boost::this_thread::get_id(), vf->frame());
+				TIMING ("encoder thread %1 begins local encode of %2", boost::this_thread::get_id(), vf->frame());
 				encoded = vf->encode_locally ();
-				TIMING (N_("encoder thread %1 finishes local encode of %2"), boost::this_thread::get_id(), vf->frame());
+				TIMING ("encoder thread %1 finishes local encode of %2", boost::this_thread::get_id(), vf->frame());
 			} catch (std::exception& e) {
 				_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
 			}
-- 
cgit v1.2.3


From 127672223cca569986e35c91265e269ed5a6561c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 31 Mar 2013 15:09:49 +0100
Subject: Runs.

---
 doc/design/content.tex         |   6 +-
 src/lib/ab_transcode_job.cc    |   2 +-
 src/lib/ab_transcode_job.h     |   3 +-
 src/lib/ab_transcoder.cc       |  48 ++--
 src/lib/ab_transcoder.h        |  13 +-
 src/lib/analyse_audio_job.cc   |  30 +--
 src/lib/audio_content.cc       |   7 +
 src/lib/audio_content.h        |  13 +-
 src/lib/audio_decoder.cc       |   9 +-
 src/lib/audio_decoder.h        |  23 +-
 src/lib/content.cc             |  20 ++
 src/lib/content.h              |  19 +-
 src/lib/decoder.cc             |  15 +-
 src/lib/decoder.h              |   8 +-
 src/lib/decoder_factory.cc     |  19 +-
 src/lib/encoder.cc             |  32 +--
 src/lib/encoder.h              |   4 +-
 src/lib/examine_content_job.cc |  67 +-----
 src/lib/examine_content_job.h  |  17 +-
 src/lib/exceptions.h           |   1 +
 src/lib/ffmpeg_content.cc      | 156 +++++++++++++
 src/lib/ffmpeg_content.h       |  93 +++++++-
 src/lib/ffmpeg_decoder.cc      | 143 +++---------
 src/lib/ffmpeg_decoder.h       |  51 ++--
 src/lib/film.cc                | 462 +++++++-----------------------------
 src/lib/film.h                 |  31 ++-
 src/lib/filter_graph.cc        |   2 +-
 src/lib/filter_graph.h         |   2 +-
 src/lib/format.cc              |  19 +-
 src/lib/format.h               |  16 +-
 src/lib/imagemagick_content.cc |   2 +
 src/lib/imagemagick_content.h  |   3 +-
 src/lib/imagemagick_decoder.cc |  65 ++----
 src/lib/imagemagick_decoder.h  |  14 +-
 src/lib/job.cc                 |   2 -
 src/lib/job.h                  |   3 +-
 src/lib/playlist.cc            | 266 +++++++++++++++++++++
 src/lib/playlist.h             |  56 ++++-
 src/lib/scp_dcp_job.h          |   2 +-
 src/lib/sndfile_content.cc     |  41 ++++
 src/lib/sndfile_content.h      |   6 +
 src/lib/sndfile_decoder.cc     | 142 ++----------
 src/lib/sndfile_decoder.h      |  28 +--
 src/lib/stream.cc              |  92 --------
 src/lib/stream.h               | 121 ----------
 src/lib/transcode_job.cc       |  19 +-
 src/lib/transcode_job.h        |   1 -
 src/lib/transcoder.cc          |  51 ++--
 src/lib/transcoder.h           |  16 +-
 src/lib/util.cc                |   6 +-
 src/lib/util.h                 |   4 +-
 src/lib/video_content.cc       |  28 +++
 src/lib/video_content.h        |  39 ++++
 src/lib/video_decoder.cc       |  16 +-
 src/lib/video_decoder.h        |  24 +-
 src/lib/writer.cc              |   8 +-
 src/lib/writer.h               |   4 +-
 src/lib/wscript                |   8 +-
 src/tools/dvdomatic.cc         |   3 -
 src/tools/makedcp.cc           |   2 +-
 src/wx/audio_dialog.cc         |  19 +-
 src/wx/audio_dialog.h          |   2 +
 src/wx/film_editor.cc          | 514 +++++++++++++++--------------------------
 src/wx/film_editor.h           |  51 ++--
 src/wx/film_viewer.cc          |  40 ++--
 src/wx/properties_dialog.cc    |  10 +-
 test/test.cc                   |  84 ++-----
 67 files changed, 1361 insertions(+), 1762 deletions(-)
 create mode 100644 src/lib/audio_content.cc
 create mode 100644 src/lib/content.cc
 create mode 100644 src/lib/ffmpeg_content.cc
 create mode 100644 src/lib/imagemagick_content.cc
 create mode 100644 src/lib/playlist.cc
 create mode 100644 src/lib/sndfile_content.cc
 delete mode 100644 src/lib/stream.cc
 delete mode 100644 src/lib/stream.h
 create mode 100644 src/lib/video_content.cc

(limited to 'src/lib/encoder.cc')

diff --git a/doc/design/content.tex b/doc/design/content.tex
index a3c5c5835..0f5f17025 100644
--- a/doc/design/content.tex
+++ b/doc/design/content.tex
@@ -174,7 +174,7 @@ public:
 \end{verbatim}
 
 Then Film has a \texttt{Playlist} which has a
-\texttt{vector<shared\_ptr<Content>}.  And it can answer questions
+\texttt{vector<shared\_ptr<Content> >}.  It can answer questions
 about audio/video length, frame rate, audio channels and so on.
 
 \texttt{Playlist} can also be a source of video and audio, so clients can do:
@@ -188,6 +188,8 @@ while (!p->pass ()) {
 }
 \end{verbatim}
 
-Playlist could be created on-demand for all the difference it would make.
+Playlist could be created on-demand for all the difference it would
+make.  And perhaps it should, since it will hold Decoders which are
+probably run-once.
 
 \end{document}
diff --git a/src/lib/ab_transcode_job.cc b/src/lib/ab_transcode_job.cc
index 4ffdd9af6..f17d43916 100644
--- a/src/lib/ab_transcode_job.cc
+++ b/src/lib/ab_transcode_job.cc
@@ -54,7 +54,7 @@ ABTranscodeJob::run ()
 {
 	try {
 		/* _film_b is the one with reference filters */
-		ABTranscoder w (_film_b, _film, _decode_opt, this, shared_ptr<Encoder> (new Encoder (_film)));
+		ABTranscoder w (_film_b, _film, _decode_opt, shared_from_this ());
 		w.go ();
 		set_progress (1);
 		set_state (FINISHED_OK);
diff --git a/src/lib/ab_transcode_job.h b/src/lib/ab_transcode_job.h
index 8e3cbe2d8..5d029a18b 100644
--- a/src/lib/ab_transcode_job.h
+++ b/src/lib/ab_transcode_job.h
@@ -46,8 +46,7 @@ public:
 	void run ();
 
 private:
-	DecodeOptions _decode_opt;
-	
 	/** Copy of our Film using the reference filters and scaler */
 	boost::shared_ptr<Film> _film_b;
+	DecodeOptions _decode_opt;
 };
diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 3a1cd83d7..0c687008d 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -21,13 +21,11 @@
 #include <boost/shared_ptr.hpp>
 #include "ab_transcoder.h"
 #include "film.h"
-#include "video_decoder.h"
-#include "audio_decoder.h"
 #include "encoder.h"
 #include "job.h"
 #include "options.h"
 #include "image.h"
-#include "decoder_factory.h"
+#include "playlist.h"
 #include "matcher.h"
 #include "delay_line.h"
 #include "gain.h"
@@ -49,31 +47,23 @@ using boost::dynamic_pointer_cast;
  *  @param e Encoder to use.
  */
 
-ABTranscoder::ABTranscoder (
-	shared_ptr<Film> a, shared_ptr<Film> b, DecodeOptions o, Job* j, shared_ptr<Encoder> e)
+ABTranscoder::ABTranscoder (shared_ptr<Film> a, shared_ptr<Film> b, DecodeOptions o, shared_ptr<Job> j)
 	: _film_a (a)
 	, _film_b (b)
+	, _playlist_a (_film_a->playlist ())
+	, _playlist_b (_film_b->playlist ())
 	, _job (j)
-	, _encoder (e)
+	, _encoder (new Encoder (_film_a, _playlist_a))
 	, _combiner (new Combiner (a->log()))
 {
-	_da = decoder_factory (_film_a, o);
-	_db = decoder_factory (_film_b, o);
-
-	if (_film_a->audio_stream()) {
-		shared_ptr<AudioStream> st = _film_a->audio_stream();
-		_matcher.reset (new Matcher (_film_a->log(), st->sample_rate(), _film_a->source_frame_rate()));
-		_delay_line.reset (new DelayLine (_film_a->log(), st->channels(), _film_a->audio_delay() * st->sample_rate() / 1000));
+	if (_playlist_a->has_audio ()) {
+		_matcher.reset (new Matcher (_film_a->log(), _playlist_a->audio_frame_rate(), _playlist_a->video_frame_rate()));
+		_delay_line.reset (new DelayLine (_film_a->log(), _playlist_a->audio_channels(), _film_a->audio_delay() * _playlist_a->audio_frame_rate() / 1000));
 		_gain.reset (new Gain (_film_a->log(), _film_a->audio_gain()));
 	}
 
-	/* Set up the decoder to use the film's set streams */
-	_da.video->set_subtitle_stream (_film_a->subtitle_stream ());
-	_db.video->set_subtitle_stream (_film_a->subtitle_stream ());
-	_da.audio->set_audio_stream (_film_a->audio_stream ());
-
-	_da.video->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
-	_db.video->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3));
+	_playlist_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
+	_playlist_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3));
 
 	if (_matcher) {
 		_combiner->connect_video (_matcher);
@@ -83,7 +73,7 @@ ABTranscoder::ABTranscoder (
 	}
 	
 	if (_matcher && _delay_line) {
-		_da.audio->connect_audio (_delay_line);
+		_playlist_a->connect_audio (_delay_line);
 		_delay_line->connect_audio (_matcher);
 		_matcher->connect_audio (_gain);
 		_gain->connect_audio (_encoder);
@@ -95,23 +85,17 @@ ABTranscoder::go ()
 {
 	_encoder->process_begin ();
 
-	bool done[3] = { false, false, false };
+	bool done[2] = { false, false };
 	
 	while (1) {
-		done[0] = _da.video->pass ();
-		done[1] = _db.video->pass ();
-		
-		if (!done[2] && _da.audio && dynamic_pointer_cast<Decoder> (_da.audio) != dynamic_pointer_cast<Decoder> (_da.video)) {
-			done[2] = _da.audio->pass ();
-		} else {
-			done[2] = true;
-		}
+		done[0] = _playlist_a->pass ();
+		done[1] = _playlist_b->pass ();
 
 		if (_job) {
-			_da.video->set_progress (_job);
+			_playlist_a->set_progress (_job);
 		}
 
-		if (done[0] && done[1] && done[2]) {
+		if (done[0] && done[1]) {
 			break;
 		}
 	}
diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
index 58a08af04..14277c562 100644
--- a/src/lib/ab_transcoder.h
+++ b/src/lib/ab_transcoder.h
@@ -29,16 +29,14 @@
 
 class Job;
 class Encoder;
-class VideoDecoder;
-class AudioDecoder;
 class Image;
 class Log;
-class Subtitle;
 class Film;
 class Matcher;
 class DelayLine;
 class Gain;
 class Combiner;
+class Playlist;
 
 /** @class ABTranscoder
  *  @brief A transcoder which uses one Film for the left half of the screen, and a different one
@@ -51,8 +49,7 @@ public:
 		boost::shared_ptr<Film> a,
 		boost::shared_ptr<Film> b,
 		DecodeOptions o,
-		Job* j,
-		boost::shared_ptr<Encoder> e
+		boost::shared_ptr<Job> j
 		);
 	
 	void go ();
@@ -60,10 +57,10 @@ public:
 private:
 	boost::shared_ptr<Film> _film_a;
 	boost::shared_ptr<Film> _film_b;
-	Job* _job;
+	boost::shared_ptr<Playlist> _playlist_a;
+	boost::shared_ptr<Playlist> _playlist_b;
+	boost::shared_ptr<Job> _job;
 	boost::shared_ptr<Encoder> _encoder;
-	Decoders _da;
-	Decoders _db;
 	boost::shared_ptr<Combiner> _combiner;
 	boost::shared_ptr<Matcher> _matcher;
 	boost::shared_ptr<DelayLine> _delay_line;
diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 43eecbcbd..74491943b 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -22,8 +22,7 @@
 #include "compose.hpp"
 #include "film.h"
 #include "options.h"
-#include "decoder_factory.h"
-#include "audio_decoder.h"
+#include "playlist.h"
 
 #include "i18n.h"
 
@@ -52,29 +51,18 @@ AnalyseAudioJob::name () const
 void
 AnalyseAudioJob::run ()
 {
-	if (!_film->audio_stream () || !_film->length()) {
-		set_progress (1);
-		set_state (FINISHED_ERROR);
-		return;
-	}
-		
-	DecodeOptions options;
-	options.decode_video = false;
-
-	Decoders decoders = decoder_factory (_film, options);
-	assert (decoders.audio);
+	shared_ptr<Playlist> playlist = _film->playlist ();
+	playlist->disable_video ();
 	
-	decoders.audio->set_audio_stream (_film->audio_stream ());
-	decoders.audio->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
+	playlist->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
 
-	int64_t total_audio_frames = video_frames_to_audio_frames (_film->length().get(), _film->audio_stream()->sample_rate(), _film->source_frame_rate());
-	_samples_per_point = max (int64_t (1), total_audio_frames / _num_points);
+	_samples_per_point = max (int64_t (1), playlist->audio_length() / _num_points);
 
-	_current.resize (_film->audio_stream()->channels ());
-	_analysis.reset (new AudioAnalysis (_film->audio_stream()->channels()));
+	_current.resize (playlist->audio_channels ());
+	_analysis.reset (new AudioAnalysis (playlist->audio_channels()));
 			 
-	while (!decoders.audio->pass()) {
-		set_progress (float (_done) / total_audio_frames);
+	while (!playlist->pass()) {
+		set_progress (float (_done) / playlist->audio_length ());
 	}
 
 	_analysis->write (_film->audio_analysis_path ());
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
new file mode 100644
index 000000000..e9eacfd79
--- /dev/null
+++ b/src/lib/audio_content.cc
@@ -0,0 +1,7 @@
+#include "audio_content.h"
+
+AudioContent::AudioContent (boost::filesystem::path f)
+	: Content (f)
+{
+
+}
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 95fd681a7..e18d1082e 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,8 +1,19 @@
+#ifndef DVDOMATIC_AUDIO_CONTENT_H
+#define DVDOMATIC_AUDIO_CONTENT_H
+
 #include "content.h"
+#include "util.h"
 
 class AudioContent : public virtual Content
 {
 public:
-	
+	AudioContent (boost::filesystem::path);
 
+        virtual int audio_channels () const = 0;
+        virtual ContentAudioFrame audio_length () const = 0;
+        virtual int audio_frame_rate () const = 0;
+        virtual int64_t audio_channel_layout () const = 0;
+	
 };
+
+#endif
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index a54c14843..a72cf11bb 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -18,19 +18,12 @@
 */
 
 #include "audio_decoder.h"
-#include "stream.h"
 
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<Film> f, DecodeOptions o)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<AudioContent> c, DecodeOptions o)
 	: Decoder (f, o)
 {
 
 }
-
-void
-AudioDecoder::set_audio_stream (shared_ptr<AudioStream> s)
-{
-	_audio_stream = s;
-}
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 9bef8e0e7..7d2a2bb62 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -25,34 +25,17 @@
 #define DVDOMATIC_AUDIO_DECODER_H
 
 #include "audio_source.h"
-#include "stream.h"
 #include "decoder.h"
 
+class AudioContent;
+
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
 class AudioDecoder : public AudioSource, public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<Film>, DecodeOptions);
-
-	virtual void set_audio_stream (boost::shared_ptr<AudioStream>);
-
-	/** @return Audio stream that we are using */
-	boost::shared_ptr<AudioStream> audio_stream () const {
-		return _audio_stream;
-	}
-
-	/** @return All available audio streams */
-	std::vector<boost::shared_ptr<AudioStream> > audio_streams () const {
-		return _audio_streams;
-	}
-
-protected:
-	/** Audio stream that we are using */
-	boost::shared_ptr<AudioStream> _audio_stream;
-	/** All available audio streams */
-	std::vector<boost::shared_ptr<AudioStream> > _audio_streams;
+	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<AudioContent>, DecodeOptions);
 };
 
 #endif
diff --git a/src/lib/content.cc b/src/lib/content.cc
new file mode 100644
index 000000000..2fb94e959
--- /dev/null
+++ b/src/lib/content.cc
@@ -0,0 +1,20 @@
+#include <boost/thread/mutex.hpp>
+#include "content.h"
+#include "util.h"
+
+using std::string;
+using boost::shared_ptr;
+
+Content::Content (boost::filesystem::path f)
+	: _file (f)
+{
+
+}
+
+void
+Content::examine (shared_ptr<Film>, shared_ptr<Job>, bool)
+{
+	string const d = md5_digest (_file);
+	boost::mutex::scoped_lock lm (_mutex);
+	_digest = d;
+}
diff --git a/src/lib/content.h b/src/lib/content.h
index c848860aa..25c097424 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -1,17 +1,34 @@
+#ifndef DVDOMATIC_CONTENT_H
+#define DVDOMATIC_CONTENT_H
+
 #include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>
 
+class Job;
+class Film;
+
 class Content
 {
 public:
+	Content (boost::filesystem::path);
+	
+	virtual void examine (boost::shared_ptr<Film>, boost::shared_ptr<Job>, bool);
+	virtual std::string summary () const = 0;
+	
 	boost::filesystem::path file () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _file;
 	}
 
+	boost::signals2::signal<void (int)> Changed;
+
 protected:
-	boost::mutex _mutex;
+	mutable boost::mutex _mutex;
 
 private:
 	boost::filesystem::path _file;
+	std::string _digest;
 };
+
+#endif
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 52b22fa06..2fe265c14 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -22,34 +22,21 @@
  */
 
 #include <iostream>
-#include <stdint.h>
-#include <boost/lexical_cast.hpp>
 #include "film.h"
-#include "format.h"
 #include "options.h"
 #include "exceptions.h"
-#include "image.h"
 #include "util.h"
-#include "log.h"
 #include "decoder.h"
-#include "delay_line.h"
-#include "subtitle.h"
-#include "filter_graph.h"
 
 #include "i18n.h"
 
 using std::string;
-using std::stringstream;
-using std::min;
-using std::pair;
-using std::list;
 using boost::shared_ptr;
-using boost::optional;
 
 /** @param f Film.
  *  @param o Decode options.
  */
-Decoder::Decoder (boost::shared_ptr<Film> f, DecodeOptions o)
+Decoder::Decoder (shared_ptr<const Film> f, DecodeOptions o)
 	: _film (f)
 	, _opt (o)
 {
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index f2f523516..50aa16dba 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -30,7 +30,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include "util.h"
-#include "stream.h"
 #include "video_source.h"
 #include "audio_source.h"
 #include "film.h"
@@ -53,7 +52,7 @@ class FilterGraph;
 class Decoder
 {
 public:
-	Decoder (boost::shared_ptr<Film>, DecodeOptions);
+	Decoder (boost::shared_ptr<const Film>, DecodeOptions);
 	virtual ~Decoder () {}
 
 	virtual bool pass () = 0;
@@ -63,14 +62,13 @@ public:
 	boost::signals2::signal<void()> OutputChanged;
 
 protected:
-	/** our Film */
-	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<const Film> _film;
 	/** our decode options */
 	DecodeOptions _opt;
 
 private:
 	virtual void film_changed (Film::Property) {}
-	
+
 	boost::signals2::scoped_connection _film_connection;
 };
 
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index f7f9f4074..feaa1c7ef 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -39,22 +39,5 @@ decoder_factory (
 	shared_ptr<Film> f, DecodeOptions o
 	)
 {
-	if (f->content().empty()) {
-		return Decoders ();
-	}
-	
-	if (boost::filesystem::is_directory (f->content_path()) || f->content_type() == STILL) {
-		/* A single image file, or a directory of them */
-		return Decoders (
-			shared_ptr<VideoDecoder> (new ImageMagickDecoder (f, o)),
-			shared_ptr<AudioDecoder> (new SndfileDecoder (f, o))
-			);
-	}
-
-	shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (f, o));
-	if (f->use_content_audio()) {
-		return Decoders (fd, fd);
-	}
-
-	return Decoders (fd, shared_ptr<AudioDecoder> (new SndfileDecoder (f, o)));
+	return Decoders ();
 }
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 7b338407e..970213793 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -38,6 +38,7 @@
 #include "format.h"
 #include "cross.h"
 #include "writer.h"
+#include "playlist.h"
 
 #include "i18n.h"
 
@@ -53,8 +54,9 @@ using namespace boost;
 int const Encoder::_history_size = 25;
 
 /** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<Film> f)
+Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Playlist> p)
 	: _film (f)
+	, _playlist (p)
 	, _video_frames_in (0)
 	, _video_frames_out (0)
 #ifdef HAVE_SWRESAMPLE	  
@@ -77,22 +79,22 @@ Encoder::~Encoder ()
 void
 Encoder::process_begin ()
 {
-	if (_film->audio_stream() && _film->audio_stream()->sample_rate() != _film->target_audio_sample_rate()) {
+	if (_playlist->has_audio() && _playlist->audio_frame_rate() != _film->target_audio_sample_rate()) {
 #ifdef HAVE_SWRESAMPLE
 
 		stringstream s;
-		s << String::compose (N_("Will resample audio from %1 to %2"), _film->audio_stream()->sample_rate(), _film->target_audio_sample_rate());
+		s << String::compose (N_("Will resample audio from %1 to %2"), _playlist->audio_frame_rate(), _film->target_audio_sample_rate());
 		_film->log()->log (s.str ());
 
 		/* We will be using planar float data when we call the resampler */
 		_swr_context = swr_alloc_set_opts (
 			0,
-			_film->audio_stream()->channel_layout(),
+			_playlist->audio_channel_layout(),
 			AV_SAMPLE_FMT_FLTP,
 			_film->target_audio_sample_rate(),
-			_film->audio_stream()->channel_layout(),
+			_playlist->audio_channel_layout(),
 			AV_SAMPLE_FMT_FLTP,
-			_film->audio_stream()->sample_rate(),
+			_playlist->audio_frame_rate(),
 			0, 0
 			);
 		
@@ -118,7 +120,7 @@ Encoder::process_begin ()
 		}
 	}
 
-	_writer.reset (new Writer (_film));
+	_writer.reset (new Writer (_film, _playlist));
 }
 
 
@@ -126,9 +128,9 @@ void
 Encoder::process_end ()
 {
 #if HAVE_SWRESAMPLE	
-	if (_film->audio_stream() && _film->audio_stream()->channels() && _swr_context) {
+	if (_playlist->has_audio() && _playlist->audio_channels() && _swr_context) {
 
-		shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_stream()->channels(), 256));
+		shared_ptr<AudioBuffers> out (new AudioBuffers (_playlist->audio_channels(), 256));
 			
 		while (1) {
 			int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0);
@@ -233,7 +235,7 @@ Encoder::frame_done ()
 void
 Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub)
 {
-	FrameRateConversion frc (_film->source_frame_rate(), _film->dcp_frame_rate());
+	FrameRateConversion frc (_playlist->video_frame_rate(), _film->dcp_frame_rate());
 	
 	if (frc.skip && (_video_frames_in % 2)) {
 		++_video_frames_in;
@@ -271,7 +273,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		TIMING ("adding to queue of %1", _queue.size ());
 		_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
+						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_playlist),
 						  _film->subtitle_offset(), _film->subtitle_scale(),
 						  _film->scaler(), _video_frames_out, _film->dcp_frame_rate(), s.second,
 						  _film->colour_lut(), _film->j2k_bandwidth(),
@@ -301,9 +303,9 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 	if (_swr_context) {
 
 		/* Compute the resampled frames count and add 32 for luck */
-		int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _film->audio_stream()->sample_rate()) + 32;
+		int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _playlist->audio_frame_rate()) + 32;
 
-		shared_ptr<AudioBuffers> resampled (new AudioBuffers (_film->audio_stream()->channels(), max_resampled_frames));
+		shared_ptr<AudioBuffers> resampled (new AudioBuffers (_playlist->audio_channels(), max_resampled_frames));
 
 		/* Resample audio */
 		int const resampled_frames = swr_convert (
@@ -425,8 +427,8 @@ Encoder::encoder_thread (ServerDescription* server)
 void
 Encoder::write_audio (shared_ptr<const AudioBuffers> data)
 {
-	AudioMapping m (_film->audio_channels ());
-	if (m.dcp_channels() != _film->audio_channels()) {
+	AudioMapping m (_playlist->audio_channels ());
+	if (m.dcp_channels() != _playlist->audio_channels()) {
 
 		/* Remap (currently just for mono -> 5.1) */
 
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 86880bc34..c84ee027a 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -51,6 +51,7 @@ class ServerDescription;
 class DCPVideoFrame;
 class EncodedData;
 class Writer;
+class Playlist;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -62,7 +63,7 @@ class Writer;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-	Encoder (boost::shared_ptr<Film> f);
+	Encoder (boost::shared_ptr<Film> f, boost::shared_ptr<Playlist>);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
@@ -95,6 +96,7 @@ private:
 
 	/** Film that we are encoding */
 	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<Playlist> _playlist;
 
 	/** Mutex for _time_history and _last_frame */
 	mutable boost::mutex _history_mutex;
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 4b30c9431..c600132c3 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -17,29 +17,21 @@
 
 */
 
-/** @file  src/examine_content_job.cc
- *  @brief A class to run through content at high speed to find its length.
- */
-
 #include <boost/filesystem.hpp>
 #include "examine_content_job.h"
 #include "options.h"
-#include "decoder_factory.h"
-#include "decoder.h"
-#include "transcoder.h"
 #include "log.h"
-#include "film.h"
-#include "video_decoder.h"
+#include "content.h"
 
 #include "i18n.h"
 
 using std::string;
-using std::vector;
-using std::pair;
 using boost::shared_ptr;
 
-ExamineContentJob::ExamineContentJob (shared_ptr<Film> f)
+ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Content> c, bool q)
 	: Job (f)
+	, _content (c)
+	, _quick (q)
 {
 
 }
@@ -51,60 +43,13 @@ ExamineContentJob::~ExamineContentJob ()
 string
 ExamineContentJob::name () const
 {
-	if (_film->name().empty ()) {
-		return _("Examine content");
-	}
-	
-	return String::compose (_("Examine content of %1"), _film->name());
+	return _("Examine content");
 }
 
 void
 ExamineContentJob::run ()
 {
-	descend (0.5);
-	_film->set_content_digest (md5_digest (_film->content_path ()));
-	ascend ();
-
-	descend (0.5);
-
-	/* Set the film's length to either
-	   a) a length judged by running through the content or
-	   b) the length from a decoder's header.
-	*/
-	if (!_film->trust_content_header()) {
-		/* Decode the content to get an accurate length */
-		
-		/* We don't want to use any existing length here, as progress
-		   will be messed up.
-		*/
-		_film->unset_length ();
-		_film->set_crop (Crop ());
-		
-		DecodeOptions o;
-		o.decode_audio = false;
-		
-		Decoders decoders = decoder_factory (_film, o);
-		
-		set_progress_unknown ();
-		while (!decoders.video->pass()) {
-			/* keep going */
-		}
-		
-		_film->set_length (decoders.video->video_frame());
-		
-		_film->log()->log (String::compose (N_("Video length examined as %1 frames"), _film->length().get()));
-		
-	} else {
-
-		/* Get a quick decoder to get the content's length from its header */
-		
-		Decoders d = decoder_factory (_film, DecodeOptions());
-		_film->set_length (d.video->length());
-	
-		_film->log()->log (String::compose (N_("Video length obtained from header as %1 frames"), _film->length().get()));
-	}
-
-	ascend ();
+	_content->examine (_film, shared_from_this (), _quick);
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h
index 8ee4f0d60..dc0d53fff 100644
--- a/src/lib/examine_content_job.h
+++ b/src/lib/examine_content_job.h
@@ -17,22 +17,23 @@
 
 */
 
-/** @file  src/examine_content_job.h
- *  @brief A class to obtain the length and MD5 digest of a content file.
- */
-
+#include <boost/shared_ptr.hpp>
 #include "job.h"
 
-/** @class ExamineContentJob
- *  @brief A class to obtain the length and MD5 digest of a content file.
- */
+class Content;
+class Log;
+
 class ExamineContentJob : public Job
 {
 public:
-	ExamineContentJob (boost::shared_ptr<Film>);
+	ExamineContentJob (boost::shared_ptr<Film>, boost::shared_ptr<Content>, bool);
 	~ExamineContentJob ();
 
 	std::string name () const;
 	void run ();
+
+private:
+	boost::shared_ptr<Content> _content;
+	bool _quick;
 };
 
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index e45a62353..6920556e5 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -112,6 +112,7 @@ class OpenFileError : public FileError
 {
 public:
 	/** @param f File that we were trying to open */
+	/* XXX: should be boost::filesystem::path */
 	OpenFileError (std::string f);
 };
 
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
new file mode 100644
index 000000000..25efb1ebf
--- /dev/null
+++ b/src/lib/ffmpeg_content.cc
@@ -0,0 +1,156 @@
+#include "ffmpeg_content.h"
+#include "ffmpeg_decoder.h"
+#include "options.h"
+#include "compose.hpp"
+#include "job.h"
+#include "util.h"
+#include "log.h"
+
+#include "i18n.h"
+
+using std::string;
+using boost::shared_ptr;
+
+int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
+int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
+int const FFmpegContentProperty::AUDIO_STREAMS = 102;
+int const FFmpegContentProperty::AUDIO_STREAM = 103;
+
+FFmpegContent::FFmpegContent (boost::filesystem::path f)
+	: Content (f)
+	, VideoContent (f)
+	, AudioContent (f)
+{
+
+}
+
+void
+FFmpegContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
+{
+	job->descend (0.5);
+	Content::examine (film, job, quick);
+	job->ascend ();
+
+	job->set_progress_unknown ();
+
+	DecodeOptions o;
+	o.decode_audio = false;
+	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), o));
+
+	ContentVideoFrame video_length = 0;
+	if (quick) {
+		video_length = decoder->video_length ();
+                film->log()->log (String::compose ("Video length obtained from header as %1 frames", decoder->video_length ()));
+        } else {
+                while (!decoder->pass ()) {
+                        /* keep going */
+                }
+
+                video_length = decoder->video_frame ();
+                film->log()->log (String::compose ("Video length examined as %1 frames", decoder->video_frame ()));
+        }
+
+        {
+                boost::mutex::scoped_lock lm (_mutex);
+
+                _video_length = video_length;
+
+                _subtitle_streams = decoder->subtitle_streams ();
+                if (!_subtitle_streams.empty ()) {
+                        _subtitle_stream = _subtitle_streams.front ();
+                }
+                
+                _audio_streams = decoder->audio_streams ();
+                if (!_audio_streams.empty ()) {
+                        _audio_stream = _audio_streams.front ();
+                }
+        }
+
+        take_from_video_decoder (decoder);
+
+        Changed (VideoContentProperty::VIDEO_LENGTH);
+        Changed (FFmpegContentProperty::SUBTITLE_STREAMS);
+        Changed (FFmpegContentProperty::SUBTITLE_STREAM);
+        Changed (FFmpegContentProperty::AUDIO_STREAMS);
+        Changed (FFmpegContentProperty::AUDIO_STREAM);
+}
+
+string
+FFmpegContent::summary () const
+{
+	return String::compose (_("Movie: %1"), file().filename ());
+}
+
+void
+FFmpegContent::set_subtitle_stream (FFmpegSubtitleStream s)
+{
+        {
+                boost::mutex::scoped_lock lm (_mutex);
+                _subtitle_stream = s;
+        }
+
+        Changed (FFmpegContentProperty::SUBTITLE_STREAM);
+}
+
+void
+FFmpegContent::set_audio_stream (FFmpegAudioStream s)
+{
+        {
+                boost::mutex::scoped_lock lm (_mutex);
+                _audio_stream = s;
+        }
+
+        Changed (FFmpegContentProperty::AUDIO_STREAM);
+}
+
+ContentAudioFrame
+FFmpegContent::audio_length () const
+{
+        if (!_audio_stream) {
+                return 0;
+        }
+        
+        return video_frames_to_audio_frames (_video_length, audio_frame_rate(), video_frame_rate());
+}
+
+int
+FFmpegContent::audio_channels () const
+{
+        if (!_audio_stream) {
+                return 0;
+        }
+
+        return _audio_stream->channels ();
+}
+
+int
+FFmpegContent::audio_frame_rate () const
+{
+        if (!_audio_stream) {
+                return 0;
+        }
+
+        return _audio_stream->frame_rate;
+}
+
+int64_t
+FFmpegContent::audio_channel_layout () const
+{
+        if (!_audio_stream) {
+                return 0;
+        }
+
+        return _audio_stream->channel_layout;
+}
+	
+bool
+operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b)
+{
+        return a.id == b.id;
+}
+
+bool
+operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b)
+{
+        return a.id == b.id;
+}
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 8b3eca62d..83474ea66 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -1,8 +1,97 @@
-#include "content.h"
+#ifndef DVDOMATIC_FFMPEG_CONTENT_H
+#define DVDOMATIC_FFMPEG_CONTENT_H
 
-class FFmpegContent : public VideoContent, public AudioContent
+#include <boost/enable_shared_from_this.hpp>
+#include "video_content.h"
+#include "audio_content.h"
+
+class FFmpegAudioStream
+{
+public:
+        FFmpegAudioStream (std::string n, int i, int f, int64_t c)
+                : name (n)
+                , id (i)
+                , frame_rate (f)
+                , channel_layout (c)
+        {}
+
+        int channels () const {
+                return av_get_channel_layout_nb_channels (channel_layout);
+        }
+        
+        std::string name;
+        int id;
+        int frame_rate;
+        int64_t channel_layout;
+};
+
+extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
+
+class FFmpegSubtitleStream
+{
+public:
+        FFmpegSubtitleStream (std::string n, int i)
+                : name (n)
+                , id (i)
+        {}
+        
+        std::string name;
+        int id;
+};
+
+extern bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b);
+
+class FFmpegContentProperty : public VideoContentProperty
+{
+public:
+        static int const SUBTITLE_STREAMS;
+        static int const SUBTITLE_STREAM;
+        static int const AUDIO_STREAMS;
+        static int const AUDIO_STREAM;
+};
+
+class FFmpegContent : public VideoContent, public AudioContent, public boost::enable_shared_from_this<FFmpegContent>
 {
 public:
+	FFmpegContent (boost::filesystem::path);
 	
+	void examine (boost::shared_ptr<Film>, boost::shared_ptr<Job>, bool);
+	std::string summary () const;
 
+        /* AudioContent */
+        int audio_channels () const;
+        ContentAudioFrame audio_length () const;
+        int audio_frame_rate () const;
+        int64_t audio_channel_layout () const;
+	
+        std::vector<FFmpegSubtitleStream> subtitle_streams () const {
+                boost::mutex::scoped_lock lm (_mutex);
+                return _subtitle_streams;
+        }
+
+        boost::optional<FFmpegSubtitleStream> subtitle_stream () const {
+                boost::mutex::scoped_lock lm (_mutex);
+                return _subtitle_stream;
+        }
+
+        std::vector<FFmpegAudioStream> audio_streams () const {
+                boost::mutex::scoped_lock lm (_mutex);
+                return _audio_streams;
+        }
+        
+        boost::optional<FFmpegAudioStream> audio_stream () const {
+                boost::mutex::scoped_lock lm (_mutex);
+                return _audio_stream;
+        }
+
+        void set_subtitle_stream (FFmpegSubtitleStream);
+        void set_audio_stream (FFmpegAudioStream);
+	
+private:
+	std::vector<FFmpegSubtitleStream> _subtitle_streams;
+	boost::optional<FFmpegSubtitleStream> _subtitle_stream;
+	std::vector<FFmpegAudioStream> _audio_streams;
+	boost::optional<FFmpegAudioStream> _audio_stream;
 };
+
+#endif
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index ac25844e3..c8e46776f 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -62,10 +62,11 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using libdcp::Size;
 
-FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, DecodeOptions o)
+FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<FFmpegContent> c, DecodeOptions o)
 	: Decoder (f, o)
-	, VideoDecoder (f, o)
-	, AudioDecoder (f, o)
+	, VideoDecoder (f, c, o)
+	, AudioDecoder (f, c, o)
+	, _ffmpeg_content (c)
 	, _format_context (0)
 	, _video_stream (-1)
 	, _frame (0)
@@ -110,8 +111,8 @@ FFmpegDecoder::setup_general ()
 {
 	av_register_all ();
 
-	if (avformat_open_input (&_format_context, _film->content_path().c_str(), 0, 0) < 0) {
-		throw OpenFileError (_film->content_path ());
+	if (avformat_open_input (&_format_context, _ffmpeg_content->file().string().c_str(), 0, 0) < 0) {
+		throw OpenFileError (_ffmpeg_content->file().string ());
 	}
 
 	if (avformat_find_stream_info (_format_context, 0) < 0) {
@@ -135,17 +136,11 @@ FFmpegDecoder::setup_general ()
 			}
 			
 			_audio_streams.push_back (
-				shared_ptr<AudioStream> (
-					new FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channel_layout)
-					)
+				FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channel_layout)
 				);
 			
 		} else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-			_subtitle_streams.push_back (
-				shared_ptr<SubtitleStream> (
-					new SubtitleStream (stream_name (s), i)
-					)
-				);
+			_subtitle_streams.push_back (FFmpegSubtitleStream (stream_name (s), i));
 		}
 	}
 
@@ -177,14 +172,11 @@ FFmpegDecoder::setup_video ()
 void
 FFmpegDecoder::setup_audio ()
 {
-	if (!_audio_stream) {
+	if (!_ffmpeg_content->audio_stream ()) {
 		return;
 	}
 
-	shared_ptr<FFmpegAudioStream> ffa = dynamic_pointer_cast<FFmpegAudioStream> (_audio_stream);
-	assert (ffa);
-	
-	_audio_codec_context = _format_context->streams[ffa->id()]->codec;
+	_audio_codec_context = _format_context->streams[_ffmpeg_content->audio_stream()->id]->codec;
 	_audio_codec = avcodec_find_decoder (_audio_codec_context->codec_id);
 
 	if (_audio_codec == 0) {
@@ -199,11 +191,11 @@ FFmpegDecoder::setup_audio ()
 void
 FFmpegDecoder::setup_subtitle ()
 {
-	if (!_subtitle_stream || _subtitle_stream->id() >= int (_format_context->nb_streams)) {
+	if (!_ffmpeg_content->subtitle_stream() || _ffmpeg_content->subtitle_stream()->id >= int (_format_context->nb_streams)) {
 		return;
 	}
 
-	_subtitle_codec_context = _format_context->streams[_subtitle_stream->id()]->codec;
+	_subtitle_codec_context = _format_context->streams[_ffmpeg_content->subtitle_stream()->id]->codec;
 	_subtitle_codec = avcodec_find_decoder (_subtitle_codec_context->codec_id);
 
 	if (_subtitle_codec == 0) {
@@ -244,7 +236,7 @@ FFmpegDecoder::pass ()
 			}
 		}
 
-		if (_audio_stream && _opt.decode_audio) {
+		if (_ffmpeg_content->audio_stream() && _opt.decode_audio) {
 			decode_audio_packet ();
 		}
 
@@ -253,8 +245,6 @@ FFmpegDecoder::pass ()
 
 	avcodec_get_frame_defaults (_frame);
 
-	shared_ptr<FFmpegAudioStream> ffa = dynamic_pointer_cast<FFmpegAudioStream> (_audio_stream);
-
 	if (_packet.stream_index == _video_stream && _opt.decode_video) {
 
 		int frame_finished;
@@ -272,9 +262,9 @@ FFmpegDecoder::pass ()
 			}
 		}
 
-	} else if (ffa && _packet.stream_index == ffa->id() && _opt.decode_audio) {
+	} else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->id && _opt.decode_audio) {
 		decode_audio_packet ();
-	} else if (_subtitle_stream && _packet.stream_index == _subtitle_stream->id() && _opt.decode_subtitles && _first_video) {
+	} else if (_ffmpeg_content->subtitle_stream() && _packet.stream_index == _ffmpeg_content->subtitle_stream()->id && _opt.decode_subtitles && _first_video) {
 
 		int got_subtitle;
 		AVSubtitle sub;
@@ -306,19 +296,16 @@ FFmpegDecoder::pass ()
 shared_ptr<AudioBuffers>
 FFmpegDecoder::deinterleave_audio (uint8_t** data, int size)
 {
-	assert (_film->audio_channels());
+	assert (_ffmpeg_content->audio_channels());
 	assert (bytes_per_audio_sample());
 
-	shared_ptr<FFmpegAudioStream> ffa = dynamic_pointer_cast<FFmpegAudioStream> (_audio_stream);
-	assert (ffa);
-	
 	/* Deinterleave and convert to float */
 
-	assert ((size % (bytes_per_audio_sample() * ffa->channels())) == 0);
+	assert ((size % (bytes_per_audio_sample() * _ffmpeg_content->audio_channels())) == 0);
 
 	int const total_samples = size / bytes_per_audio_sample();
-	int const frames = total_samples / _film->audio_channels();
-	shared_ptr<AudioBuffers> audio (new AudioBuffers (ffa->channels(), frames));
+	int const frames = total_samples / _ffmpeg_content->audio_channels();
+	shared_ptr<AudioBuffers> audio (new AudioBuffers (_ffmpeg_content->audio_channels(), frames));
 
 	switch (audio_sample_format()) {
 	case AV_SAMPLE_FMT_S16:
@@ -330,7 +317,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size)
 			audio->data(channel)[sample] = float(*p++) / (1 << 15);
 
 			++channel;
-			if (channel == _film->audio_channels()) {
+			if (channel == _ffmpeg_content->audio_channels()) {
 				channel = 0;
 				++sample;
 			}
@@ -341,7 +328,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size)
 	case AV_SAMPLE_FMT_S16P:
 	{
 		int16_t** p = reinterpret_cast<int16_t **> (data);
-		for (int i = 0; i < _film->audio_channels(); ++i) {
+		for (int i = 0; i < _ffmpeg_content->audio_channels(); ++i) {
 			for (int j = 0; j < frames; ++j) {
 				audio->data(i)[j] = static_cast<float>(p[i][j]) / (1 << 15);
 			}
@@ -358,7 +345,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size)
 			audio->data(channel)[sample] = static_cast<float>(*p++) / (1 << 31);
 
 			++channel;
-			if (channel == _film->audio_channels()) {
+			if (channel == _ffmpeg_content->audio_channels()) {
 				channel = 0;
 				++sample;
 			}
@@ -375,7 +362,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size)
 			audio->data(channel)[sample] = *p++;
 
 			++channel;
-			if (channel == _film->audio_channels()) {
+			if (channel == _ffmpeg_content->audio_channels()) {
 				channel = 0;
 				++sample;
 			}
@@ -386,7 +373,7 @@ FFmpegDecoder::deinterleave_audio (uint8_t** data, int size)
 	case AV_SAMPLE_FMT_FLTP:
 	{
 		float** p = reinterpret_cast<float**> (data);
-		for (int i = 0; i < _film->audio_channels(); ++i) {
+		for (int i = 0; i < _ffmpeg_content->audio_channels(); ++i) {
 			memcpy (audio->data(i), p[i], frames * sizeof(float));
 		}
 	}
@@ -488,21 +475,6 @@ FFmpegDecoder::bytes_per_audio_sample () const
 	return av_get_bytes_per_sample (audio_sample_format ());
 }
 
-void
-FFmpegDecoder::set_audio_stream (shared_ptr<AudioStream> s)
-{
-	AudioDecoder::set_audio_stream (s);
-	setup_audio ();
-}
-
-void
-FFmpegDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
-	VideoDecoder::set_subtitle_stream (s);
-	setup_subtitle ();
-	OutputChanged ();
-}
-
 void
 FFmpegDecoder::filter_and_emit_video (AVFrame* frame)
 {
@@ -561,58 +533,6 @@ FFmpegDecoder::do_seek (double p, bool backwards)
 	return r < 0;
 }
 
-shared_ptr<FFmpegAudioStream>
-FFmpegAudioStream::create (string t, optional<int> v)
-{
-	if (!v) {
-		/* version < 1; no type in the string, and there's only FFmpeg streams anyway */
-		return shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream (t, v));
-	}
-
-	stringstream s (t);
-	string type;
-	s >> type;
-	if (type != N_("ffmpeg")) {
-		return shared_ptr<FFmpegAudioStream> ();
-	}
-
-	return shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream (t, v));
-}
-
-FFmpegAudioStream::FFmpegAudioStream (string t, optional<int> version)
-{
-	stringstream n (t);
-	
-	int name_index = 4;
-	if (!version) {
-		name_index = 2;
-		int channels;
-		n >> _id >> channels;
-		_channel_layout = av_get_default_channel_layout (channels);
-		_sample_rate = 0;
-	} else {
-		string type;
-		/* Current (marked version 1) */
-		n >> type >> _id >> _sample_rate >> _channel_layout;
-		assert (type == N_("ffmpeg"));
-	}
-
-	for (int i = 0; i < name_index; ++i) {
-		size_t const s = t.find (' ');
-		if (s != string::npos) {
-			t = t.substr (s + 1);
-		}
-	}
-
-	_name = t;
-}
-
-string
-FFmpegAudioStream::to_string () const
-{
-	return String::compose (N_("ffmpeg %1 %2 %3 %4"), _id, _sample_rate, _channel_layout, _name);
-}
-
 void
 FFmpegDecoder::out_with_sync ()
 {
@@ -678,8 +598,8 @@ FFmpegDecoder::film_changed (Film::Property p)
 }
 
 /** @return Length (in video frames) according to our content's header */
-SourceFrame
-FFmpegDecoder::length () const
+ContentVideoFrame
+FFmpegDecoder::video_length () const
 {
 	return (double(_format_context->duration) / AV_TIME_BASE) * frames_per_second();
 }
@@ -693,9 +613,6 @@ FFmpegDecoder::frame_time () const
 void
 FFmpegDecoder::decode_audio_packet ()
 {
-	shared_ptr<FFmpegAudioStream> ffa = dynamic_pointer_cast<FFmpegAudioStream> (_audio_stream);
-	assert (ffa);
-
 	/* Audio packets can contain multiple frames, so we may have to call avcodec_decode_audio4
 	   several times.
 	*/
@@ -727,17 +644,17 @@ FFmpegDecoder::decode_audio_packet ()
 					*/
 					
 					/* frames of silence that we must push */
-					int const s = rint ((_first_audio.get() - _first_video.get()) * ffa->sample_rate ());
+					int const s = rint ((_first_audio.get() - _first_video.get()) * _ffmpeg_content->audio_frame_rate ());
 					
 					_film->log()->log (
 						String::compose (
 							N_("First video at %1, first audio at %2, pushing %3 audio frames of silence for %4 channels (%5 bytes per sample)"),
-							_first_video.get(), _first_audio.get(), s, ffa->channels(), bytes_per_audio_sample()
+							_first_video.get(), _first_audio.get(), s, _ffmpeg_content->audio_channels(), bytes_per_audio_sample()
 							)
 						);
 					
 					if (s) {
-						shared_ptr<AudioBuffers> audio (new AudioBuffers (ffa->channels(), s));
+						shared_ptr<AudioBuffers> audio (new AudioBuffers (_ffmpeg_content->audio_channels(), s));
 						audio->make_silent ();
 						Audio (audio);
 					}
@@ -747,7 +664,7 @@ FFmpegDecoder::decode_audio_packet ()
 					0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1
 					);
 				
-				assert (_audio_codec_context->channels == _film->audio_channels());
+				assert (_audio_codec_context->channels == _ffmpeg_content->audio_channels());
 				Audio (deinterleave_audio (_frame->data, data_size));
 			}
 		}
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 1bb14ce9c..a0900d89f 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -36,6 +36,7 @@ extern "C" {
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "film.h"
+#include "ffmpeg_content.h"
 
 struct AVFilterGraph;
 struct AVCodecContext;
@@ -50,62 +51,37 @@ class Options;
 class Image;
 class Log;
 
-class FFmpegAudioStream : public AudioStream
-{
-public:
-	FFmpegAudioStream (std::string n, int i, int s, int64_t c)
-		: AudioStream (s, c)
-		, _name (n)
-		, _id (i)
-	{}
-
-	std::string to_string () const;
-
-	std::string name () const {
-		return _name;
-	}
-
-	int id () const {
-		return _id;
-	}
-
-	static boost::shared_ptr<FFmpegAudioStream> create (std::string t, boost::optional<int> v);
-
-private:
-	friend class stream_test;
-	
-	FFmpegAudioStream (std::string t, boost::optional<int> v);
-	
-	std::string _name;
-	int _id;
-};
-
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<Film>, DecodeOptions);
+	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<FFmpegContent>, DecodeOptions);
 	~FFmpegDecoder ();
 
 	float frames_per_second () const;
 	libdcp::Size native_size () const;
-	SourceFrame length () const;
+	ContentVideoFrame video_length () const;
 	int time_base_numerator () const;
 	int time_base_denominator () const;
 	int sample_aspect_ratio_numerator () const;
 	int sample_aspect_ratio_denominator () const;
 
-	void set_audio_stream (boost::shared_ptr<AudioStream>);
-	void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
+	std::vector<FFmpegSubtitleStream> subtitle_streams () const {
+		return _subtitle_streams;
+	}
+	
+	std::vector<FFmpegAudioStream> audio_streams () const {
+		return _audio_streams;
+	}
 
 	bool seek (double);
 	bool seek_to_last ();
+	bool pass ();
 
 private:
 
-	bool pass ();
 	bool do_seek (double p, bool);
 	PixelFormat pixel_format () const;
 	AVSampleFormat audio_sample_format () const;
@@ -129,6 +105,8 @@ private:
 
 	std::string stream_name (AVStream* s) const;
 
+	boost::shared_ptr<FFmpegContent> _ffmpeg_content;
+
 	AVFormatContext* _format_context;
 	int _video_stream;
 	
@@ -148,4 +126,7 @@ private:
 
 	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
+
+        std::vector<FFmpegSubtitleStream> _subtitle_streams;
+        std::vector<FFmpegAudioStream> _audio_streams;
 };
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 0d969f16d..f69f63fd8 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -52,6 +52,7 @@
 #include "audio_decoder.h"
 #include "sndfile_decoder.h"
 #include "analyse_audio_job.h"
+#include "playlist.h"
 
 #include "i18n.h"
 
@@ -135,8 +136,6 @@ Film::Film (string d, bool must_exist)
 		}
 	}
 
-	_sndfile_stream = SndfileStream::create ();
-	
 	if (must_exist) {
 		read_metadata ();
 	}
@@ -162,7 +161,6 @@ Film::Film (Film const & o)
 	, _dcp_ab            (o._dcp_ab)
 	, _audio_gain        (o._audio_gain)
 	, _audio_delay       (o._audio_delay)
-	, _still_duration    (o._still_duration)
 	, _with_subtitles    (o._with_subtitles)
 	, _subtitle_offset   (o._subtitle_offset)
 	, _subtitle_scale    (o._subtitle_scale)
@@ -186,6 +184,10 @@ Film::video_state_identifier () const
 {
 	assert (format ());
 
+	return "XXX";
+
+#if 0	
+
 	pair<string, string> f = Filter::ffmpeg_strings (filters());
 
 	stringstream s;
@@ -204,6 +206,7 @@ Film::video_state_identifier () const
 	}
 
 	return s.str ();
+#endif	
 }
 	  
 /** @return The path to the directory to write video frame info files to */
@@ -234,7 +237,7 @@ Film::audio_analysis_path () const
 {
 	boost::filesystem::path p;
 	p /= "analysis";
-	p /= content_digest();
+	p /= "XXX";//content_digest();
 	return file (p.string ());
 }
 
@@ -256,12 +259,12 @@ Film::make_dcp ()
 		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"))));
-	if (length()) {
-		log()->log (String::compose ("Content length %1", length().get()));
-	}
-	log()->log (String::compose ("Content digest %1", content_digest()));
-	log()->log (String::compose ("Content at %1 fps, DCP at %2 fps", source_frame_rate(), dcp_frame_rate()));
+//	log()->log (String::compose ("Content is %1; type %2", content_path(), (content_type() == STILL ? _("still") : _("video"))));
+//	if (length()) {
+//		log()->log (String::compose ("Content length %1", length().get()));
+//	}
+//	log()->log (String::compose ("Content digest %1", content_digest()));
+//	log()->log (String::compose ("Content at %1 fps, DCP at %2 fps", source_frame_rate(), dcp_frame_rate()));
 	log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
 	log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
 #ifdef DVDOMATIC_DEBUG
@@ -318,17 +321,13 @@ Film::analyse_audio ()
 	JobManager::instance()->add (_analyse_audio_job);
 }
 
-/** Start a job to examine our content file */
+/** Start a job to examine a piece of content */
 void
-Film::examine_content ()
+Film::examine_content (shared_ptr<Content> c)
 {
-	if (_examine_content_job) {
-		return;
-	}
-
-	_examine_content_job.reset (new ExamineContentJob (shared_from_this()));
-	_examine_content_job->Finished.connect (bind (&Film::examine_content_finished, this));
-	JobManager::instance()->add (_examine_content_job);
+	shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c, trust_content_header ()));
+	j->Finished.connect (bind (&Film::examine_content_finished, this));
+	JobManager::instance()->add (j);
 }
 
 void
@@ -346,7 +345,7 @@ Film::analyse_audio_finished ()
 void
 Film::examine_content_finished ()
 {
-	_examine_content_job.reset ();
+	/* XXX */
 }
 
 /** Start a job to send our DCP to the configured TMS */
@@ -395,7 +394,7 @@ Film::write_metadata () const
 	/* User stuff */
 	f << "name " << _name << endl;
 	f << "use_dci_name " << _use_dci_name << endl;
-	f << "content " << _content << endl;
+//	f << "content " << _content << endl;
 	f << "trust_content_header " << (_trust_content_header ? "1" : "0") << endl;
 	if (_dcp_content_type) {
 		f << "dcp_content_type " << _dcp_content_type->dci_name () << endl;
@@ -414,19 +413,19 @@ Film::write_metadata () const
 	f << "trim_start " << _trim_start << endl;
 	f << "trim_end " << _trim_end << endl;
 	f << "dcp_ab " << (_dcp_ab ? "1" : "0") << endl;
-	if (_content_audio_stream) {
-		f << "selected_content_audio_stream " << _content_audio_stream->to_string() << endl;
-	}
-	for (vector<string>::const_iterator i = _external_audio.begin(); i != _external_audio.end(); ++i) {
-		f << "external_audio " << *i << endl;
-	}
-	f << "use_content_audio " << (_use_content_audio ? "1" : "0") << endl;
+//	if (_content_audio_stream) {
+//		f << "selected_content_audio_stream " << _content_audio_stream->to_string() << endl;
+//	}
+//	for (vector<string>::const_iterator i = _external_audio.begin(); i != _external_audio.end(); ++i) {
+//		f << "external_audio " << *i << endl;
+//	}
+//	f << "use_content_audio " << (_use_content_audio ? "1" : "0") << endl;
 	f << "audio_gain " << _audio_gain << endl;
 	f << "audio_delay " << _audio_delay << endl;
-	f << "still_duration " << _still_duration << endl;
-	if (_subtitle_stream) {
-		f << "selected_subtitle_stream " << _subtitle_stream->to_string() << endl;
-	}
+//	f << "still_duration " << _still_duration << endl;
+//	if (_subtitle_stream) {
+//		f << "selected_subtitle_stream " << _subtitle_stream->to_string() << endl;
+//	}
 	f << "with_subtitles " << _with_subtitles << endl;
 	f << "subtitle_offset " << _subtitle_offset << endl;
 	f << "subtitle_scale " << _subtitle_scale << endl;
@@ -435,22 +434,22 @@ Film::write_metadata () const
 	_dci_metadata.write (f);
 	f << "dci_date " << boost::gregorian::to_iso_string (_dci_date) << endl;
 	f << "dcp_frame_rate " << _dcp_frame_rate << endl;
-	f << "width " << _size.width << endl;
-	f << "height " << _size.height << endl;
-	f << "length " << _length.get_value_or(0) << endl;
-	f << "content_digest " << _content_digest << endl;
+//	f << "width " << _size.width << endl;
+//	f << "height " << _size.height << endl;
+//	f << "length " << _length.get_value_or(0) << endl;
+//	f << "content_digest " << _content_digest << endl;
 
-	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 () << endl;
-	}
+//	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 () << endl;
+//	}
 
-	f << "external_audio_stream " << _sndfile_stream->to_string() << endl;
+//	f << "external_audio_stream " << _sndfile_stream->to_string() << endl;
 
-	for (vector<shared_ptr<SubtitleStream> >::const_iterator i = _subtitle_streams.begin(); i != _subtitle_streams.end(); ++i) {
-		f << "subtitle_stream " << (*i)->to_string () << endl;
-	}
+//	for (vector<shared_ptr<SubtitleStream> >::const_iterator i = _subtitle_streams.begin(); i != _subtitle_streams.end(); ++i) {
+//		f << "subtitle_stream " << (*i)->to_string () << endl;
+//	}
 
-	f << "source_frame_rate " << _source_frame_rate << endl;
+//	f << "source_frame_rate " << _source_frame_rate << endl;
 	
 	_dirty = false;
 }
@@ -461,9 +460,9 @@ Film::read_metadata ()
 {
 	boost::mutex::scoped_lock lm (_state_mutex);
 
-	_external_audio.clear ();
-	_content_audio_streams.clear ();
-	_subtitle_streams.clear ();
+//	_external_audio.clear ();
+//	_content_audio_streams.clear ();
+//	_subtitle_streams.clear ();
 
 	boost::optional<int> version;
 
@@ -499,7 +498,7 @@ Film::read_metadata ()
 		} else if (k == "use_dci_name") {
 			_use_dci_name = (v == "1");
 		} else if (k == "content") {
-			_content = v;
+//			_content = v;
 		} else if (k == "trust_content_header") {
 			_trust_content_header = (v == "1");
 		} else if (k == "dcp_content_type") {
@@ -532,23 +531,23 @@ Film::read_metadata ()
 			if (!version) {
 				audio_stream_index = atoi (v.c_str ());
 			} else {
-				_content_audio_stream = audio_stream_factory (v, version);
+//				_content_audio_stream = audio_stream_factory (v, version);
 			}
 		} else if (k == "external_audio") {
-			_external_audio.push_back (v);
+//			_external_audio.push_back (v);
 		} else if (k == "use_content_audio") {
-			_use_content_audio = (v == "1");
+//			_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 ());
+//			_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);
+//				_subtitle_stream = subtitle_stream_factory (v, version);
 			}
 		} else if (k == "with_subtitles") {
 			_with_subtitles = (v == "1");
@@ -570,50 +569,31 @@ Film::read_metadata ()
 		
 		/* Cached stuff */
 		if (k == "width") {
-			_size.width = atoi (v.c_str ());
+//			_size.width = atoi (v.c_str ());
 		} else if (k == "height") {
-			_size.height = atoi (v.c_str ());
+//			_size.height = atoi (v.c_str ());
 		} else if (k == "length") {
 			int const vv = atoi (v.c_str ());
 			if (vv) {
-				_length = vv;
+//				_length = vv;
 			}
 		} else if (k == "content_digest") {
-			_content_digest = v;
+//			_content_digest = v;
 		} else if (k == "content_audio_stream" || (!version && k == "audio_stream")) {
-			_content_audio_streams.push_back (audio_stream_factory (v, version));
+//			_content_audio_streams.push_back (audio_stream_factory (v, version));
 		} else if (k == "external_audio_stream") {
-			_sndfile_stream = audio_stream_factory (v, version);
+//			_sndfile_stream = audio_stream_factory (v, version);
 		} else if (k == "subtitle_stream") {
-			_subtitle_streams.push_back (subtitle_stream_factory (v, version));
+//			_subtitle_streams.push_back (subtitle_stream_factory (v, version));
 		} else if (k == "source_frame_rate") {
-			_source_frame_rate = atof (v.c_str ());
+//			_source_frame_rate = atof (v.c_str ());
 		} else if (version < 4 && k == "frames_per_second") {
-			_source_frame_rate = atof (v.c_str ());
+//			_source_frame_rate = atof (v.c_str ());
 			/* Fill in what would have been used for DCP frame rate by the older version */
-			_dcp_frame_rate = best_dcp_frame_rate (_source_frame_rate);
+//			_dcp_frame_rate = best_dcp_frame_rate (_source_frame_rate);
 		}
 	}
 
-	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;
 }
 
@@ -661,47 +641,21 @@ Film::file (string f) const
 	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()) {
+	/* XXX: how often is this method called? */
+	
+	boost::shared_ptr<Playlist> p = playlist ();
+	if (p->has_audio ()) {
 		return 0;
 	}
 	
 	/* Resample to a DCI-approved sample rate */
-	double t = dcp_audio_sample_rate (audio_stream()->sample_rate());
+	double t = dcp_audio_sample_rate (p->audio_frame_rate());
 
-	FrameRateConversion frc (source_frame_rate(), dcp_frame_rate());
+	FrameRateConversion frc (p->video_frame_rate(), dcp_frame_rate());
 
 	/* Compensate if the DCP is being run at a different frame rate
 	   to the source; that is, if the video is run such that it will
@@ -710,18 +664,12 @@ Film::target_audio_sample_rate () const
 	*/
 
 	if (frc.change_speed) {
-		t *= source_frame_rate() * frc.factor() / dcp_frame_rate();
+		t *= p->video_frame_rate() * frc.factor() / dcp_frame_rate();
 	}
 
 	return rint (t);
 }
 
-int
-Film::still_duration_in_frames () const
-{
-	return still_duration() * source_frame_rate();
-}
-
 /** @return a DCI-compliant name for a DCP of this film */
 string
 Film::dci_name (bool if_created_now) const
@@ -768,7 +716,8 @@ Film::dci_name (bool if_created_now) const
 		}
 	}
 
-	switch (audio_channels()) {
+	/* XXX */
+	switch (2) {
 	case 1:
 		d << "_10";
 		break;
@@ -846,98 +795,6 @@ Film::set_use_dci_name (bool u)
 	signal_changed (USE_DCI_NAME);
 }
 
-void
-Film::set_content (string c)
-{
-	string check = directory ();
-
-	boost::filesystem::path slash ("/");
-	string platform_slash = slash.make_preferred().string ();
-
-	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> ();
-
-	/* Start off using content audio */
-	set_use_content_audio (true);
-
-	/* Create a temporary decoder so that we can get information
-	   about the content.
-	*/
-
-	try {
-		Decoders d = decoder_factory (shared_from_this(), DecodeOptions());
-		
-		set_size (d.video->native_size ());
-		set_source_frame_rate (d.video->frames_per_second ());
-		set_dcp_frame_rate (best_dcp_frame_rate (source_frame_rate ()));
-		set_subtitle_streams (d.video->subtitle_streams ());
-		if (d.audio) {
-			set_content_audio_streams (d.audio->audio_streams ());
-		}
-
-		{
-			boost::mutex::scoped_lock lm (_state_mutex);
-			_content = c;
-		}
-		
-		signal_changed (CONTENT);
-		
-		/* Start off with the first audio and subtitle streams */
-		if (d.audio && !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());
-		}
-		
-		examine_content ();
-
-	} catch (...) {
-
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_content = old_content;
-		throw;
-
-	}
-
-	/* Default format */
-	switch (content_type()) {
-	case STILL:
-		set_format (Format::from_id ("var-185"));
-		break;
-	case VIDEO:
-		set_format (Format::from_id ("185"));
-		break;
-	}
-
-	/* Still image DCPs must use external audio */
-	if (content_type() == STILL) {
-		set_use_content_audio (false);
-	}
-}
-
 void
 Film::set_trust_content_header (bool t)
 {
@@ -950,7 +807,8 @@ Film::set_trust_content_header (bool t)
 
 	if (!_trust_content_header && !content().empty()) {
 		/* We just said that we don't trust the content's header */
-		examine_content ();
+		/* XXX */
+//		examine_content ();
 	}
 }
 	       
@@ -1091,43 +949,6 @@ Film::set_dcp_ab (bool a)
 	signal_changed (DCP_AB);
 }
 
-void
-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<SndfileDecoder> decoder (new SndfileDecoder (shared_from_this(), DecodeOptions()));
-	if (decoder->audio_stream()) {
-		_sndfile_stream = decoder->audio_stream ();
-	}
-	
-	signal_changed (EXTERNAL_AUDIO);
-}
-
-void
-Film::set_use_content_audio (bool e)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_use_content_audio = e;
-	}
-
-	signal_changed (USE_CONTENT_AUDIO);
-}
-
 void
 Film::set_audio_gain (float g)
 {
@@ -1148,26 +969,6 @@ Film::set_audio_delay (int d)
 	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);
-}
-
-void
-Film::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_subtitle_stream = s;
-	}
-	signal_changed (SUBTITLE_STREAM);
-}
-
 void
 Film::set_with_subtitles (bool w)
 {
@@ -1239,76 +1040,6 @@ Film::set_dcp_frame_rate (int f)
 	signal_changed (DCP_FRAME_RATE);
 }
 
-void
-Film::set_size (libdcp::Size s)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_size = s;
-	}
-	signal_changed (SIZE);
-}
-
-void
-Film::set_length (SourceFrame l)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_length = l;
-	}
-	signal_changed (LENGTH);
-}
-
-void
-Film::unset_length ()
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_length = boost::none;
-	}
-	signal_changed (LENGTH);
-}
-
-void
-Film::set_content_digest (string d)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_content_digest = d;
-	}
-	_dirty = true;
-}
-
-void
-Film::set_content_audio_streams (vector<shared_ptr<AudioStream> > s)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_content_audio_streams = s;
-	}
-	signal_changed (CONTENT_AUDIO_STREAMS);
-}
-
-void
-Film::set_subtitle_streams (vector<shared_ptr<SubtitleStream> > s)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_subtitle_streams = s;
-	}
-	signal_changed (SUBTITLE_STREAMS);
-}
-
-void
-Film::set_source_frame_rate (float f)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_source_frame_rate = f;
-	}
-	signal_changed (SOURCE_FRAME_RATE);
-}
-	
 void
 Film::signal_changed (Property p)
 {
@@ -1322,33 +1053,12 @@ Film::signal_changed (Property p)
 	}
 }
 
-int
-Film::audio_channels () const
-{
-	shared_ptr<AudioStream> s = audio_stream ();
-	if (!s) {
-		return 0;
-	}
-
-	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 _sndfile_stream;
-}
-
 string
 Film::info_path (int f) const
 {
@@ -1404,20 +1114,22 @@ Film::have_dcp () const
 	return true;
 }
 
-bool
-Film::has_audio () const
+shared_ptr<Playlist>
+Film::playlist () const
 {
-	if (use_content_audio()) {
-		return audio_stream();
-	}
+	boost::mutex::scoped_lock lm (_state_mutex);
+	return shared_ptr<Playlist> (new Playlist (shared_from_this (), _content));
+}
 
-	vector<string> const e = external_audio ();
-	for (vector<string>::const_iterator i = e.begin(); i != e.end(); ++i) {
-		if (!i->empty ()) {
-			return true;
-		}
+void
+Film::add_content (shared_ptr<Content> c)
+{
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_content.push_back (c);
 	}
 
-	return false;
-}
+	signal_changed (CONTENT);
 
+	examine_content (c);
+}
diff --git a/src/lib/film.h b/src/lib/film.h
index 2e05d64f4..afd57b7c2 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -37,7 +37,6 @@ extern "C" {
 }
 #include "dcp_content_type.h"
 #include "util.h"
-#include "stream.h"
 #include "dci_metadata.h"
 
 class Format;
@@ -48,6 +47,7 @@ class ExamineContentJob;
 class AnalyseAudioJob;
 class ExternalAudioStream;
 class Content;
+class Playlist;
 
 /** @class Film
  *  @brief A representation of a video, maybe with sound.
@@ -69,7 +69,7 @@ public:
 	std::string video_mxf_filename () const;
 	std::string audio_analysis_path () const;
 
-	void examine_content ();
+	void examine_content (boost::shared_ptr<Content>);
 	void analyse_audio ();
 	void send_dcp_to_tms ();
 
@@ -87,9 +87,6 @@ public:
 	std::string file (std::string f) const;
 	std::string dir (std::string d) const;
 
-	std::string content_path () const;
-	ContentType content_type () const;
-	
 	int target_audio_sample_rate () const;
 	
 	void write_metadata () const;
@@ -104,12 +101,12 @@ public:
 		return _dirty;
 	}
 
-	int audio_channels () const;
-
 	void set_dci_date_today ();
 
 	bool have_dcp () const;
 
+	boost::shared_ptr<Playlist> playlist () const;
+
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
 	*/
@@ -118,6 +115,7 @@ public:
 		NAME,
 		USE_DCI_NAME,
 		TRUST_CONTENT_HEADER,
+		CONTENT,
 		DCP_CONTENT_TYPE,
 		FORMAT,
 		CROP,
@@ -162,6 +160,11 @@ public:
 		return _trust_content_header;
 	}
 
+	std::list<boost::shared_ptr<Content> > content () const {
+		boost::mutex::scoped_lock lm (_state_mutex);
+		return _content;
+	}
+
 	DCPContentType const * dcp_content_type () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _dcp_content_type;
@@ -212,11 +215,6 @@ public:
 		return _audio_delay;
 	}
 
-	boost::shared_ptr<SubtitleStream> subtitle_stream () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _subtitle_stream;
-	}
-
 	bool with_subtitles () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _with_subtitles;
@@ -252,15 +250,13 @@ public:
 		return _dcp_frame_rate;
 	}
 
-	boost::shared_ptr<AudioStream> audio_stream () const;
-	bool has_audio () const;
-	
 	/* SET */
 
 	void set_directory (std::string);
 	void set_name (std::string);
 	void set_use_dci_name (bool);
 	void set_trust_content_header (bool);
+	void add_content (boost::shared_ptr<Content>);
 	void set_dcp_content_type (DCPContentType const *);
 	void set_format (Format const *);
 	void set_crop (Crop);
@@ -297,8 +293,6 @@ private:
 	/** Log to write to */
 	boost::shared_ptr<Log> _log;
 
-	/** Any running ExamineContentJob, or 0 */
-	boost::shared_ptr<ExamineContentJob> _examine_content_job;
 	/** Any running AnalyseAudioJob, or 0 */
 	boost::shared_ptr<AnalyseAudioJob> _analyse_audio_job;
 
@@ -318,7 +312,8 @@ private:
 	std::string _name;
 	/** True if a auto-generated DCI-compliant name should be used for our DCP */
 	bool _use_dci_name;
-	std::list<boost::shared_ptr<Content> > _content;
+	typedef std::list<boost::shared_ptr<Content> > ContentList;
+	ContentList _content;
 	/** If this is true, we will believe the length specified by the content
 	 *  file's header; if false, we will run through the whole content file
 	 *  the first time we see it in order to obtain the length.
diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 045cbaa6a..a52c030fe 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -57,7 +57,7 @@ using libdcp::Size;
  *  @param s Size of the images to process.
  *  @param p Pixel format of the images to process.
  */
-FilterGraph::FilterGraph (shared_ptr<Film> film, FFmpegDecoder* decoder, libdcp::Size s, AVPixelFormat p)
+FilterGraph::FilterGraph (shared_ptr<const Film> film, FFmpegDecoder* decoder, libdcp::Size s, AVPixelFormat p)
 	: _buffer_src_context (0)
 	, _buffer_sink_context (0)
 	, _size (s)
diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 7e4e8422b..db86a677d 100644
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -37,7 +37,7 @@ class FFmpegDecoder;
 class FilterGraph
 {
 public:
-	FilterGraph (boost::shared_ptr<Film> film, FFmpegDecoder* decoder, libdcp::Size s, AVPixelFormat p);
+	FilterGraph (boost::shared_ptr<const Film>, FFmpegDecoder* decoder, libdcp::Size s, AVPixelFormat p);
 
 	bool can_process (libdcp::Size s, AVPixelFormat p) const;
 	std::list<boost::shared_ptr<Image> > process (AVFrame const * frame);
diff --git a/src/lib/format.cc b/src/lib/format.cc
index b506c7000..05b71f2e5 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -29,6 +29,7 @@
 #include <iostream>
 #include "format.h"
 #include "film.h"
+#include "playlist.h"
 
 #include "i18n.h"
 
@@ -206,16 +207,16 @@ FixedFormat::FixedFormat (int r, libdcp::Size dcp, string id, string n, string d
  *  (so there are dcp_padding() pixels on the left and dcp_padding() on the right)
  */
 int
-Format::dcp_padding (shared_ptr<const Film> f) const
+Format::dcp_padding (shared_ptr<const Playlist> p) const
 {
-	int p = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_integer(f) / 100.0)) / 2.0);
+	int pad = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_integer(p) / 100.0)) / 2.0);
 
 	/* This comes out -ve for Scope; bodge it */
-	if (p < 0) {
-		p = 0;
+	if (pad < 0) {
+		pad = 0;
 	}
 	
-	return p;
+	return pad;
 }
 
 float
@@ -231,15 +232,15 @@ VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d,
 }
 
 int
-VariableFormat::ratio_as_integer (shared_ptr<const Film> f) const
+VariableFormat::ratio_as_integer (shared_ptr<const Playlist> p) const
 {
-	return rint (ratio_as_float (f) * 100);
+	return rint (ratio_as_float (p) * 100);
 }
 
 float
-VariableFormat::ratio_as_float (shared_ptr<const Film> f) const
+VariableFormat::ratio_as_float (shared_ptr<const Playlist> p) const
 {
-	return float (f->size().width) / f->size().height;
+	return float (p->video_size().width) / p->video_size().height;
 }
 
 /** @return A name to be presented to the user */
diff --git a/src/lib/format.h b/src/lib/format.h
index 305524628..94c2253de 100644
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -26,7 +26,7 @@
 #include <vector>
 #include "util.h"
 
-class Film;
+class Playlist;
 
 class Format
 {
@@ -42,15 +42,15 @@ public:
 	/** @return the aspect ratio multiplied by 100
 	 *  (e.g. 239 for Cinemascope 2.39:1)
 	 */
-	virtual int ratio_as_integer (boost::shared_ptr<const Film> f) const = 0;
+	virtual int ratio_as_integer (boost::shared_ptr<const Playlist> f) const = 0;
 
 	/** @return the ratio as a floating point number */
-	virtual float ratio_as_float (boost::shared_ptr<const Film> f) const = 0;
+	virtual float ratio_as_float (boost::shared_ptr<const Playlist> f) const = 0;
 
 	/** @return the ratio of the container (including any padding) as a floating point number */
 	float container_ratio_as_float () const;
 
-	int dcp_padding (boost::shared_ptr<const Film> f) const;
+	int dcp_padding (boost::shared_ptr<const Playlist>) const;
 
 	/** @return size in pixels of the images that we should
 	 *  put in a DCP for this ratio.  This size will not correspond
@@ -115,11 +115,11 @@ class FixedFormat : public Format
 public:
 	FixedFormat (int, libdcp::Size, std::string, std::string, std::string, std::string);
 
-	int ratio_as_integer (boost::shared_ptr<const Film>) const {
+	int ratio_as_integer (boost::shared_ptr<const Playlist>) const {
 		return _ratio;
 	}
 
-	float ratio_as_float (boost::shared_ptr<const Film>) const {
+	float ratio_as_float (boost::shared_ptr<const Playlist>) const {
 		return _ratio / 100.0;
 	}
 
@@ -136,8 +136,8 @@ class VariableFormat : public Format
 public:
 	VariableFormat (libdcp::Size, std::string, std::string, std::string, std::string);
 
-	int ratio_as_integer (boost::shared_ptr<const Film> f) const;
-	float ratio_as_float (boost::shared_ptr<const Film> f) const;
+	int ratio_as_integer (boost::shared_ptr<const Playlist> f) const;
+	float ratio_as_float (boost::shared_ptr<const Playlist> f) const;
 
 	std::string name () const;
 };
diff --git a/src/lib/imagemagick_content.cc b/src/lib/imagemagick_content.cc
new file mode 100644
index 000000000..d0887c0aa
--- /dev/null
+++ b/src/lib/imagemagick_content.cc
@@ -0,0 +1,2 @@
+#include "imagemagick_content.h"
+
diff --git a/src/lib/imagemagick_content.h b/src/lib/imagemagick_content.h
index 2a8197b69..985aa0e8d 100644
--- a/src/lib/imagemagick_content.h
+++ b/src/lib/imagemagick_content.h
@@ -2,5 +2,6 @@
 
 class ImageMagickContent : public VideoContent
 {
-
+public:
+	ImageMagickContent (boost::filesystem::path);
 };
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 5dc0b7b06..aa3c64f93 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -20,6 +20,7 @@
 #include <iostream>
 #include <boost/filesystem.hpp>
 #include <Magick++.h>
+#include "imagemagick_content.h"
 #include "imagemagick_decoder.h"
 #include "image.h"
 #include "film.h"
@@ -32,37 +33,20 @@ using boost::shared_ptr;
 using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (
-	boost::shared_ptr<Film> f, DecodeOptions o)
+	shared_ptr<const Film> f, shared_ptr<ImageMagickContent> c, DecodeOptions o)
 	: Decoder (f, o)
-	, VideoDecoder (f, o)
+	, VideoDecoder (f, c, o)
+	, _imagemagick_content (c)
+	, _position (0)
 {
-	if (boost::filesystem::is_directory (_film->content_path())) {
-		for (
-			boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (_film->content_path());
-			i != boost::filesystem::directory_iterator();
-			++i) {
-
-			if (still_image_file (i->path().string())) {
-				_files.push_back (i->path().string());
-			}
-		}
-	} else {
-		_files.push_back (_film->content_path ());
-	}
-
-	_iter = _files.begin ();
+	
 }
 
 libdcp::Size
 ImageMagickDecoder::native_size () const
 {
-	if (_files.empty ()) {
-		throw DecodeError (_("no still image files found"));
-	}
-
-	/* Look at the first file and assume its size holds for all */
 	using namespace MagickCore;
-	Magick::Image* image = new Magick::Image (_film->content_path ());
+	Magick::Image* image = new Magick::Image (_imagemagick_content->file().string());
 	libdcp::Size const s = libdcp::Size (image->columns(), image->rows());
 	delete image;
 
@@ -72,16 +56,15 @@ ImageMagickDecoder::native_size () const
 bool
 ImageMagickDecoder::pass ()
 {
-	if (_iter == _files.end()) {
-		if (video_frame() >= _film->still_duration_in_frames()) {
-			return true;
-		}
-
+	if (_position > 0 && _position < _imagemagick_content->video_length ()) {
 		repeat_last_video ();
+		_position++;
 		return false;
+	} else if (_position >= _imagemagick_content->video_length ()) {
+		return true;
 	}
 	
-	Magick::Image* magick_image = new Magick::Image (_film->content_path ());
+	Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
 	
 	libdcp::Size size = native_size ();
 	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, false));
@@ -104,7 +87,7 @@ ImageMagickDecoder::pass ()
 	
 	emit_video (image, 0);
 
-	++_iter;
+	++_position;
 	return false;
 }
 
@@ -118,10 +101,8 @@ ImageMagickDecoder::pixel_format () const
 bool
 ImageMagickDecoder::seek_to_last ()
 {
-	if (_iter == _files.end()) {
-		_iter = _files.begin();
-	} else {
-		--_iter;
+	if (_position > 0) {
+		--_position;
 	}
 
 	return false;
@@ -130,16 +111,14 @@ ImageMagickDecoder::seek_to_last ()
 bool
 ImageMagickDecoder::seek (double t)
 {
-	int const f = t * frames_per_second();
-	
-	_iter = _files.begin ();
-	for (int i = 0; i < f; ++i) {
-		if (_iter == _files.end()) {
-			return true;
-		}
-		++_iter;
+	int const f = t * _imagemagick_content->video_frame_rate ();
+
+	if (f >= _imagemagick_content->video_length()) {
+		_position = 0;
+		return true;
 	}
-	
+
+	_position = f;
 	return false;
 }
 
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 2f4e2c967..b04bd88b1 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -23,10 +23,12 @@ namespace Magick {
 	class Image;
 }
 
+class ImageMagickContent;
+
 class ImageMagickDecoder : public VideoDecoder
 {
 public:
-	ImageMagickDecoder (boost::shared_ptr<Film>, DecodeOptions);
+	ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<ImageMagickContent>, DecodeOptions);
 
 	float frames_per_second () const {
 		/* We don't know */
@@ -35,7 +37,7 @@ public:
 
 	libdcp::Size native_size () const;
 
-	SourceFrame length () const {
+	ContentVideoFrame video_length () const {
 		/* We don't know */
 		return 0;
 	}
@@ -54,9 +56,9 @@ public:
 
 	bool seek (double);
 	bool seek_to_last ();
+	bool pass ();
 
 protected:
-	bool pass ();
 	PixelFormat pixel_format () const;
 
 	int time_base_numerator () const {
@@ -79,7 +81,7 @@ protected:
 
 private:
 	void film_changed (Film::Property);
-	
-	std::list<std::string> _files;
-	std::list<std::string>::iterator _iter;
+
+	boost::shared_ptr<ImageMagickContent> _imagemagick_content;
+	ContentVideoFrame _position;
 };
diff --git a/src/lib/job.cc b/src/lib/job.cc
index ace02b8b3..ff0332d6d 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -34,8 +34,6 @@ using std::list;
 using std::stringstream;
 using boost::shared_ptr;
 
-/** @param s Film that we are operating on.
- */
 Job::Job (shared_ptr<Film> f)
 	: _film (f)
 	, _thread (0)
diff --git a/src/lib/job.h b/src/lib/job.h
index fd036bce2..f5175c525 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -38,7 +38,7 @@ class Film;
 class Job : public boost::enable_shared_from_this<Job>
 {
 public:
-	Job (boost::shared_ptr<Film> s);
+	Job (boost::shared_ptr<Film>);
 	virtual ~Job() {}
 
 	/** @return user-readable name of this job */
@@ -87,7 +87,6 @@ protected:
 	void set_state (State);
 	void set_error (std::string s, std::string d);
 
-	/** Film for this job */
 	boost::shared_ptr<Film> _film;
 
 private:
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
new file mode 100644
index 000000000..17ecd2f37
--- /dev/null
+++ b/src/lib/playlist.cc
@@ -0,0 +1,266 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/shared_ptr.hpp>
+#include "playlist.h"
+#include "sndfile_content.h"
+#include "sndfile_decoder.h"
+#include "ffmpeg_content.h"
+#include "ffmpeg_decoder.h"
+#include "imagemagick_content.h"
+#include "imagemagick_decoder.h"
+
+using std::list;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
+
+Playlist::Playlist (shared_ptr<const Film> f, list<shared_ptr<Content> > c)
+	: _video_from (VIDEO_NONE)
+	, _audio_from (AUDIO_NONE)
+	, _ffmpeg_decoder_done (false)
+{
+	for (list<shared_ptr<Content> >::const_iterator i = c.begin(); i != c.end(); ++i) {
+		shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
+		if (fc) {
+			assert (!_ffmpeg);
+			_ffmpeg = fc;
+			_video_from = VIDEO_FFMPEG;
+			if (_audio_from == AUDIO_NONE) {
+				_audio_from = AUDIO_FFMPEG;
+			}
+		}
+		
+		shared_ptr<ImageMagickContent> ic = dynamic_pointer_cast<ImageMagickContent> (*i);
+		if (ic) {
+			_imagemagick.push_back (ic);
+			if (_video_from == VIDEO_NONE) {
+				_video_from = VIDEO_IMAGEMAGICK;
+			}
+		}
+
+		shared_ptr<SndfileContent> sc = dynamic_pointer_cast<SndfileContent> (*i);
+		if (sc) {
+			_sndfile.push_back (sc);
+			_audio_from = AUDIO_SNDFILE;
+		}
+	}
+
+	if (_video_from == VIDEO_FFMPEG || _audio_from == AUDIO_FFMPEG) {
+		DecodeOptions o;
+		/* XXX: decodeoptions */
+		_ffmpeg_decoder.reset (new FFmpegDecoder (f, _ffmpeg, o));
+	}
+	
+	if (_video_from == VIDEO_FFMPEG) {
+		_ffmpeg_decoder->connect_video (shared_from_this ());
+	}
+
+	if (_audio_from == AUDIO_FFMPEG) {
+		_ffmpeg_decoder->connect_audio (shared_from_this ());
+	}
+
+	if (_video_from == VIDEO_IMAGEMAGICK) {
+		for (list<shared_ptr<ImageMagickContent> >::iterator i = _imagemagick.begin(); i != _imagemagick.end(); ++i) {
+			DecodeOptions o;
+			/* XXX: decodeoptions */
+			shared_ptr<ImageMagickDecoder> d (new ImageMagickDecoder (f, *i, o));
+			_imagemagick_decoders.push_back (d);
+			d->connect_video (shared_from_this ());
+		}
+
+		_imagemagick_decoder = _imagemagick_decoders.begin ();
+	}
+
+	if (_audio_from == AUDIO_SNDFILE) {
+		for (list<shared_ptr<SndfileContent> >::iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
+			DecodeOptions o;
+			/* XXX: decodeoptions */
+			shared_ptr<SndfileDecoder> d (new SndfileDecoder (f, *i, o));
+			_sndfile_decoders.push_back (d);
+			d->connect_audio (shared_from_this ());
+		}
+	}
+}
+
+ContentAudioFrame
+Playlist::audio_length () const
+{
+	switch (_audio_from) {
+	case AUDIO_NONE:
+		return 0;
+	case AUDIO_FFMPEG:
+		return _ffmpeg->audio_length ();
+	case AUDIO_SNDFILE:
+	{
+		ContentAudioFrame l = 0;
+		for (list<shared_ptr<SndfileContent> >::const_iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
+			l += (*i)->audio_length ();
+		}
+		return l;
+	}
+	}
+
+	return 0;
+}
+
+int
+Playlist::audio_channels () const
+{
+	switch (_audio_from) {
+	case AUDIO_NONE:
+		return 0;
+	case AUDIO_FFMPEG:
+		return _ffmpeg->audio_channels ();
+	case AUDIO_SNDFILE:
+	{
+		int c = 0;
+		for (list<shared_ptr<SndfileContent> >::const_iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
+			c += (*i)->audio_channels ();
+		}
+		return c;
+	}
+	}
+
+	return 0;
+}
+
+int
+Playlist::audio_frame_rate () const
+{
+	switch (_audio_from) {
+	case AUDIO_NONE:
+		return 0;
+	case AUDIO_FFMPEG:
+		return _ffmpeg->audio_frame_rate ();
+	case AUDIO_SNDFILE:
+		return _sndfile.front()->audio_frame_rate ();
+	}
+
+	return 0;
+}
+
+int64_t
+Playlist::audio_channel_layout () const
+{
+	switch (_audio_from) {
+	case AUDIO_NONE:
+		return 0;
+	case AUDIO_FFMPEG:
+		return _ffmpeg->audio_channel_layout ();
+	case AUDIO_SNDFILE:
+		/* XXX */
+		return 0;
+	}
+
+	return 0;
+}
+
+float
+Playlist::video_frame_rate () const
+{
+	switch (_video_from) {
+	case VIDEO_NONE:
+		return 0;
+	case VIDEO_FFMPEG:
+		return _ffmpeg->video_frame_rate ();
+	case VIDEO_IMAGEMAGICK:
+		return 24;
+	}
+
+	return 0;
+}
+
+libdcp::Size
+Playlist::video_size () const
+{
+	switch (_video_from) {
+	case VIDEO_NONE:
+		return libdcp::Size ();
+	case VIDEO_FFMPEG:
+		return _ffmpeg->video_size ();
+	case VIDEO_IMAGEMAGICK:
+		/* XXX */
+		return _imagemagick.front()->video_size ();
+	}
+
+	return libdcp::Size ();
+}
+
+bool
+Playlist::has_audio () const
+{
+	return _audio_from != AUDIO_NONE;
+}
+		
+void
+Playlist::disable_video ()
+{
+	_video_from = VIDEO_NONE;
+}
+
+bool
+Playlist::pass ()
+{
+	bool done = true;
+	
+	if (_video_from == VIDEO_FFMPEG || _audio_from == AUDIO_FFMPEG) {
+		if (!_ffmpeg_decoder_done) {
+			if (_ffmpeg_decoder->pass ()) {
+				_ffmpeg_decoder_done = true;
+			} else {
+				done = false;
+			}
+		}
+	}
+
+	if (_video_from == VIDEO_IMAGEMAGICK) {
+		if (_imagemagick_decoder != _imagemagick_decoders.end ()) {
+			if ((*_imagemagick_decoder)->pass ()) {
+				_imagemagick_decoder++;
+			}
+
+			if (_imagemagick_decoder != _imagemagick_decoders.end ()) {
+				done = false;
+			}
+		}
+	}
+
+	/* XXX: sndfile */
+
+	return done;
+}
+
+void
+Playlist::set_progress (shared_ptr<Job> job)
+{
+	/* XXX */
+}
+
+void
+Playlist::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
+{
+	Video (i, same, s);
+}
+
+void
+Playlist::process_audio (shared_ptr<AudioBuffers> b)
+{
+	Audio (b);
+}
+
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 4add76344..b42d46036 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -17,14 +17,66 @@
 
 */
 
+#include <list>
 #include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include "video_source.h"
+#include "audio_source.h"
 #include "video_sink.h"
+#include "audio_sink.h"
 
 class Content;
+class FFmpegContent;
+class FFmpegDecoder;
+class ImageMagickContent;
+class ImageMagickDecoder;
+class SndfileContent;
+class SndfileDecoder;
+class Job;
+class Film;
 
-class Playlist : public VideoSource, public AudioSource
+class Playlist : public VideoSource, public AudioSource, public VideoSink, public AudioSink, public boost::enable_shared_from_this<Playlist>
 {
 public:
-	Playlist (std::list<boost::shared_ptr<Content> >);
+	Playlist (boost::shared_ptr<const Film>, std::list<boost::shared_ptr<Content> >);
+
+	ContentAudioFrame audio_length () const;
+	int audio_channels () const;
+	int audio_frame_rate () const;
+	int64_t audio_channel_layout () const;
+	bool has_audio () const;
+	
+	float video_frame_rate () const;
+	libdcp::Size video_size () const;
+
+	void disable_video ();
+
+	bool pass ();
+	void set_progress (boost::shared_ptr<Job>);
+
+private:
+	void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
+	void process_audio (boost::shared_ptr<AudioBuffers>);
+	
+	enum {
+		VIDEO_NONE,
+		VIDEO_FFMPEG,
+		VIDEO_IMAGEMAGICK
+	} _video_from;
+	
+	enum {
+		AUDIO_NONE,
+		AUDIO_FFMPEG,
+		AUDIO_SNDFILE
+	} _audio_from;
+
+	boost::shared_ptr<FFmpegContent> _ffmpeg;
+	std::list<boost::shared_ptr<ImageMagickContent> > _imagemagick;
+	std::list<boost::shared_ptr<SndfileContent> > _sndfile;
+
+	boost::shared_ptr<FFmpegDecoder> _ffmpeg_decoder;
+	bool _ffmpeg_decoder_done;
+	std::list<boost::shared_ptr<ImageMagickDecoder> > _imagemagick_decoders;
+	std::list<boost::shared_ptr<ImageMagickDecoder> >::iterator _imagemagick_decoder;
+	std::list<boost::shared_ptr<SndfileDecoder> > _sndfile_decoders;
 };
diff --git a/src/lib/scp_dcp_job.h b/src/lib/scp_dcp_job.h
index 08d8e2c78..8c16d53fb 100644
--- a/src/lib/scp_dcp_job.h
+++ b/src/lib/scp_dcp_job.h
@@ -34,7 +34,7 @@ public:
 
 private:
 	void set_status (std::string);
-	
+
 	mutable boost::mutex _status_mutex;
 	std::string _status;
 };
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
new file mode 100644
index 000000000..8f5b28901
--- /dev/null
+++ b/src/lib/sndfile_content.cc
@@ -0,0 +1,41 @@
+#include "sndfile_content.h"
+#include "compose.hpp"
+
+#include "i18n.h"
+
+using namespace std;
+
+string
+SndfileContent::summary () const
+{
+	return String::compose (_("Sound file: %1"), file().filename ());
+}
+
+int
+SndfileContent::audio_channels () const
+{
+	/* XXX */
+	return 0;
+}
+
+ContentAudioFrame
+SndfileContent::audio_length () const
+{
+	/* XXX */
+	return 0;
+}
+
+int
+SndfileContent::audio_frame_rate () const
+{
+	/* XXX */
+	return 0;
+}
+
+int64_t
+SndfileContent::audio_channel_layout () const
+{
+	/* XXX */
+	return 0;
+}
+	
diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 382e55c40..e84617ed3 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -3,5 +3,11 @@
 class SndfileContent : public AudioContent
 {
 public:
+	std::string summary () const;
 
+        /* AudioDecoder */
+        int audio_channels () const;
+        ContentAudioFrame audio_length () const;
+        int audio_frame_rate () const;
+        int64_t audio_channel_layout () const;
 };
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 0e3e5e234..8848ff4f8 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -19,6 +19,7 @@
 
 #include <iostream>
 #include <sndfile.h>
+#include "sndfile_content.h"
 #include "sndfile_decoder.h"
 #include "film.h"
 #include "exceptions.h"
@@ -33,156 +34,53 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
-SndfileDecoder::SndfileDecoder (shared_ptr<Film> f, DecodeOptions o)
+/* XXX */
+
+SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<SndfileContent> c, DecodeOptions o)
 	: Decoder (f, o)
-	, AudioDecoder (f, o)
+	, AudioDecoder (f, c, o)
 {
 	sf_count_t frames;
-	vector<SNDFILE*> sf = open_files (frames);
-	close_files (sf);
+	SNDFILE* sf = open_file (frames);
+	sf_close (sf);
 }
 
-vector<SNDFILE*>
-SndfileDecoder::open_files (sf_count_t & frames)
+SNDFILE*
+SndfileDecoder::open_file (sf_count_t & frames)
 {
-	vector<string> const files = _film->external_audio ();
-
-	int N = 0;
-	for (size_t i = 0; i < files.size(); ++i) {
-		if (!files[i].empty()) {
-			N = i + 1;
-		}
-	}
-
-	if (N == 0) {
-		return vector<SNDFILE*> ();
-	}
-
-	bool first = true;
 	frames = 0;
 	
-	vector<SNDFILE*> sndfiles;
-	for (size_t i = 0; i < (size_t) N; ++i) {
-		if (files[i].empty ()) {
-			sndfiles.push_back (0);
-		} else {
-			SF_INFO info;
-			SNDFILE* s = sf_open (files[i].c_str(), SFM_READ, &info);
-			if (!s) {
-				throw DecodeError (_("could not open external audio file for reading"));
-			}
-
-			if (info.channels != 1) {
-				throw DecodeError (_("external audio files must be mono"));
-			}
-			
-			sndfiles.push_back (s);
-
-			if (first) {
-				shared_ptr<SndfileStream> st (
-					new SndfileStream (
-						info.samplerate, av_get_default_channel_layout (N)
-						)
-					);
-				
-				_audio_streams.push_back (st);
-				_audio_stream = st;
-				frames = info.frames;
-				first = false;
-			} else {
-				if (info.frames != frames) {
-					throw DecodeError (_("external audio files have differing lengths"));
-				}
-			}
-		}
+	SF_INFO info;
+	SNDFILE* s = sf_open (_sndfile_content->file().string().c_str(), SFM_READ, &info);
+	if (!s) {
+		throw DecodeError (_("could not open external audio file for reading"));
 	}
 
-	return sndfiles;
+	frames = info.frames;
+	return s;
 }
 
 bool
 SndfileDecoder::pass ()
 {
 	sf_count_t frames;
-	vector<SNDFILE*> sndfiles = open_files (frames);
-	if (sndfiles.empty()) {
-		return true;
-	}
+	SNDFILE* sndfile = open_file (frames);
 
 	/* Do things in half second blocks as I think there may be limits
 	   to what FFmpeg (and in particular the resampler) can cope with.
 	*/
-	sf_count_t const block = _audio_stream->sample_rate() / 2;
+	sf_count_t const block = _sndfile_content->audio_frame_rate() / 2;
 
-	shared_ptr<AudioBuffers> audio (new AudioBuffers (_audio_stream->channels(), block));
+	shared_ptr<AudioBuffers> audio (new AudioBuffers (_sndfile_content->audio_channels(), block));
 	while (frames > 0) {
 		sf_count_t const this_time = min (block, frames);
-		for (size_t i = 0; i < sndfiles.size(); ++i) {
-			if (!sndfiles[i]) {
-				audio->make_silent (i);
-			} else {
-				sf_read_float (sndfiles[i], audio->data(i), block);
-			}
-		}
-
+		sf_read_float (sndfile, audio->data(0), this_time);
 		audio->set_frames (this_time);
 		Audio (audio);
 		frames -= this_time;
 	}
 
-	close_files (sndfiles);
+	sf_close (sndfile);
 
 	return true;
 }
-
-void
-SndfileDecoder::close_files (vector<SNDFILE*> const & sndfiles)
-{
-	for (size_t i = 0; i < sndfiles.size(); ++i) {
-		sf_close (sndfiles[i]);
-	}
-}
-
-shared_ptr<SndfileStream>
-SndfileStream::create ()
-{
-	return shared_ptr<SndfileStream> (new SndfileStream);
-}
-
-shared_ptr<SndfileStream>
-SndfileStream::create (string t, optional<int> v)
-{
-	if (!v) {
-		/* version < 1; no type in the string, and there's only FFmpeg streams anyway */
-		return shared_ptr<SndfileStream> ();
-	}
-
-	stringstream s (t);
-	string type;
-	s >> type;
-	if (type != N_("external")) {
-		return shared_ptr<SndfileStream> ();
-	}
-
-	return shared_ptr<SndfileStream> (new SndfileStream (t, v));
-}
-
-SndfileStream::SndfileStream (string t, optional<int> v)
-{
-	assert (v);
-
-	stringstream s (t);
-	string type;
-	s >> type >> _sample_rate >> _channel_layout;
-}
-
-SndfileStream::SndfileStream ()
-{
-
-}
-
-string
-SndfileStream::to_string () const
-{
-	return String::compose (N_("external %1 %2"), _sample_rate, _channel_layout);
-}
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index e16eab673..c06b97a60 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -20,35 +20,19 @@
 #include <sndfile.h>
 #include "decoder.h"
 #include "audio_decoder.h"
-#include "stream.h"
 
-class SndfileStream : public AudioStream
-{
-public:
-	SndfileStream (int sample_rate, int64_t layout)
-		: AudioStream (sample_rate, layout)
-	{}
-			       
-	std::string to_string () const;
-
-	static boost::shared_ptr<SndfileStream> create ();
-	static boost::shared_ptr<SndfileStream> create (std::string t, boost::optional<int> v);
-
-private:
-	friend class stream_test;
-	
-	SndfileStream ();
-	SndfileStream (std::string t, boost::optional<int> v);
-};
+class SndfileContent;
 
 class SndfileDecoder : public AudioDecoder
 {
 public:
-	SndfileDecoder (boost::shared_ptr<Film>, DecodeOptions);
+	SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<SndfileContent>, DecodeOptions);
 
 	bool pass ();
 
 private:
-	std::vector<SNDFILE*> open_files (sf_count_t &);
-	void close_files (std::vector<SNDFILE*> const &);
+	SNDFILE* open_file (sf_count_t &);
+	void close_file (SNDFILE*);
+
+	boost::shared_ptr<SndfileContent> _sndfile_content;
 };
diff --git a/src/lib/stream.cc b/src/lib/stream.cc
deleted file mode 100644
index bfe7b5eb4..000000000
--- a/src/lib/stream.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <sstream>
-#include "compose.hpp"
-#include "stream.h"
-#include "ffmpeg_decoder.h"
-#include "sndfile_decoder.h"
-
-#include "i18n.h"
-
-using std::string;
-using std::stringstream;
-using boost::shared_ptr;
-using boost::optional;
-
-/** Construct a SubtitleStream from a value returned from to_string().
- *  @param t String returned from to_string().
- *  @param v State file version.
- */
-SubtitleStream::SubtitleStream (string t, boost::optional<int>)
-{
-	stringstream n (t);
-	n >> _id;
-
-	size_t const s = t.find (' ');
-	if (s != string::npos) {
-		_name = t.substr (s + 1);
-	}
-}
-
-/** @return A canonical string representation of this stream */
-string
-SubtitleStream::to_string () const
-{
-	return String::compose (N_("%1 %2"), _id, _name);
-}
-
-/** Create a SubtitleStream from a value returned from to_string().
- *  @param t String returned from to_string().
- *  @param v State file version.
- */
-shared_ptr<SubtitleStream>
-SubtitleStream::create (string t, optional<int> v)
-{
-	return shared_ptr<SubtitleStream> (new SubtitleStream (t, v));
-}
-
-/** Create an AudioStream from a string returned from to_string().
- *  @param t String returned from to_string().
- *  @param v State file version.
- *  @return AudioStream, or 0.
- */
-shared_ptr<AudioStream>
-audio_stream_factory (string t, optional<int> v)
-{
-	shared_ptr<AudioStream> s;
-
-	s = FFmpegAudioStream::create (t, v);
-	if (!s) {
-		s = SndfileStream::create (t, v);
-	}
-
-	return s;
-}
-
-/** Create a SubtitleStream from a string returned from to_string().
- *  @param t String returned from to_string().
- *  @param v State file version.
- *  @return SubtitleStream, or 0.
- */
-shared_ptr<SubtitleStream>
-subtitle_stream_factory (string t, optional<int> v)
-{
-	return SubtitleStream::create (t, v);
-}
diff --git a/src/lib/stream.h b/src/lib/stream.h
deleted file mode 100644
index 16b06e4bc..000000000
--- a/src/lib/stream.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file src/lib/stream.h
- *  @brief Representations of audio and subtitle streams.
- *
- *  Some content may have multiple `streams' of audio and/or subtitles; perhaps
- *  for multiple languages, or for stereo / surround mixes.  These classes represent
- *  those streams, and know about their details.
- */
-
-#ifndef DVDOMATIC_STREAM_H
-#define DVDOMATIC_STREAM_H
-
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
-extern "C" {
-#include <libavutil/audioconvert.h>
-}
-
-/** @class Stream
- *  @brief Parent class for streams.
- */
-class Stream
-{
-public:
-	virtual ~Stream () {}
-	virtual std::string to_string () const = 0;
-};
-
-/** @class AudioStream
- *  @brief A stream of audio data.
- */
-struct AudioStream : public Stream
-{
-public:
-	AudioStream (int r, int64_t l)
-		: _sample_rate (r)
-		, _channel_layout (l)
-	{}
-
-	/* Only used for backwards compatibility for state file version < 1 */
-	void set_sample_rate (int s) {
-		_sample_rate = s;
-	}
-
-	int channels () const {
-		return av_get_channel_layout_nb_channels (_channel_layout);
-	}
-
-	int sample_rate () const {
-		return _sample_rate;
-	}
-
-	int64_t channel_layout () const {
-		return _channel_layout;
-	}
-
-protected:
-	AudioStream ()
-		: _sample_rate (0)
-		, _channel_layout (0)
-	{}
-
-	int _sample_rate;
-	int64_t _channel_layout;
-};
-
-/** @class SubtitleStream
- *  @brief A stream of subtitle data.
- */
-class SubtitleStream : public Stream
-{
-public:
-	SubtitleStream (std::string n, int i)
-		: _name (n)
-		, _id (i)
-	{}
-
-	std::string to_string () const;
-
-	std::string name () const {
-		return _name;
-	}
-
-	int id () const {
-		return _id;
-	}
-
-	static boost::shared_ptr<SubtitleStream> create (std::string t, boost::optional<int> v);
-
-private:
-	friend class stream_test;
-	
-	SubtitleStream (std::string t, boost::optional<int> v);
-	
-	std::string _name;
-	int _id;
-};
-
-boost::shared_ptr<AudioStream> audio_stream_factory (std::string t, boost::optional<int> version);
-boost::shared_ptr<SubtitleStream> subtitle_stream_factory (std::string t, boost::optional<int> version);
-
-#endif
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 234ebe051..f8810975b 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -62,8 +62,7 @@ TranscodeJob::run ()
 		_film->log()->log (N_("Transcode job starting"));
 		_film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
 
-		_encoder.reset (new Encoder (_film));
-		Transcoder w (_film, _decode_opt, this, _encoder);
+		Transcoder w (_film, _decode_opt, shared_from_this ());
 		w.go ();
 		set_progress (1);
 		set_state (FINISHED_OK);
@@ -83,11 +82,13 @@ TranscodeJob::run ()
 string
 TranscodeJob::status () const
 {
-	if (!_encoder) {
-		return _("0%");
-	}
+//	if (!_encoder) {
+//		return _("0%");
+//	}
 
-	float const fps = _encoder->current_frames_per_second ();
+	/* XXX */
+//	float const fps = _encoder->current_frames_per_second ();
+	float const fps = 0;
 	if (fps == 0) {
 		return Job::status ();
 	}
@@ -106,12 +107,15 @@ TranscodeJob::status () const
 int
 TranscodeJob::remaining_time () const
 {
+	return 0;
+#if 0
+	XXX
 	float fps = _encoder->current_frames_per_second ();
 	if (fps == 0) {
 		return 0;
 	}
 
-	if (!_film->length()) {
+	if (!_video->length()) {
 		return 0;
 	}
 
@@ -126,4 +130,5 @@ TranscodeJob::remaining_time () const
 	/* We assume that dcp_length() is valid, if it is set */
 	int const left = length - _encoder->video_frames_out();
 	return left / fps;
+#endif	
 }
diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index 9b69e4e65..a409ec97e 100644
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -44,5 +44,4 @@ protected:
 
 private:
 	DecodeOptions _decode_opt;
-	boost::shared_ptr<Encoder> _encoder;
 };
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index e0f3a03a2..19d067149 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -36,6 +36,7 @@
 #include "gain.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
+#include "playlist.h"
 
 using std::string;
 using boost::shared_ptr;
@@ -47,68 +48,42 @@ using boost::dynamic_pointer_cast;
  *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<Encoder> e)
+Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, shared_ptr<Job> j)
 	: _job (j)
-	, _encoder (e)
-	, _decoders (decoder_factory (f, o))
+	, _playlist (f->playlist ())
+	, _encoder (new Encoder (f, _playlist))
 {
-	assert (_encoder);
-
-	if (f->audio_stream()) {
-		shared_ptr<AudioStream> st = f->audio_stream();
-		_matcher.reset (new Matcher (f->log(), st->sample_rate(), f->source_frame_rate()));
-		_delay_line.reset (new DelayLine (f->log(), st->channels(), f->audio_delay() * st->sample_rate() / 1000));
+	if (_playlist->has_audio ()) {
+		_matcher.reset (new Matcher (f->log(), _playlist->audio_frame_rate(), _playlist->video_frame_rate()));
+		_delay_line.reset (new DelayLine (f->log(), _playlist->audio_channels(), f->audio_delay() * _playlist->audio_frame_rate() / 1000));
 		_gain.reset (new Gain (f->log(), f->audio_gain()));
 	}
 
-	/* Set up the decoder to use the film's set streams */
-	_decoders.video->set_subtitle_stream (f->subtitle_stream ());
-	if (_decoders.audio) {
-		_decoders.audio->set_audio_stream (f->audio_stream ());
-	}
-
 	if (_matcher) {
-		_decoders.video->connect_video (_matcher);
+		_playlist->connect_video (_matcher);
 		_matcher->connect_video (_encoder);
 	} else {
-		_decoders.video->connect_video (_encoder);
+		_playlist->connect_video (_encoder);
 	}
 	
-	if (_matcher && _delay_line && _decoders.audio) {
-		_decoders.audio->connect_audio (_delay_line);
+	if (_matcher && _delay_line && _playlist->has_audio ()) {
+		_playlist->connect_audio (_delay_line);
 		_delay_line->connect_audio (_matcher);
 		_matcher->connect_audio (_gain);
 		_gain->connect_audio (_encoder);
 	}
 }
 
-/** Run the decoder, passing its output to the encoder, until the decoder
- *  has no more data to present.
- */
 void
 Transcoder::go ()
 {
 	_encoder->process_begin ();
 	try {
-		bool done[2] = { false, false };
-		
 		while (1) {
-			if (!done[0]) {
-				done[0] = _decoders.video->pass ();
-				if (_job) {
-					_decoders.video->set_progress (_job);
-				}
-			}
-
-			if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {
-				done[1] = _decoders.audio->pass ();
-			} else {
-				done[1] = true;
-			}
-
-			if (done[0] && done[1]) {
+			if (_playlist->pass ()) {
 				break;
 			}
+			_playlist->set_progress (_job);
 		}
 		
 	} catch (...) {
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index b0c263d07..8d34af948 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -32,9 +32,8 @@ class Encoder;
 class Matcher;
 class VideoFilter;
 class Gain;
-class VideoDecoder;
-class AudioDecoder;
 class DelayLine;
+class Playlist;
 
 /** @class Transcoder
  *  @brief A class which takes a Film and some Options, then uses those to transcode the film.
@@ -48,23 +47,16 @@ public:
 	Transcoder (
 		boost::shared_ptr<Film> f,
 		DecodeOptions o,
-		Job* j,
-		boost::shared_ptr<Encoder> e
+		boost::shared_ptr<Job> j
 		);
 
 	void go ();
 
-	boost::shared_ptr<VideoDecoder> video_decoder () const {
-		return _decoders.video;
-	}
-
 protected:
 	/** A Job that is running this Transcoder, or 0 */
-	Job* _job;
-	/** The encoder that we will use */
+	boost::shared_ptr<Job> _job;
+	boost::shared_ptr<Playlist> _playlist;
 	boost::shared_ptr<Encoder> _encoder;
-	/** The decoders that we will use */
-	Decoders _decoders;
 	boost::shared_ptr<Matcher> _matcher;
 	boost::shared_ptr<DelayLine> _delay_line;
 	boost::shared_ptr<Gain> _gain;
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 48cb17c26..024740867 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -347,11 +347,11 @@ md5_digest (void const * data, int size)
  *  @return MD5 digest of file's contents.
  */
 string
-md5_digest (string file)
+md5_digest (boost::filesystem::path file)
 {
-	ifstream f (file.c_str(), ios::binary);
+	ifstream f (file.string().c_str(), ios::binary);
 	if (!f.good ()) {
-		throw OpenFileError (file);
+		throw OpenFileError (file.string());
 	}
 	
 	f.seekg (0, ios::end);
diff --git a/src/lib/util.h b/src/lib/util.h
index 3d251cf06..87274cfff 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -57,7 +57,7 @@ extern double seconds (struct timeval);
 extern void dvdomatic_setup ();
 extern void dvdomatic_setup_i18n (std::string);
 extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
-extern std::string md5_digest (std::string);
+extern std::string md5_digest (boost::filesystem::path);
 extern std::string md5_digest (void const *, int);
 extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
@@ -66,6 +66,8 @@ extern boost::filesystem::path mo_path ();
 #endif
 
 typedef int SourceFrame;
+typedef int64_t ContentAudioFrame;
+typedef int ContentVideoFrame;
 
 struct FrameRateConversion
 {
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
new file mode 100644
index 000000000..9fc5cf1a2
--- /dev/null
+++ b/src/lib/video_content.cc
@@ -0,0 +1,28 @@
+#include "video_content.h"
+#include "video_decoder.h"
+
+int const VideoContentProperty::VIDEO_LENGTH = 0;
+int const VideoContentProperty::VIDEO_SIZE = 1;
+int const VideoContentProperty::VIDEO_FRAME_RATE = 2;
+
+using boost::shared_ptr;
+
+VideoContent::VideoContent (boost::filesystem::path f)
+	: Content (f)
+	, _video_length (0)
+{
+
+}
+
+void
+VideoContent::take_from_video_decoder (shared_ptr<VideoDecoder> d)
+{
+        {
+                boost::mutex::scoped_lock lm (_mutex);
+                _video_size = d->native_size ();
+                _video_frame_rate = d->frames_per_second ();
+        }
+        
+        Changed (VideoContentProperty::VIDEO_SIZE);
+        Changed (VideoContentProperty::VIDEO_FRAME_RATE);
+}
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index ee4a64fc4..219130668 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,8 +1,47 @@
+#ifndef DVDOMATIC_VIDEO_CONTENT_H
+#define DVDOMATIC_VIDEO_CONTENT_H
+
 #include "content.h"
+#include "util.h"
+
+class VideoDecoder;
+
+class VideoContentProperty
+{
+public:
+	static int const VIDEO_LENGTH;
+	static int const VIDEO_SIZE;
+	static int const VIDEO_FRAME_RATE;
+};
 
 class VideoContent : public virtual Content
 {
 public:
+	VideoContent (boost::filesystem::path);
+
+	ContentVideoFrame video_length () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _video_length;
+	}
+
+	libdcp::Size video_size () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _video_size;
+	}
 	
+	float video_frame_rate () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _video_frame_rate;
+	}
+
+protected:
+	void take_from_video_decoder (boost::shared_ptr<VideoDecoder>);
 
+	ContentVideoFrame _video_length;
+
+private:
+	libdcp::Size _video_size;
+	float _video_frame_rate;
 };
+
+#endif
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 891720f6b..ca1e7ab56 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -30,7 +30,7 @@
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<Film> f, DecodeOptions o)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<VideoContent> c, DecodeOptions o)
 	: Decoder (f, o)
 	, _video_frame (0)
 	, _last_source_time (0)
@@ -102,21 +102,15 @@ VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
 	}
 }
 
-/** Set which stream of subtitles we should use from our source.
- *  @param s Stream to use.
- */
-void
-VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
-	_subtitle_stream = s;
-}
-
 void
 VideoDecoder::set_progress (Job* j) const
 {
 	assert (j);
-	
+
+#if 0
+	XXX
 	if (_film->length()) {
 		j->set_progress (float (_video_frame) / _film->length().get());
 	}
+#endif	
 }
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 283ab5d88..a52e5448a 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -21,42 +21,33 @@
 #define DVDOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
-#include "stream.h"
 #include "decoder.h"
 
+class VideoContent;
+
 class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);
+	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<VideoContent>, DecodeOptions);
 
 	/** @return video frames per second, or 0 if unknown */
 	virtual float frames_per_second () const = 0;
 	/** @return native size in pixels */
 	virtual libdcp::Size native_size () const = 0;
-	/** @return length (in source video frames), according to our content's header */
-	virtual SourceFrame length () const = 0;
+	/** @return length according to our content's header */
+	virtual ContentVideoFrame video_length () const = 0;
 
 	virtual int time_base_numerator () const = 0;
 	virtual int time_base_denominator () const = 0;
 	virtual int sample_aspect_ratio_numerator () const = 0;
 	virtual int sample_aspect_ratio_denominator () const = 0;
 
-	virtual void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
-
 	void set_progress (Job *) const;
 	
 	int video_frame () const {
 		return _video_frame;
 	}
 
-	boost::shared_ptr<SubtitleStream> subtitle_stream () const {
-		return _subtitle_stream;
-	}
-
-	std::vector<boost::shared_ptr<SubtitleStream> > subtitle_streams () const {
-		return _subtitle_streams;
-	}
-
 	double last_source_time () const {
 		return _last_source_time;
 	}
@@ -69,11 +60,6 @@ protected:
 	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
 	void repeat_last_video ();
 
-	/** Subtitle stream to use when decoding */
-	boost::shared_ptr<SubtitleStream> _subtitle_stream;
-	/** Subtitle streams that this decoder's content has */
-	std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
-
 private:
 	void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>);
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 2d7ee9ba3..5f5dae98f 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -28,6 +28,7 @@
 #include "format.h"
 #include "log.h"
 #include "dcp_video_frame.h"
+#include "playlist.h"
 
 #include "i18n.h"
 
@@ -41,8 +42,9 @@ using boost::shared_ptr;
 
 int const Writer::_maximum_frames_in_memory = 8;
 
-Writer::Writer (shared_ptr<Film> f)
+Writer::Writer (shared_ptr<Film> f, shared_ptr<Playlist> p)
 	: _film (f)
+	, _playlist (p)
 	, _first_nonexistant_frame (0)
 	, _thread (0)
 	, _finish (false)
@@ -74,7 +76,7 @@ Writer::Writer (shared_ptr<Film> f)
 
 	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
-	AudioMapping m (_film->audio_channels ());
+	AudioMapping m (_playlist->audio_channels ());
 	
 	if (m.dcp_channels() > 0) {
 		_sound_asset.reset (
@@ -83,7 +85,7 @@ Writer::Writer (shared_ptr<Film> f)
 				N_("audio.mxf"),
 				_film->dcp_frame_rate (),
 				m.dcp_channels (),
-				dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
+				dcp_audio_sample_rate (_playlist->audio_frame_rate())
 				)
 			);
 
diff --git a/src/lib/writer.h b/src/lib/writer.h
index beb16c7b9..920f592b6 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -26,6 +26,7 @@
 class Film;
 class EncodedData;
 class AudioBuffers;
+class Playlist;
 
 namespace libdcp {
 	class MonoPictureAsset;
@@ -63,7 +64,7 @@ bool operator== (QueueItem const & a, QueueItem const & b);
 class Writer : public ExceptionStore
 {
 public:
-	Writer (boost::shared_ptr<Film>);
+	Writer (boost::shared_ptr<Film>, boost::shared_ptr<Playlist>);
 
 	bool can_fake_write (int) const;
 	
@@ -80,6 +81,7 @@ private:
 
 	/** our Film */
 	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<Playlist> _playlist;
 	/** the first frame index that does not already exist in our MXF */
 	int _first_nonexistant_frame;
 
diff --git a/src/lib/wscript b/src/lib/wscript
index 5d9f5626a..5510d48a8 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -6,10 +6,12 @@ sources = """
 	  ab_transcoder.cc
           analyse_audio_job.cc
           audio_analysis.cc
+          audio_content.cc
           audio_decoder.cc
           audio_source.cc
           config.cc
           combiner.cc
+          content.cc
           cross.cc
           dci_metadata.cc
           dcp_content_type.cc
@@ -23,24 +25,27 @@ sources = """
           exceptions.cc
           filter_graph.cc
           ffmpeg_compatibility.cc
+          ffmpeg_content.cc
           ffmpeg_decoder.cc
           film.cc
           filter.cc
           format.cc
           gain.cc
           image.cc
+          imagemagick_content.cc
           imagemagick_decoder.cc
           job.cc
           job_manager.cc
           log.cc
           lut.cc
           matcher.cc
+          playlist.cc
           scp_dcp_job.cc
           scaler.cc
           server.cc
+          sndfile_content.cc
           sndfile_decoder.cc
           sound_processor.cc
-          stream.cc
           subtitle.cc
           timer.cc
           transcode_job.cc
@@ -48,6 +53,7 @@ sources = """
           ui_signaller.cc
           util.cc
           version.cc
+          video_content.cc
           video_decoder.cc
           video_source.cc
           writer.cc
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 87c079bee..a78d03794 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -236,9 +236,6 @@ public:
 
 		set_menu_sensitivity ();
 
-		/* XXX: calling these here is a bit of a hack */
-		film_editor->setup_visibility ();
-		
 		film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1));
 		if (film) {
 			file_changed (film->directory ());
diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 0c6390771..226cde113 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -151,7 +151,7 @@ main (int argc, char* argv[])
 	}
 	cout << "DCP for " << film->name() << "\n";
 	cout << "Test mode: " << (test_mode ? "yes" : "no") << "\n";
-	cout << "Content: " << film->content() << "\n";
+//	cout << "Content: " << film->content() << "\n";
 	pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
 	cout << "Filters: " << f.first << " " << f.second << "\n";
 
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 3d17988b6..b7384fd14 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -18,10 +18,11 @@
 */
 
 #include <boost/filesystem.hpp>
+#include "lib/audio_analysis.h"
+#include "lib/film.h"
+#include "lib/playlist.h"
 #include "audio_dialog.h"
 #include "audio_plot.h"
-#include "audio_analysis.h"
-#include "film.h"
 #include "wx_util.h"
 
 using boost::shared_ptr;
@@ -90,6 +91,7 @@ AudioDialog::set_film (boost::shared_ptr<Film> f)
 	_film_audio_analysis_succeeded_connection.disconnect ();
 	
 	_film = f;
+	_playlist = _film->playlist ();
 
 	try_to_load_analysis ();
 	setup_channels ();
@@ -104,11 +106,11 @@ AudioDialog::set_film (boost::shared_ptr<Film> f)
 void
 AudioDialog::setup_channels ()
 {
-	if (!_film->audio_stream()) {
+	if (!_playlist->has_audio()) {
 		return;
 	}
 
-	AudioMapping m (_film->audio_stream()->channels ());
+	AudioMapping m (_playlist->audio_channels ());
 	
 	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
 		if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
@@ -134,7 +136,7 @@ AudioDialog::try_to_load_analysis ()
 		
 	_plot->set_analysis (a);
 
-	AudioMapping m (_film->audio_stream()->channels ());
+	AudioMapping m (_playlist->audio_channels ());
 	optional<libdcp::Channel> c = m.source_to_dcp (0);
 	if (c) {
 		_channel_checkbox[c.get()]->SetValue (true);
@@ -157,7 +159,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 
 	assert (c < MAX_AUDIO_CHANNELS);
 
-	AudioMapping m (_film->audio_stream()->channels ());
+	AudioMapping m (_playlist->audio_channels ());
 	optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (c));
 	if (s) {
 		_plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ());
@@ -171,9 +173,8 @@ AudioDialog::film_changed (Film::Property p)
 	case Film::AUDIO_GAIN:
 		_plot->set_gain (_film->audio_gain ());
 		break;
-	case Film::CONTENT_AUDIO_STREAM:
-	case Film::EXTERNAL_AUDIO:
-	case Film::USE_CONTENT_AUDIO:
+	case Film::CONTENT:
+		_playlist = _film->playlist ();
 		setup_channels ();
 		break;
 	default:
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 514faeea0..3cb9c1726 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -25,6 +25,7 @@
 
 class AudioPlot;
 class Film;
+class Playlist;
 
 class AudioDialog : public wxDialog
 {
@@ -42,6 +43,7 @@ private:
 	void setup_channels ();
 
 	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<Playlist> _playlist;
 	AudioPlot* _plot;
 	wxCheckBox* _channel_checkbox[MAX_AUDIO_CHANNELS];
 	wxCheckBox* _type_checkbox[AudioPoint::COUNT];
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index c1d679665..7dfbf6c50 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -25,6 +25,7 @@
 #include <iomanip>
 #include <wx/wx.h>
 #include <wx/notebook.h>
+#include <wx/listctrl.h>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
@@ -65,12 +66,13 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 	, _audio_dialog (0)
 {
 	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-	SetSizer (s);
 	_notebook = new wxNotebook (this, wxID_ANY);
 	s->Add (_notebook, 1);
 
 	make_film_panel ();
 	_notebook->AddPage (_film_panel, _("Film"), true);
+	make_content_panel ();
+	_notebook->AddPage (_content_panel, _("Content"), false);
 	make_video_panel ();
 	_notebook->AddPage (_video_panel, _("Video"), false);
 	make_audio_panel ();
@@ -85,8 +87,9 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 		bind (&FilmEditor::active_jobs_changed, this, _1)
 		);
 	
-	setup_visibility ();
 	setup_formats ();
+
+	SetSizerAndFit (s);
 }
 
 void
@@ -117,13 +120,7 @@ FilmEditor::make_film_panel ()
 	grid->Add (_edit_dci_button, wxGBPosition (r, 1), wxDefaultSpan);
 	++r;
 
-	add_label_to_grid_bag_sizer (grid, _film_panel, _("Content"), wxGBPosition (r, 0));
-	_content = new wxFilePickerCtrl (_film_panel, wxID_ANY, wxT (""), _("Select Content File"), wxT("*.*"));
-	grid->Add (_content, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
-	++r;
-
 	_trust_content_header = new wxCheckBox (_film_panel, wxID_ANY, _("Trust content's header"));
-	video_control (_trust_content_header);
 	grid->Add (_trust_content_header, wxGBPosition (r, 0), wxGBSpan(1, 2));
 	++r;
 
@@ -132,9 +129,9 @@ FilmEditor::make_film_panel ()
 	grid->Add (_dcp_content_type, wxGBPosition (r, 1));
 	++r;
 
-	video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Original Frame Rate"), wxGBPosition (r, 0)));
+	add_label_to_grid_bag_sizer (grid, _film_panel, _("Original Frame Rate"), wxGBPosition (r, 0));
 	_source_frame_rate = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
-	grid->Add (video_control (_source_frame_rate), wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	grid->Add (_source_frame_rate, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	++r;
 
 	{
@@ -149,56 +146,42 @@ FilmEditor::make_film_panel ()
 	++r;
 
 	_frame_rate_description = new wxStaticText (_film_panel, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize);
-	grid->Add (video_control (_frame_rate_description), wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
+	grid->Add (_frame_rate_description, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
 	wxFont font = _frame_rate_description->GetFont();
 	font.SetStyle(wxFONTSTYLE_ITALIC);
 	font.SetPointSize(font.GetPointSize() - 1);
 	_frame_rate_description->SetFont(font);
 	++r;
 	
-	video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Original Size"), wxGBPosition (r, 0)));
+	add_label_to_grid_bag_sizer (grid, _film_panel, _("Original Size"), wxGBPosition (r, 0));
 	_original_size = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
-	grid->Add (video_control (_original_size), wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	grid->Add (_original_size, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	++r;
 	
-	video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Length"), wxGBPosition (r, 0)));
+	add_label_to_grid_bag_sizer (grid, _film_panel, _("Length"), wxGBPosition (r, 0));
 	_length = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
-	grid->Add (video_control (_length), wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	grid->Add (_length, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	++r;
 
 
 	{
-		video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Trim frames"), wxGBPosition (r, 0)));
+		add_label_to_grid_bag_sizer (grid, _film_panel, _("Trim frames"), wxGBPosition (r, 0));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		video_control (add_label_to_sizer (s, _film_panel, _("Start")));
+		add_label_to_sizer (s, _film_panel, _("Start"));
 		_trim_start = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (video_control (_trim_start));
-		video_control (add_label_to_sizer (s, _film_panel, _("End")));
+		s->Add (_trim_start);
+		add_label_to_sizer (s, _film_panel, _("End"));
 		_trim_end = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (video_control (_trim_end));
+		s->Add (_trim_end);
 
 		grid->Add (s, wxGBPosition (r, 1));
 	}
 	++r;
 
 	_dcp_ab = new wxCheckBox (_film_panel, wxID_ANY, _("A/B"));
-	video_control (_dcp_ab);
 	grid->Add (_dcp_ab, wxGBPosition (r, 0));
 	++r;
 
-	/* STILL-only stuff */
-	{
-		still_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Duration"), wxGBPosition (r, 0)));
-		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_still_duration = new wxSpinCtrl (_film_panel);
-		still_control (_still_duration);
-		s->Add (_still_duration, 1, wxEXPAND);
-		/// TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
-		still_control (add_label_to_sizer (s, _film_panel, _("s")));
-		grid->Add (s, wxGBPosition (r, 1));
-	}
-	++r;
-
 	vector<DCPContentType const *> const ct = DCPContentType::all ();
 	for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
 		_dcp_content_type->Append (std_to_wx ((*i)->pretty_name ()));
@@ -217,7 +200,6 @@ FilmEditor::connect_to_widgets ()
 	_use_dci_name->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this);
 	_edit_dci_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
 	_format->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::format_changed), 0, this);
-	_content->Connect (wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler (FilmEditor::content_changed), 0, this);
 	_trust_content_header->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::trust_content_header_changed), 0, this);
 	_left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
 	_right_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this);
@@ -229,7 +211,6 @@ FilmEditor::connect_to_widgets ()
 	_dcp_frame_rate->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this);
 	_best_dcp_frame_rate->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this);
 	_dcp_ab->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::dcp_ab_toggled), 0, this);
-	_still_duration->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::still_duration_changed), 0, this);
 	_trim_start->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::trim_start_changed), 0, this);
 	_trim_end->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::trim_end_changed), 0, this);
 	_with_subtitles->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
@@ -237,21 +218,14 @@ FilmEditor::connect_to_widgets ()
 	_subtitle_scale->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);
 	_colour_lut->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::colour_lut_changed), 0, this);
 	_j2k_bandwidth->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
-	_subtitle_stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this);
-	_audio_stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this);
+//	_ffmpeg_subtitle_stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::ffmpeg_subtitle_stream_changed), 0, this);
+//	_ffmpeg_audio_stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::ffmpeg_audio_stream_changed), 0, this);
 	_audio_gain->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this);
 	_audio_gain_calculate_button->Connect (
 		wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::audio_gain_calculate_button_clicked), 0, this
 		);
 	_show_audio->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::show_audio_clicked), 0, this);
 	_audio_delay->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
-	_use_content_audio->Connect (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
-	_use_external_audio->Connect (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
-	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-		_external_audio[i]->Connect (
-			wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler (FilmEditor::external_audio_changed), 0, this
-			);
-	}
 }
 
 void
@@ -300,21 +274,19 @@ FilmEditor::make_video_panel ()
 
 	/* VIDEO-only stuff */
 	{
-		video_control (add_label_to_grid_bag_sizer (grid, _video_panel, _("Filters"), wxGBPosition (r, 0)));
+		add_label_to_grid_bag_sizer (grid, _video_panel, _("Filters"), wxGBPosition (r, 0));
 		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_filters = new wxStaticText (_video_panel, wxID_ANY, _("None"));
-		video_control (_filters);
 		s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
 		_filters_button = new wxButton (_video_panel, wxID_ANY, _("Edit..."));
-		video_control (_filters_button);
 		s->Add (_filters_button, 0);
 		grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	}
 	++r;
 
-	video_control (add_label_to_grid_bag_sizer (grid, _video_panel, _("Scaler"), wxGBPosition (r, 0)));
+	add_label_to_grid_bag_sizer (grid, _video_panel, _("Scaler"), wxGBPosition (r, 0));
 	_scaler = new wxChoice (_video_panel, wxID_ANY);
-	grid->Add (video_control (_scaler), wxGBPosition (r, 1));
+	grid->Add (_scaler, wxGBPosition (r, 1));
 	++r;
 
 	vector<Scaler const *> const sc = Scaler::all ();
@@ -345,12 +317,48 @@ FilmEditor::make_video_panel ()
 	_top_crop->SetRange (0, 1024);
 	_right_crop->SetRange (0, 1024);
 	_bottom_crop->SetRange (0, 1024);
-	_still_duration->SetRange (1, 60 * 60);
 	_trim_start->SetRange (0, 100);
 	_trim_end->SetRange (0, 100);
 	_j2k_bandwidth->SetRange (50, 250);
 }
 
+void
+FilmEditor::make_content_panel ()
+{
+	_content_panel = new wxPanel (_notebook);
+	_content_sizer = new wxBoxSizer (wxVERTICAL);
+	_content_panel->SetSizer (_content_sizer);
+	
+	wxGridBagSizer* grid = new wxGridBagSizer (4, 4);
+	_content_sizer->Add (grid, 0, wxALL, 8);
+
+	int r = 0;
+
+        {
+                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                
+                _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL);
+                s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
+
+                _content->InsertColumn (0, "");
+
+                wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
+                _content_add = new wxButton (_content_panel, wxID_ANY, _("Add..."));
+                b->Add (_content_add);
+                _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
+                b->Add (_content_remove);
+                _content_earlier = new wxButton (_content_panel, wxID_ANY, _("Earlier"));
+                b->Add (_content_earlier);
+                _content_later = new wxButton (_content_panel, wxID_ANY, _("Later"));
+                b->Add (_content_later);
+
+                s->Add (b, 0, wxALL, 4);
+
+                grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND);
+		++r;
+        }
+}
+
 void
 FilmEditor::make_audio_panel ()
 {
@@ -366,48 +374,26 @@ FilmEditor::make_audio_panel ()
 	grid->AddSpacer (0);
 
 	{
-		video_control (add_label_to_sizer (grid, _audio_panel, _("Audio Gain")));
+		add_label_to_sizer (grid, _audio_panel, _("Audio Gain"));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_audio_gain = new wxSpinCtrl (_audio_panel);
-		s->Add (video_control (_audio_gain), 1);
-		video_control (add_label_to_sizer (s, _audio_panel, _("dB")));
+		s->Add (_audio_gain, 1);
+		add_label_to_sizer (s, _audio_panel, _("dB"));
 		_audio_gain_calculate_button = new wxButton (_audio_panel, wxID_ANY, _("Calculate..."));
-		video_control (_audio_gain_calculate_button);
 		s->Add (_audio_gain_calculate_button, 1, wxEXPAND);
 		grid->Add (s);
 	}
 
 	{
-		video_control (add_label_to_sizer (grid, _audio_panel, _("Audio Delay")));
+		add_label_to_sizer (grid, _audio_panel, _("Audio Delay"));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_audio_delay = new wxSpinCtrl (_audio_panel);
-		s->Add (video_control (_audio_delay), 1);
+		s->Add (_audio_delay, 1);
 		/// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-		video_control (add_label_to_sizer (s, _audio_panel, _("ms")));
+		add_label_to_sizer (s, _audio_panel, _("ms"));
 		grid->Add (s);
 	}
 
-	{
-		_use_content_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use content's audio"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-		grid->Add (video_control (_use_content_audio));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_audio_stream = new wxChoice (_audio_panel, wxID_ANY);
-		s->Add (video_control (_audio_stream), 1);
-		_audio = new wxStaticText (_audio_panel, wxID_ANY, wxT (""));
-		s->Add (video_control (_audio), 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 8);
-		grid->Add (s, 1, wxEXPAND);
-	}
-
-	_use_external_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use external audio"));
-	grid->Add (_use_external_audio);
-	grid->AddSpacer (0);
-
-	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-		add_label_to_sizer (grid, _audio_panel, std_to_wx (audio_channel_name (i)));
-		_external_audio[i] = new wxFilePickerCtrl (_audio_panel, wxID_ANY, wxT (""), _("Select Audio File"), wxT ("*.wav"));
-		grid->Add (_external_audio[i], 1, wxEXPAND);
-	}
-
 	_audio_gain->SetRange (-60, 60);
 	_audio_delay->SetRange (-1000, 1000);
 }
@@ -422,22 +408,21 @@ FilmEditor::make_subtitle_panel ()
 	_subtitle_sizer->Add (grid, 0, wxALL, 8);
 
 	_with_subtitles = new wxCheckBox (_subtitle_panel, wxID_ANY, _("With Subtitles"));
-	video_control (_with_subtitles);
 	grid->Add (_with_subtitles, 1);
 	
-	_subtitle_stream = new wxChoice (_subtitle_panel, wxID_ANY);
-	grid->Add (video_control (_subtitle_stream));
+	_ffmpeg_subtitle_stream = new wxChoice (_subtitle_panel, wxID_ANY);
+	grid->Add (_ffmpeg_subtitle_stream);
 
-	video_control (add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Offset")));
+	add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Offset"));
 	_subtitle_offset = new wxSpinCtrl (_subtitle_panel);
-	grid->Add (video_control (_subtitle_offset), 1);
+	grid->Add (_subtitle_offset, 1);
 
 	{
-		video_control (add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Scale")));
+		add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Scale"));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_subtitle_scale = new wxSpinCtrl (_subtitle_panel);
-		s->Add (video_control (_subtitle_scale));
-		video_control (add_label_to_sizer (s, _subtitle_panel, _("%")));
+		s->Add (_subtitle_scale);
+		add_label_to_sizer (s, _subtitle_panel, _("%"));
 		grid->Add (s);
 	}
 
@@ -489,22 +474,6 @@ FilmEditor::bottom_crop_changed (wxCommandEvent &)
 	_film->set_bottom_crop (_bottom_crop->GetValue ());
 }
 
-/** Called when the content filename has been changed */
-void
-FilmEditor::content_changed (wxCommandEvent &)
-{
-	if (!_film) {
-		return;
-	}
-
-	try {
-		_film->set_content (wx_to_std (_content->GetPath ()));
-	} catch (std::exception& e) {
-		_content->SetPath (std_to_wx (_film->directory ()));
-		error_dialog (this, wxString::Format (_("Could not set content: %s"), std_to_wx (e.what()).data()));
-	}
-}
-
 void
 FilmEditor::trust_content_header_changed (wxCommandEvent &)
 {
@@ -611,8 +580,7 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::NONE:
 		break;
 	case Film::CONTENT:
-		checked_set (_content, _film->content ());
-		setup_visibility ();
+		setup_content ();
 		setup_formats ();
 		setup_subtitle_control_sensitivity ();
 		setup_streams ();
@@ -621,14 +589,14 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::TRUST_CONTENT_HEADER:
 		checked_set (_trust_content_header, _film->trust_content_header ());
 		break;
-	case Film::SUBTITLE_STREAMS:
-		setup_subtitle_control_sensitivity ();
-		setup_streams ();
-		break;
-	case Film::CONTENT_AUDIO_STREAMS:
-		setup_streams ();
-		setup_show_audio_sensitivity ();
-		break;
+//	case Film::SUBTITLE_STREAMS:
+//		setup_subtitle_control_sensitivity ();
+//		setup_streams ();
+//		break;
+//	case Film::CONTENT_AUDIO_STREAMS:
+//		setup_streams ();
+//		setup_show_audio_sensitivity ();
+//		break;
 	case Film::FORMAT:
 	{
 		int n = 0;
@@ -673,32 +641,32 @@ FilmEditor::film_changed (Film::Property p)
 		checked_set (_name, _film->name());
 		setup_dcp_name ();
 		break;
-	case Film::SOURCE_FRAME_RATE:
-		s << fixed << setprecision(2) << _film->source_frame_rate();
-		_source_frame_rate->SetLabel (std_to_wx (s.str ()));
-		break;
-	case Film::SIZE:
-		if (_film->size().width == 0 && _film->size().height == 0) {
-			_original_size->SetLabel (wxT (""));
-		} else {
-			s << _film->size().width << " x " << _film->size().height;
-			_original_size->SetLabel (std_to_wx (s.str ()));
-		}
-		break;
-	case Film::LENGTH:
-		if (_film->source_frame_rate() > 0 && _film->length()) {
-			s << _film->length().get() << " "
-			  << wx_to_std (_("frames")) << "; " << seconds_to_hms (_film->length().get() / _film->source_frame_rate());
-		} else if (_film->length()) {
-			s << _film->length().get() << " "
-			  << wx_to_std (_("frames"));
-		} 
-		_length->SetLabel (std_to_wx (s.str ()));
-		if (_film->length()) {
-			_trim_start->SetRange (0, _film->length().get());
-			_trim_end->SetRange (0, _film->length().get());
-		}
-		break;
+//	case Film::SOURCE_FRAME_RATE:
+//		s << fixed << setprecision(2) << _film->source_frame_rate();
+//		_source_frame_rate->SetLabel (std_to_wx (s.str ()));
+//		break;
+//	case Film::SIZE:
+//		if (_film->size().width == 0 && _film->size().height == 0) {
+//			_original_size->SetLabel (wxT (""));
+//		} else {
+//			s << _film->size().width << " x " << _film->size().height;
+//			_original_size->SetLabel (std_to_wx (s.str ()));
+//		}
+//		break;
+//	case Film::LENGTH:
+//		if (_film->source_frame_rate() > 0 && _film->length()) {
+//			s << _film->length().get() << " "
+//			  << wx_to_std (_("frames")) << "; " << seconds_to_hms (_film->length().get() / _film->source_frame_rate());
+//		} else if (_film->length()) {
+//			s << _film->length().get() << " "
+//			  << wx_to_std (_("frames"));
+//		} 
+//		_length->SetLabel (std_to_wx (s.str ()));
+//		if (_film->length()) {
+//			_trim_start->SetRange (0, _film->length().get());
+//			_trim_end->SetRange (0, _film->length().get());
+//		}
+//		break;
 	case Film::DCP_CONTENT_TYPE:
 		checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
 		setup_dcp_name ();
@@ -721,9 +689,6 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::AUDIO_DELAY:
 		checked_set (_audio_delay, _film->audio_delay ());
 		break;
-	case Film::STILL_DURATION:
-		checked_set (_still_duration, _film->still_duration ());
-		break;
 	case Film::WITH_SUBTITLES:
 		checked_set (_with_subtitles, _film->with_subtitles ());
 		setup_subtitle_control_sensitivity ();
@@ -748,55 +713,36 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::DCI_METADATA:
 		setup_dcp_name ();
 		break;
-	case Film::CONTENT_AUDIO_STREAM:
-		if (_film->content_audio_stream()) {
-			checked_set (_audio_stream, _film->content_audio_stream()->to_string());
-		}
-		setup_dcp_name ();
-		setup_audio_details ();
-		setup_audio_control_sensitivity ();
-		setup_show_audio_sensitivity ();
-		break;
-	case Film::USE_CONTENT_AUDIO:
-		checked_set (_use_content_audio, _film->use_content_audio());
-		checked_set (_use_external_audio, !_film->use_content_audio());
-		setup_dcp_name ();
-		setup_audio_details ();
-		setup_audio_control_sensitivity ();
-		setup_show_audio_sensitivity ();
-		break;
-	case Film::SUBTITLE_STREAM:
-		if (_film->subtitle_stream()) {
-			checked_set (_subtitle_stream, _film->subtitle_stream()->to_string());
-		}
-		break;
-	case Film::EXTERNAL_AUDIO:
-	{
-		vector<string> a = _film->external_audio ();
-		for (size_t i = 0; i < a.size() && i < MAX_AUDIO_CHANNELS; ++i) {
-			checked_set (_external_audio[i], a[i]);
-		}
-		setup_audio_details ();
-		setup_show_audio_sensitivity ();
-		break;
-	}
-	case Film::DCP_FRAME_RATE:
-		for (unsigned int i = 0; i < _dcp_frame_rate->GetCount(); ++i) {
-			if (wx_to_std (_dcp_frame_rate->GetString(i)) == boost::lexical_cast<string> (_film->dcp_frame_rate())) {
-				if (_dcp_frame_rate->GetSelection() != int(i)) {
-					_dcp_frame_rate->SetSelection (i);
-					break;
-				}
-			}
-		}
-
-		if (_film->source_frame_rate()) {
-			_frame_rate_description->SetLabel (std_to_wx (FrameRateConversion (_film->source_frame_rate(), _film->dcp_frame_rate()).description));
-			_best_dcp_frame_rate->Enable (best_dcp_frame_rate (_film->source_frame_rate ()) != _film->dcp_frame_rate ());
-		} else {
-			_frame_rate_description->SetLabel (wxT (""));
-			_best_dcp_frame_rate->Disable ();
-		}
+//	case Film::CONTENT_AUDIO_STREAM:
+//		if (_film->content_audio_stream()) {
+//			checked_set (_audio_stream, _film->content_audio_stream()->to_string());
+//		}
+//		setup_dcp_name ();
+//		setup_audio_details ();
+//		setup_show_audio_sensitivity ();
+//		break;
+//	case Film::SUBTITLE_STREAM:
+//		if (_film->subtitle_stream()) {
+//			checked_set (_subtitle_stream, _film->subtitle_stream()->to_string());
+//		}
+//		break;
+//	case Film::DCP_FRAME_RATE:
+//		for (unsigned int i = 0; i < _dcp_frame_rate->GetCount(); ++i) {
+//			if (wx_to_std (_dcp_frame_rate->GetString(i)) == boost::lexical_cast<string> (_film->dcp_frame_rate())) {
+//				if (_dcp_frame_rate->GetSelection() != int(i)) {
+//					_dcp_frame_rate->SetSelection (i);
+//					break;
+//				}
+//			}
+//		}
+
+//		if (_film->source_frame_rate()) {
+//			_frame_rate_description->SetLabel (std_to_wx (FrameRateConversion (_film->source_frame_rate(), _film->dcp_frame_rate()).description));
+//			_best_dcp_frame_rate->Enable (best_dcp_frame_rate (_film->source_frame_rate ()) != _film->dcp_frame_rate ());
+//		} else {
+//			_frame_rate_description->SetLabel (wxT (""));
+//			_best_dcp_frame_rate->Disable ();
+//		}
 	}
 }
 
@@ -863,23 +809,14 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::TRIM_START);
 	film_changed (Film::TRIM_END);
 	film_changed (Film::DCP_AB);
-	film_changed (Film::CONTENT_AUDIO_STREAM);
-	film_changed (Film::EXTERNAL_AUDIO);
-	film_changed (Film::USE_CONTENT_AUDIO);
 	film_changed (Film::AUDIO_GAIN);
 	film_changed (Film::AUDIO_DELAY);
-	film_changed (Film::STILL_DURATION);
 	film_changed (Film::WITH_SUBTITLES);
 	film_changed (Film::SUBTITLE_OFFSET);
 	film_changed (Film::SUBTITLE_SCALE);
 	film_changed (Film::COLOUR_LUT);
 	film_changed (Film::J2K_BANDWIDTH);
 	film_changed (Film::DCI_METADATA);
-	film_changed (Film::SIZE);
-	film_changed (Film::LENGTH);
-	film_changed (Film::CONTENT_AUDIO_STREAMS);
-	film_changed (Film::SUBTITLE_STREAMS);
-	film_changed (Film::SOURCE_FRAME_RATE);
 	film_changed (Film::DCP_FRAME_RATE);
 }
 
@@ -903,7 +840,7 @@ FilmEditor::set_things_sensitive (bool s)
 	_bottom_crop->Enable (s);
 	_filters_button->Enable (s);
 	_scaler->Enable (s);
-	_audio_stream->Enable (s);
+//	_ffmpeg_audio_stream->Enable (s);
 	_dcp_content_type->Enable (s);
 	_dcp_frame_rate->Enable (s);
 	_trim_start->Enable (s);
@@ -915,10 +852,8 @@ FilmEditor::set_things_sensitive (bool s)
 	_audio_gain_calculate_button->Enable (s);
 	_show_audio->Enable (s);
 	_audio_delay->Enable (s);
-	_still_duration->Enable (s);
 
 	setup_subtitle_control_sensitivity ();
-	setup_audio_control_sensitivity ();
 	setup_show_audio_sensitivity ();
 }
 
@@ -966,62 +901,6 @@ FilmEditor::audio_delay_changed (wxCommandEvent &)
 	_film->set_audio_delay (_audio_delay->GetValue ());
 }
 
-wxControl *
-FilmEditor::video_control (wxControl* c)
-{
-	_video_controls.push_back (c);
-	return c;
-}
-
-wxControl *
-FilmEditor::still_control (wxControl* c)
-{
-	_still_controls.push_back (c);
-	return c;
-}
-
-void
-FilmEditor::setup_visibility ()
-{
-	ContentType c = VIDEO;
-
-	if (_film) {
-		c = _film->content_type ();
-	}
-
-	for (list<wxControl*>::iterator i = _video_controls.begin(); i != _video_controls.end(); ++i) {
-		(*i)->Show (c == VIDEO);
-	}
-
-	for (list<wxControl*>::iterator i = _still_controls.begin(); i != _still_controls.end(); ++i) {
-		(*i)->Show (c == STILL);
-	}
-
-	_notebook->InvalidateBestSize ();
-	
-	_film_sizer->Layout ();
-	_film_sizer->SetSizeHints (_film_panel);
-	_video_sizer->Layout ();
-	_video_sizer->SetSizeHints (_video_panel);
-	_audio_sizer->Layout ();
-	_audio_sizer->SetSizeHints (_audio_panel);
-	_subtitle_sizer->Layout ();
-	_subtitle_sizer->SetSizeHints (_subtitle_panel);
-
-	_notebook->Fit ();
-	Fit ();
-}
-
-void
-FilmEditor::still_duration_changed (wxCommandEvent &)
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_still_duration (_still_duration->GetValue ());
-}
-
 void
 FilmEditor::trim_start_changed (wxCommandEvent &)
 {
@@ -1072,20 +951,7 @@ FilmEditor::audio_gain_calculate_button_clicked (wxCommandEvent &)
 void
 FilmEditor::setup_formats ()
 {
-	ContentType c = VIDEO;
-
-	if (_film) {
-		c = _film->content_type ();
-	}
-	
-	_formats.clear ();
-
-	vector<Format const *> fmt = Format::all ();
-	for (vector<Format const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
-		if (c == VIDEO || (c == STILL && dynamic_cast<VariableFormat const *> (*i))) {
-			_formats.push_back (*i);
-		}
-	}
+	_formats = Format::all ();
 
 	_format->Clear ();
 	for (vector<Format const *>::iterator i = _formats.begin(); i != _formats.end(); ++i) {
@@ -1110,7 +976,7 @@ FilmEditor::setup_subtitle_control_sensitivity ()
 {
 	bool h = false;
 	if (_generally_sensitive && _film) {
-		h = !_film->subtitle_streams().empty();
+//		h = !_film->subtitle_streams().empty();
 	}
 	
 	_with_subtitles->Enable (h);
@@ -1120,26 +986,11 @@ FilmEditor::setup_subtitle_control_sensitivity ()
 		j = _film->with_subtitles ();
 	}
 	
-	_subtitle_stream->Enable (j);
+	_ffmpeg_subtitle_stream->Enable (j);
 	_subtitle_offset->Enable (j);
 	_subtitle_scale->Enable (j);
 }
 
-void
-FilmEditor::setup_audio_control_sensitivity ()
-{
-	_use_content_audio->Enable (_generally_sensitive && _film && !_film->content_audio_streams().empty());
-	_use_external_audio->Enable (_generally_sensitive);
-	
-	bool const source = _generally_sensitive && _use_content_audio->GetValue();
-	bool const external = _generally_sensitive && _use_external_audio->GetValue();
-
-	_audio_stream->Enable (source);
-	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-		_external_audio[i]->Enable (external);
-	}
-}
-
 void
 FilmEditor::use_dci_name_toggled (wxCommandEvent &)
 {
@@ -1166,63 +1017,66 @@ FilmEditor::edit_dci_button_clicked (wxCommandEvent &)
 void
 FilmEditor::setup_streams ()
 {
-	_audio_stream->Clear ();
-	vector<shared_ptr<AudioStream> > a = _film->content_audio_streams ();
-	for (vector<shared_ptr<AudioStream> >::iterator i = a.begin(); i != a.end(); ++i) {
-		shared_ptr<FFmpegAudioStream> ffa = dynamic_pointer_cast<FFmpegAudioStream> (*i);
-		assert (ffa);
-		_audio_stream->Append (std_to_wx (ffa->name()), new wxStringClientData (std_to_wx (ffa->to_string ())));
-	}
+//	_ffmpeg_audio_stream->Clear ();
+	vector<FFmpegAudioStream> a;// = _film->content_audio_streams ();
+//	for (vector<FFmpegAudioStream>::iterator i = a.begin(); i != a.end(); ++i) {
+//		_audio_stream->Append (std_to_wx (ffa->name()), new wxStringClientData (std_to_wx (i->to_string ())));
+//	}
 	
-	if (_film->use_content_audio() && _film->audio_stream()) {
-		checked_set (_audio_stream, _film->audio_stream()->to_string());
-	}
-
-	_subtitle_stream->Clear ();
-	vector<shared_ptr<SubtitleStream> > s = _film->subtitle_streams ();
-	for (vector<shared_ptr<SubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) {
-		_subtitle_stream->Append (std_to_wx ((*i)->name()), new wxStringClientData (std_to_wx ((*i)->to_string ())));
-	}
-	if (_film->subtitle_stream()) {
-		checked_set (_subtitle_stream, _film->subtitle_stream()->to_string());
-	} else {
-		_subtitle_stream->SetSelection (wxNOT_FOUND);
-	}
+//	if (_film->use_content_audio() && _film->audio_stream()) {
+//		checked_set (_audio_stream, _film->audio_stream()->to_string());
+//	}
+
+	_ffmpeg_subtitle_stream->Clear ();
+//	vector<shared_ptr<SubtitleStream> > s = _film->subtitle_streams ();
+//	for (vector<shared_ptr<SubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) {
+//		_subtitle_stream->Append (std_to_wx ((*i)->name()), new wxStringClientData (std_to_wx ((*i)->to_string ())));
+//	}
+//	if (_film->subtitle_stream()) {
+//		checked_set (_subtitle_stream, _film->subtitle_stream()->to_string());
+//	} else {
+//		_subtitle_stream->SetSelection (wxNOT_FOUND);
+//	}
 }
 
 void
-FilmEditor::audio_stream_changed (wxCommandEvent &)
+FilmEditor::ffmpeg_audio_stream_changed (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 
+#if 0	
 	_film->set_content_audio_stream (
 		audio_stream_factory (
 			string_client_data (_audio_stream->GetClientObject (_audio_stream->GetSelection ())),
 			Film::state_version
 			)
 		);
+#endif	
 }
 
 void
-FilmEditor::subtitle_stream_changed (wxCommandEvent &)
+FilmEditor::ffmpeg_subtitle_stream_changed (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 
+#if 0	
 	_film->set_subtitle_stream (
 		subtitle_stream_factory (
 			string_client_data (_subtitle_stream->GetClientObject (_subtitle_stream->GetSelection ())),
 			Film::state_version
 			)
 		);
+#endif	
 }
 
 void
 FilmEditor::setup_audio_details ()
 {
+#if 0	
 	if (!_film->content_audio_stream()) {
 		_audio->SetLabel (wxT (""));
 	} else {
@@ -1235,6 +1089,7 @@ FilmEditor::setup_audio_details ()
 		s << ", " << _film->audio_stream()->sample_rate() << wx_to_std (_("Hz"));
 		_audio->SetLabel (std_to_wx (s.str ()));
 	}
+#endif	
 }
 
 void
@@ -1243,23 +1098,6 @@ FilmEditor::active_jobs_changed (bool a)
 	set_things_sensitive (!a);
 }
 
-void
-FilmEditor::use_audio_changed (wxCommandEvent &)
-{
-	_film->set_use_content_audio (_use_content_audio->GetValue());
-}
-
-void
-FilmEditor::external_audio_changed (wxCommandEvent &)
-{
-	vector<string> a;
-	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-		a.push_back (wx_to_std (_external_audio[i]->GetPath()));
-	}
-
-	_film->set_external_audio (a);
-}
-
 void
 FilmEditor::setup_dcp_name ()
 {
@@ -1292,11 +1130,23 @@ FilmEditor::best_dcp_frame_rate_clicked (wxCommandEvent &)
 		return;
 	}
 	
-	_film->set_dcp_frame_rate (best_dcp_frame_rate (_film->source_frame_rate ()));
+//	_film->set_dcp_frame_rate (best_dcp_frame_rate (_film->source_frame_rate ()));
 }
 
 void
 FilmEditor::setup_show_audio_sensitivity ()
 {
-	_show_audio->Enable (_film && _film->has_audio ());
+//	_show_audio->Enable (_film && _film->has_audio ());
+}
+
+void
+FilmEditor::setup_content ()
+{
+	_content->DeleteAllItems ();
+
+	list<shared_ptr<Content> > content = _film->content ();
+	for (list<shared_ptr<Content> >::iterator i = content.begin(); i != content.end(); ++i) {
+		_content->InsertItem (_content->GetItemCount(), std_to_wx ((*i)->summary ()));
+	}
 }
+
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index e5b619886..6b1d98ea6 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -29,6 +29,7 @@
 #include "lib/film.h"
 
 class wxNotebook;
+class wxListCtrl;
 class Film;
 class AudioDialog;
 
@@ -41,12 +42,12 @@ public:
 	FilmEditor (boost::shared_ptr<Film>, wxWindow *);
 
 	void set_film (boost::shared_ptr<Film>);
-	void setup_visibility ();
 
 	boost::signals2::signal<void (std::string)> FileChanged;
 
 private:
 	void make_film_panel ();
+	void make_content_panel ();
 	void make_video_panel ();
 	void make_audio_panel ();
 	void make_subtitle_panel ();
@@ -60,7 +61,6 @@ private:
 	void right_crop_changed (wxCommandEvent &);
 	void top_crop_changed (wxCommandEvent &);
 	void bottom_crop_changed (wxCommandEvent &);
-	void content_changed (wxCommandEvent &);
 	void trust_content_header_changed (wxCommandEvent &);
 	void format_changed (wxCommandEvent &);
 	void trim_start_changed (wxCommandEvent &);
@@ -77,11 +77,8 @@ private:
 	void subtitle_scale_changed (wxCommandEvent &);
 	void colour_lut_changed (wxCommandEvent &);
 	void j2k_bandwidth_changed (wxCommandEvent &);
-	void still_duration_changed (wxCommandEvent &);
-	void audio_stream_changed (wxCommandEvent &);
-	void subtitle_stream_changed (wxCommandEvent &);
-	void use_audio_changed (wxCommandEvent &);
-	void external_audio_changed (wxCommandEvent &);
+	void ffmpeg_audio_stream_changed (wxCommandEvent &);
+	void ffmpeg_subtitle_stream_changed (wxCommandEvent &);
 	void dcp_frame_rate_changed (wxCommandEvent &);
 	void best_dcp_frame_rate_clicked (wxCommandEvent &);
 
@@ -94,20 +91,19 @@ private:
 	void set_things_sensitive (bool);
 	void setup_formats ();
 	void setup_subtitle_control_sensitivity ();
-	void setup_audio_control_sensitivity ();
 	void setup_streams ();
 	void setup_audio_details ();
 	void setup_dcp_name ();
 	void setup_show_audio_sensitivity ();
+	void setup_content ();
 	
-	wxControl* video_control (wxControl *);
-	wxControl* still_control (wxControl *);
-
 	void active_jobs_changed (bool);
 
 	wxNotebook* _notebook;
 	wxPanel* _film_panel;
 	wxSizer* _film_sizer;
+	wxPanel* _content_panel;
+	wxSizer* _content_sizer;
 	wxPanel* _video_panel;
 	wxSizer* _video_sizer;
 	wxPanel* _audio_panel;
@@ -121,68 +117,47 @@ private:
 	wxTextCtrl* _name;
 	wxStaticText* _dcp_name;
 	wxCheckBox* _use_dci_name;
+	wxListCtrl* _content;
+	wxButton* _content_add;
+	wxButton* _content_remove;
+	wxButton* _content_earlier;
+	wxButton* _content_later;
 	wxButton* _edit_dci_button;
-	/** The Film's format */
 	wxChoice* _format;
 	wxStaticText* _format_description;
-	/** The Film's content file */
-	wxFilePickerCtrl* _content;
 	wxCheckBox* _trust_content_header;
-	/** The Film's left crop */
 	wxSpinCtrl* _left_crop;
-	/** The Film's right crop */
 	wxSpinCtrl* _right_crop;
-	/** The Film's top crop */
 	wxSpinCtrl* _top_crop;
-	/** The Film's bottom crop */
 	wxSpinCtrl* _bottom_crop;
-	/** Currently-applied filters */
 	wxStaticText* _filters;
-	/** Button to open the filters dialogue */
 	wxButton* _filters_button;
-	/** The Film's scaler */
 	wxChoice* _scaler;
-	wxRadioButton* _use_content_audio;
-	wxChoice* _audio_stream;
-	wxRadioButton* _use_external_audio;
-	wxFilePickerCtrl* _external_audio[MAX_AUDIO_CHANNELS];
-	/** The Film's audio gain */
 	wxSpinCtrl* _audio_gain;
-	/** A button to open the gain calculation dialogue */
 	wxButton* _audio_gain_calculate_button;
 	wxButton* _show_audio;
-	/** The Film's audio delay */
 	wxSpinCtrl* _audio_delay;
 	wxCheckBox* _with_subtitles;
-	wxChoice* _subtitle_stream;
+	wxChoice* _ffmpeg_subtitle_stream;
 	wxSpinCtrl* _subtitle_offset;
 	wxSpinCtrl* _subtitle_scale;
 	wxChoice* _colour_lut;
 	wxSpinCtrl* _j2k_bandwidth;
-	/** The Film's DCP content type */
 	wxChoice* _dcp_content_type;
-	/** The Film's source frame rate */
 	wxStaticText* _source_frame_rate;
 	wxChoice* _dcp_frame_rate;
 	wxButton* _best_dcp_frame_rate;
 	wxStaticText* _frame_rate_description;
-	/** The Film's original size */
 	wxStaticText* _original_size;
-	/** The Film's length */
 	wxStaticText* _length;
 	/** The Film's audio details */
 	wxStaticText* _audio;
-	/** The Film's duration for still sources */
-	wxSpinCtrl* _still_duration;
 
 	wxSpinCtrl* _trim_start;
 	wxSpinCtrl* _trim_end;
 	/** Selector to generate an A/B comparison DCP */
 	wxCheckBox* _dcp_ab;
 
-	std::list<wxControl*> _video_controls;
-	std::list<wxControl*> _still_controls;
-
 	std::vector<Format const *> _formats;
 
 	bool _generally_sensitive;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 08eade4d0..1e2a74be9 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -114,12 +114,10 @@ FilmViewer::film_changed (Film::Property p)
 		}
 		_decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
 		_decoders.video->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
-		_decoders.video->set_subtitle_stream (_film->subtitle_stream());
+//		_decoders.video->set_subtitle_stream (_film->subtitle_stream());
 		calculate_sizes ();
 		get_frame ();
 		_panel->Refresh ();
-		_slider->Show (_film->content_type() == VIDEO);
-		_play_button->Show (_film->content_type() == VIDEO);
 		_v_sizer->Layout ();
 		break;
 	}
@@ -132,7 +130,7 @@ FilmViewer::film_changed (Film::Property p)
 		break;
 	case Film::SUBTITLE_STREAM:
 		if (_decoders.video) {
-			_decoders.video->set_subtitle_stream (_film->subtitle_stream ());
+//			_decoders.video->set_subtitle_stream (_film->subtitle_stream ());
 		}
 		break;
 	default:
@@ -187,12 +185,12 @@ FilmViewer::timer (wxTimerEvent &)
 
 	get_frame ();
 
-	if (_film->length()) {
-		int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->source_frame_rate());
-		if (new_slider_position != _slider->GetValue()) {
-			_slider->SetValue (new_slider_position);
-		}
-	}
+//	if (_film->length()) {
+//		int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->source_frame_rate());
+//		if (new_slider_position != _slider->GetValue()) {
+//			_slider->SetValue (new_slider_position);
+//		}
+//	}
 }
 
 
@@ -233,13 +231,13 @@ FilmViewer::paint_panel (wxPaintEvent &)
 void
 FilmViewer::slider_moved (wxScrollEvent &)
 {
-	if (!_film || !_film->length() || !_decoders.video) {
-		return;
-	}
+//	if (!_film || !_film->length() || !_decoders.video) {
+//		return;
+//	}
 	
-	if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->source_frame_rate()))) {
-		return;
-	}
+//	if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->source_frame_rate()))) {
+//		return;
+//	}
 	
 	get_frame ();
 	_panel->Refresh ();
@@ -294,6 +292,7 @@ FilmViewer::raw_to_display ()
 		_clear_required = true;
 	}
 
+#if 0	
 	if (_raw_sub) {
 
 		/* Our output is already cropped by the decoder, so we need to account for that
@@ -314,6 +313,7 @@ FilmViewer::raw_to_display ()
 	} else {
 		_display_sub.reset ();
 	}
+#endif	
 }	
 
 void
@@ -342,9 +342,9 @@ FilmViewer::calculate_sizes ()
 	   of our _display_frame.
 	*/
 	_display_frame_x = 0;
-	if (format) {
-		_display_frame_x = static_cast<float> (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width;
-	}
+//	if (format) {
+//		_display_frame_x = static_cast<float> (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width;
+//	}
 
 	_film_size = _out_size;
 	_film_size.width -= _display_frame_x * 2;
@@ -369,7 +369,7 @@ FilmViewer::check_play_state ()
 	}
 	
 	if (_play_button->GetValue()) {
-		_timer.Start (1000 / _film->source_frame_rate());
+//		_timer.Start (1000 / _film->source_frame_rate());
 	} else {
 		_timer.Stop ();
 	}
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 44a713dc3..06e245832 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -50,6 +50,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
 	table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
 
+#if 0	
 	if (_film->length()) {
 		_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().get())));
 		FrameRateConversion frc (_film->source_frame_rate(), _film->dcp_frame_rate());
@@ -62,6 +63,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 		_frames->SetLabel (_("unknown"));
 		_disk->SetLabel (_("unknown"));
 	}
+#endif	
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
 	overall_sizer->Add (table, 0, wxALL, 6);
@@ -85,9 +87,9 @@ PropertiesDialog::frames_already_encoded () const
 		return "";
 	}
 	
-	if (_film->length()) {
-		/* XXX: encoded_frames() should check which frames have been encoded */
-		u << " (" << (_film->encoded_frames() * 100 / _film->length().get()) << "%)";
-	}
+//	if (_film->length()) {
+//		/* XXX: encoded_frames() should check which frames have been encoded */
+//		u << " (" << (_film->encoded_frames() * 100 / _film->length().get()) << "%)";
+//	}
 	return u.str ();
 }
diff --git a/test/test.cc b/test/test.cc
index 61e192058..efa4848f6 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -142,7 +142,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	BOOST_CHECK (f->filters ().empty());
 
 	f->set_name ("fred");
-	BOOST_CHECK_THROW (f->set_content ("jim"), OpenFileError);
+//	BOOST_CHECK_THROW (f->set_content ("jim"), OpenFileError);
 	f->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
 	f->set_format (Format::from_nickname ("Flat"));
 	f->set_left_crop (1);
@@ -183,50 +183,17 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0);
 }
 
-BOOST_AUTO_TEST_CASE (stream_test)
-{
-	FFmpegAudioStream a ("ffmpeg 4 44100 1 hello there world", boost::optional<int> (1));
-	BOOST_CHECK_EQUAL (a.id(), 4);
-	BOOST_CHECK_EQUAL (a.sample_rate(), 44100);
-	BOOST_CHECK_EQUAL (a.channel_layout(), 1);
-	BOOST_CHECK_EQUAL (a.name(), "hello there world");
-	BOOST_CHECK_EQUAL (a.to_string(), "ffmpeg 4 44100 1 hello there world");
-
-	SndfileStream e ("external 44100 1", boost::optional<int> (1));
-	BOOST_CHECK_EQUAL (e.sample_rate(), 44100);
-	BOOST_CHECK_EQUAL (e.channel_layout(), 1);
-	BOOST_CHECK_EQUAL (e.to_string(), "external 44100 1");
-
-	SubtitleStream s ("5 a b c", boost::optional<int> (1));
-	BOOST_CHECK_EQUAL (s.id(), 5);
-	BOOST_CHECK_EQUAL (s.name(), "a b c");
-
-	shared_ptr<AudioStream> ff = audio_stream_factory ("ffmpeg 4 44100 1 hello there world", boost::optional<int> (1));
-	shared_ptr<FFmpegAudioStream> cff = dynamic_pointer_cast<FFmpegAudioStream> (ff);
-	BOOST_CHECK (cff);
-	BOOST_CHECK_EQUAL (cff->id(), 4);
-	BOOST_CHECK_EQUAL (cff->sample_rate(), 44100);
-	BOOST_CHECK_EQUAL (cff->channel_layout(), 1);
-	BOOST_CHECK_EQUAL (cff->name(), "hello there world");
-	BOOST_CHECK_EQUAL (cff->to_string(), "ffmpeg 4 44100 1 hello there world");
-
-	shared_ptr<AudioStream> fe = audio_stream_factory ("external 44100 1", boost::optional<int> (1));
-	BOOST_CHECK_EQUAL (fe->sample_rate(), 44100);
-	BOOST_CHECK_EQUAL (fe->channel_layout(), 1);
-	BOOST_CHECK_EQUAL (fe->to_string(), "external 44100 1");
-}
-
 BOOST_AUTO_TEST_CASE (format_test)
 {
 	Format::setup_formats ();
 	
 	Format const * f = Format::from_nickname ("Flat");
 	BOOST_CHECK (f);
-	BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr<const Film> ()), 185);
+//	BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr<const Film> ()), 185);
 	
 	f = Format::from_nickname ("Scope");
 	BOOST_CHECK (f);
-	BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr<const Film> ()), 239);
+//	BOOST_CHECK_EQUAL (f->ratio_as_integer(shared_ptr<const Film> ()), 239);
 }
 
 BOOST_AUTO_TEST_CASE (util_test)
@@ -355,17 +322,6 @@ BOOST_AUTO_TEST_CASE (md5_digest_test)
 	BOOST_CHECK_THROW (md5_digest ("foobar"), OpenFileError);
 }
 
-BOOST_AUTO_TEST_CASE (paths_test)
-{
-	shared_ptr<Film> f = new_test_film ("paths_test");
-	f->set_directory ("build/test/a/b/c/d/e");
-
-	f->_content = "/foo/bar/baz";
-	BOOST_CHECK_EQUAL (f->content_path(), "/foo/bar/baz");
-	f->_content = "foo/bar/baz";
-	BOOST_CHECK_EQUAL (f->content_path(), "build/test/a/b/c/d/e/foo/bar/baz");
-}
-
 void
 do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription* description, shared_ptr<EncodedData> locally_encoded)
 {
@@ -457,7 +413,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_test)
 {
 	shared_ptr<Film> film = new_test_film ("make_dcp_test");
 	film->set_name ("test_film2");
-	film->set_content ("../../../test/test.mp4");
+//	film->set_content ("../../../test/test.mp4");
 	film->set_format (Format::from_nickname ("Flat"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
 	film->make_dcp ();
@@ -487,8 +443,8 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
 {
 	shared_ptr<Film> film = new_test_film ("make_dcp_with_range_test");
 	film->set_name ("test_film3");
-	film->set_content ("../../../test/test.mp4");
-	film->examine_content ();
+//	film->set_content ("../../../test/test.mp4");
+//	film->examine_content ();
 	film->set_format (Format::from_nickname ("Flat"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
 	film->set_trim_end (42);
@@ -649,44 +605,44 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
 	shared_ptr<Film> f = new_test_film ("audio_sampling_rate_test");
-	f->set_source_frame_rate (24);
+//	f->set_source_frame_rate (24);
 	f->set_dcp_frame_rate (24);
 
-	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
+//	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
 
-	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
+//	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
 
-	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 80000, 0)));
+//	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 80000, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000);
 
-	f->set_source_frame_rate (23.976);
+//	f->set_source_frame_rate (23.976);
 	f->set_dcp_frame_rate (best_dcp_frame_rate (23.976));
-	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
+//	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
 
-	f->set_source_frame_rate (29.97);
+//	f->set_source_frame_rate (29.97);
 	f->set_dcp_frame_rate (best_dcp_frame_rate (29.97));
 	BOOST_CHECK_EQUAL (f->dcp_frame_rate (), 30);
-	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
+//	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
 
-	f->set_source_frame_rate (25);
+//	f->set_source_frame_rate (25);
 	f->set_dcp_frame_rate (24);
-	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
+//	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000);
 
-	f->set_source_frame_rate (25);
+//	f->set_source_frame_rate (25);
 	f->set_dcp_frame_rate (24);
-	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
+//	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
 	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000);
 
 	/* Check some out-there conversions (not the best) */
 	
-	f->set_source_frame_rate (14.99);
+//	f->set_source_frame_rate (14.99);
 	f->set_dcp_frame_rate (25);
-	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 16000, 0)));
+//	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 16000, 0)));
 	/* The FrameRateConversion within target_audio_sample_rate should choose to double-up
 	   the 14.99 fps video to 30 and then run it slow at 25.
 	*/
-- 
cgit v1.2.3


From a054c067ab2cbf6c5abc5df4caa08ffaac206f0b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 31 Mar 2013 16:04:10 +0100
Subject: Content can be added and previewed.

---
 src/lib/ab_transcode_job.cc    |   6 +-
 src/lib/ab_transcode_job.h     |   5 +-
 src/lib/ab_transcoder.cc       |   3 +-
 src/lib/ab_transcoder.h        |   1 -
 src/lib/analyse_audio_job.cc   |   1 -
 src/lib/audio_decoder.cc       |   4 +-
 src/lib/audio_decoder.h        |   2 +-
 src/lib/dcp_video_frame.cc     |   1 -
 src/lib/decoder.cc             |   4 +-
 src/lib/decoder.h              |   5 +-
 src/lib/decoder_factory.cc     |   2 +-
 src/lib/decoder_factory.h      |   4 +-
 src/lib/encoder.cc             |   1 -
 src/lib/examine_content_job.cc |   1 -
 src/lib/ffmpeg_content.cc      |   5 +-
 src/lib/ffmpeg_decoder.cc      |  31 ++++----
 src/lib/ffmpeg_decoder.h       |   7 +-
 src/lib/film.cc                |   8 +-
 src/lib/imagemagick_decoder.cc |   7 +-
 src/lib/imagemagick_decoder.h  |   2 +-
 src/lib/options.h              |  43 -----------
 src/lib/playlist.cc            | 172 ++++++++++++++++++++++++++++++++---------
 src/lib/playlist.h             |  12 +++
 src/lib/sndfile_decoder.cc     |   6 +-
 src/lib/sndfile_decoder.h      |   2 +-
 src/lib/transcode_job.cc       |   6 +-
 src/lib/transcode_job.h        |   6 +-
 src/lib/transcoder.cc          |   4 +-
 src/lib/transcoder.h           |   3 -
 src/lib/video_decoder.cc       |   5 +-
 src/lib/video_decoder.h        |   2 +-
 src/tools/servomatictest.cc    |  11 ++-
 src/wx/film_editor.cc          |   1 +
 src/wx/film_viewer.cc          |  63 +++++++--------
 src/wx/film_viewer.h           |   2 +-
 35 files changed, 232 insertions(+), 206 deletions(-)
 delete mode 100644 src/lib/options.h

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/ab_transcode_job.cc b/src/lib/ab_transcode_job.cc
index f17d43916..2bdff47de 100644
--- a/src/lib/ab_transcode_job.cc
+++ b/src/lib/ab_transcode_job.cc
@@ -32,11 +32,9 @@ using std::string;
 using boost::shared_ptr;
 
 /** @param f Film to compare.
- *  @param o Decode options.
  */
-ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, DecodeOptions o)
+ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f)
 	: Job (f)
-	, _decode_opt (o)
 {
 	_film_b.reset (new Film (*_film));
 	_film_b->set_scaler (Config::instance()->reference_scaler ());
@@ -54,7 +52,7 @@ ABTranscodeJob::run ()
 {
 	try {
 		/* _film_b is the one with reference filters */
-		ABTranscoder w (_film_b, _film, _decode_opt, shared_from_this ());
+		ABTranscoder w (_film_b, _film, shared_from_this ());
 		w.go ();
 		set_progress (1);
 		set_state (FINISHED_OK);
diff --git a/src/lib/ab_transcode_job.h b/src/lib/ab_transcode_job.h
index 5d029a18b..cd82d4247 100644
--- a/src/lib/ab_transcode_job.h
+++ b/src/lib/ab_transcode_job.h
@@ -23,7 +23,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include "job.h"
-#include "options.h"
 
 class Film;
 
@@ -38,8 +37,7 @@ class ABTranscodeJob : public Job
 {
 public:
 	ABTranscodeJob (
-		boost::shared_ptr<Film> f,
-		DecodeOptions o
+		boost::shared_ptr<Film> f
 		);
 
 	std::string name () const;
@@ -48,5 +46,4 @@ public:
 private:
 	/** Copy of our Film using the reference filters and scaler */
 	boost::shared_ptr<Film> _film_b;
-	DecodeOptions _decode_opt;
 };
diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 0c687008d..6fc438ee8 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -23,7 +23,6 @@
 #include "film.h"
 #include "encoder.h"
 #include "job.h"
-#include "options.h"
 #include "image.h"
 #include "playlist.h"
 #include "matcher.h"
@@ -47,7 +46,7 @@ using boost::dynamic_pointer_cast;
  *  @param e Encoder to use.
  */
 
-ABTranscoder::ABTranscoder (shared_ptr<Film> a, shared_ptr<Film> b, DecodeOptions o, shared_ptr<Job> j)
+ABTranscoder::ABTranscoder (shared_ptr<Film> a, shared_ptr<Film> b, shared_ptr<Job> j)
 	: _film_a (a)
 	, _film_b (b)
 	, _playlist_a (_film_a->playlist ())
diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
index 14277c562..090c26fb7 100644
--- a/src/lib/ab_transcoder.h
+++ b/src/lib/ab_transcoder.h
@@ -48,7 +48,6 @@ public:
 	ABTranscoder (
 		boost::shared_ptr<Film> a,
 		boost::shared_ptr<Film> b,
-		DecodeOptions o,
 		boost::shared_ptr<Job> j
 		);
 	
diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 74491943b..6e6dda886 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -21,7 +21,6 @@
 #include "analyse_audio_job.h"
 #include "compose.hpp"
 #include "film.h"
-#include "options.h"
 #include "playlist.h"
 
 #include "i18n.h"
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index a72cf11bb..e2006a795 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -22,8 +22,8 @@
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<AudioContent> c, DecodeOptions o)
-	: Decoder (f, o)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<AudioContent> c)
+	: Decoder (f)
 {
 
 }
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 7d2a2bb62..cbb84b52d 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -35,7 +35,7 @@ class AudioContent;
 class AudioDecoder : public AudioSource, public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<AudioContent>, DecodeOptions);
+	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<AudioContent>);
 };
 
 #endif
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index d674393a9..e9499871a 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -47,7 +47,6 @@
 #include "dcp_video_frame.h"
 #include "lut.h"
 #include "config.h"
-#include "options.h"
 #include "exceptions.h"
 #include "server.h"
 #include "util.h"
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 2fe265c14..c40446919 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -23,7 +23,6 @@
 
 #include <iostream>
 #include "film.h"
-#include "options.h"
 #include "exceptions.h"
 #include "util.h"
 #include "decoder.h"
@@ -36,9 +35,8 @@ using boost::shared_ptr;
 /** @param f Film.
  *  @param o Decode options.
  */
-Decoder::Decoder (shared_ptr<const Film> f, DecodeOptions o)
+Decoder::Decoder (shared_ptr<const Film> f)
 	: _film (f)
-	, _opt (o)
 {
 	_film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
 }
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 50aa16dba..4ccdc046f 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -33,7 +33,6 @@
 #include "video_source.h"
 #include "audio_source.h"
 #include "film.h"
-#include "options.h"
 
 class Image;
 class Log;
@@ -52,7 +51,7 @@ class FilterGraph;
 class Decoder
 {
 public:
-	Decoder (boost::shared_ptr<const Film>, DecodeOptions);
+	Decoder (boost::shared_ptr<const Film>);
 	virtual ~Decoder () {}
 
 	virtual bool pass () = 0;
@@ -63,8 +62,6 @@ public:
 
 protected:
 	boost::shared_ptr<const Film> _film;
-	/** our decode options */
-	DecodeOptions _opt;
 
 private:
 	virtual void film_changed (Film::Property) {}
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index feaa1c7ef..7940edc2e 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -36,7 +36,7 @@ using boost::dynamic_pointer_cast;
 
 Decoders
 decoder_factory (
-	shared_ptr<Film> f, DecodeOptions o
+	shared_ptr<Film> f
 	)
 {
 	return Decoders ();
diff --git a/src/lib/decoder_factory.h b/src/lib/decoder_factory.h
index 8076b01c7..3fd91f876 100644
--- a/src/lib/decoder_factory.h
+++ b/src/lib/decoder_factory.h
@@ -24,8 +24,6 @@
  *  @brief A method to create appropriate decoders for some content.
  */
 
-#include "options.h"
-
 class Film;
 class VideoDecoder;
 class AudioDecoder;
@@ -43,7 +41,7 @@ struct Decoders {
 };
 
 extern Decoders decoder_factory (
-	boost::shared_ptr<Film>, DecodeOptions
+	boost::shared_ptr<Film>
 	);
 
 #endif
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 970213793..00807f863 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -27,7 +27,6 @@
 #include <libdcp/picture_asset.h>
 #include "encoder.h"
 #include "util.h"
-#include "options.h"
 #include "film.h"
 #include "log.h"
 #include "exceptions.h"
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index c600132c3..aad7f265e 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -19,7 +19,6 @@
 
 #include <boost/filesystem.hpp>
 #include "examine_content_job.h"
-#include "options.h"
 #include "log.h"
 #include "content.h"
 
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 25efb1ebf..6109b7212 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -1,6 +1,5 @@
 #include "ffmpeg_content.h"
 #include "ffmpeg_decoder.h"
-#include "options.h"
 #include "compose.hpp"
 #include "job.h"
 #include "util.h"
@@ -33,9 +32,7 @@ FFmpegContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
 
 	job->set_progress_unknown ();
 
-	DecodeOptions o;
-	o.decode_audio = false;
-	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), o));
+	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false, true));
 
 	ContentVideoFrame video_length = 0;
 	if (quick) {
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index c8e46776f..7b56a5971 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -41,7 +41,6 @@ extern "C" {
 #include "transcoder.h"
 #include "job.h"
 #include "filter.h"
-#include "options.h"
 #include "exceptions.h"
 #include "image.h"
 #include "util.h"
@@ -62,10 +61,10 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using libdcp::Size;
 
-FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<FFmpegContent> c, DecodeOptions o)
-	: Decoder (f, o)
-	, VideoDecoder (f, c, o)
-	, AudioDecoder (f, c, o)
+FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<FFmpegContent> c, bool video, bool audio, bool subtitles, bool video_sync)
+	: Decoder (f)
+	, VideoDecoder (f, c)
+	, AudioDecoder (f, c)
 	, _ffmpeg_content (c)
 	, _format_context (0)
 	, _video_stream (-1)
@@ -76,13 +75,17 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<FFmpegContent
 	, _audio_codec (0)
 	, _subtitle_codec_context (0)
 	, _subtitle_codec (0)
+	, _decode_video (video)
+	, _decode_audio (audio)
+	, _decode_subtitles (subtitles)
+	, _video_sync (video_sync)
 {
 	setup_general ();
 	setup_video ();
 	setup_audio ();
 	setup_subtitle ();
 
-	if (!o.video_sync) {
+	if (!video_sync) {
 		_first_video = 0;
 	}
 }
@@ -230,13 +233,13 @@ FFmpegDecoder::pass ()
 
 		int frame_finished;
 
-		if (_opt.decode_video) {
+		if (_decode_video) {
 			while (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
 				filter_and_emit_video (_frame);
 			}
 		}
 
-		if (_ffmpeg_content->audio_stream() && _opt.decode_audio) {
+		if (_ffmpeg_content->audio_stream() && _decode_audio) {
 			decode_audio_packet ();
 		}
 
@@ -245,7 +248,7 @@ FFmpegDecoder::pass ()
 
 	avcodec_get_frame_defaults (_frame);
 
-	if (_packet.stream_index == _video_stream && _opt.decode_video) {
+	if (_packet.stream_index == _video_stream && _decode_video) {
 
 		int frame_finished;
 		int const r = avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet);
@@ -255,16 +258,16 @@ FFmpegDecoder::pass ()
 				_film->log()->log (String::compose (N_("Used only %1 bytes of %2 in packet"), r, _packet.size));
 			}
 
-			if (_opt.video_sync) {
+			if (_video_sync) {
 				out_with_sync ();
 			} else {
 				filter_and_emit_video (_frame);
 			}
 		}
 
-	} else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->id && _opt.decode_audio) {
+	} else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->id && _decode_audio) {
 		decode_audio_packet ();
-	} else if (_ffmpeg_content->subtitle_stream() && _packet.stream_index == _ffmpeg_content->subtitle_stream()->id && _opt.decode_subtitles && _first_video) {
+	} else if (_ffmpeg_content->subtitle_stream() && _packet.stream_index == _ffmpeg_content->subtitle_stream()->id && _decode_subtitles && _first_video) {
 
 		int got_subtitle;
 		AVSubtitle sub;
@@ -633,9 +636,9 @@ FFmpegDecoder::decode_audio_packet ()
 			   was before this packet.  Until then audio is thrown away.
 			*/
 			
-			if ((_first_video && _first_video.get() <= source_pts_seconds) || !_opt.decode_video) {
+			if ((_first_video && _first_video.get() <= source_pts_seconds) || !_decode_video) {
 				
-				if (!_first_audio && _opt.decode_video) {
+				if (!_first_audio && _decode_video) {
 					_first_audio = source_pts_seconds;
 					
 					/* This is our first audio frame, and if we've arrived here we must have had our
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index a0900d89f..ef66f09d9 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -57,7 +57,7 @@ class Log;
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<FFmpegContent>, DecodeOptions);
+	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<FFmpegContent>, bool video, bool audio, bool subtitles, bool video_sync);
 	~FFmpegDecoder ();
 
 	float frames_per_second () const;
@@ -129,4 +129,9 @@ private:
 
         std::vector<FFmpegSubtitleStream> _subtitle_streams;
         std::vector<FFmpegAudioStream> _audio_streams;
+
+	bool _decode_video;
+	bool _decode_audio;
+	bool _decode_subtitles;
+	bool _video_sync;
 };
diff --git a/src/lib/film.cc b/src/lib/film.cc
index f69f63fd8..0e57cf8eb 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -40,7 +40,6 @@
 #include "transcode_job.h"
 #include "scp_dcp_job.h"
 #include "log.h"
-#include "options.h"
 #include "exceptions.h"
 #include "examine_content_job.h"
 #include "scaler.h"
@@ -296,15 +295,12 @@ Film::make_dcp ()
 		throw MissingSettingError (_("name"));
 	}
 
-	DecodeOptions od;
-	od.decode_subtitles = with_subtitles ();
-
 	shared_ptr<Job> r;
 
 	if (dcp_ab()) {
-		r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this(), od)));
+		r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this())));
 	} else {
-		r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this(), od)));
+		r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this())));
 	}
 }
 
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index aa3c64f93..c3723f610 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -32,10 +32,9 @@ using std::cout;
 using boost::shared_ptr;
 using libdcp::Size;
 
-ImageMagickDecoder::ImageMagickDecoder (
-	shared_ptr<const Film> f, shared_ptr<ImageMagickContent> c, DecodeOptions o)
-	: Decoder (f, o)
-	, VideoDecoder (f, c, o)
+ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<ImageMagickContent> c)
+	: Decoder (f)
+	, VideoDecoder (f, c)
 	, _imagemagick_content (c)
 	, _position (0)
 {
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index b04bd88b1..a26e283c0 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -28,7 +28,7 @@ class ImageMagickContent;
 class ImageMagickDecoder : public VideoDecoder
 {
 public:
-	ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<ImageMagickContent>, DecodeOptions);
+	ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<ImageMagickContent>);
 
 	float frames_per_second () const {
 		/* We don't know */
diff --git a/src/lib/options.h b/src/lib/options.h
deleted file mode 100644
index 0d2c07fd5..000000000
--- a/src/lib/options.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef DVDOMATIC_OPTIONS_H
-#define DVDOMATIC_OPTIONS_H
-
-/** @file src/options.h
- *  @brief Options for a decoding operation.
- */
-
-class DecodeOptions
-{
-public:
-	DecodeOptions ()
-		: decode_video (true)
-		, decode_audio (true)
-		, decode_subtitles (false)
-		, video_sync (true)
-	{}
-
-	bool decode_video;
-	bool decode_audio;
-	bool decode_subtitles;
-	bool video_sync;
-};
-
-#endif
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 17ecd2f37..fc9edac48 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -31,9 +31,12 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 Playlist::Playlist (shared_ptr<const Film> f, list<shared_ptr<Content> > c)
-	: _video_from (VIDEO_NONE)
+	: _film (f)
+	, _video_from (VIDEO_NONE)
 	, _audio_from (AUDIO_NONE)
+	, _have_setup_decoders (false)
 	, _ffmpeg_decoder_done (false)
+	, _video_sync (true)
 {
 	for (list<shared_ptr<Content> >::const_iterator i = c.begin(); i != c.end(); ++i) {
 		shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
@@ -60,42 +63,6 @@ Playlist::Playlist (shared_ptr<const Film> f, list<shared_ptr<Content> > c)
 			_audio_from = AUDIO_SNDFILE;
 		}
 	}
-
-	if (_video_from == VIDEO_FFMPEG || _audio_from == AUDIO_FFMPEG) {
-		DecodeOptions o;
-		/* XXX: decodeoptions */
-		_ffmpeg_decoder.reset (new FFmpegDecoder (f, _ffmpeg, o));
-	}
-	
-	if (_video_from == VIDEO_FFMPEG) {
-		_ffmpeg_decoder->connect_video (shared_from_this ());
-	}
-
-	if (_audio_from == AUDIO_FFMPEG) {
-		_ffmpeg_decoder->connect_audio (shared_from_this ());
-	}
-
-	if (_video_from == VIDEO_IMAGEMAGICK) {
-		for (list<shared_ptr<ImageMagickContent> >::iterator i = _imagemagick.begin(); i != _imagemagick.end(); ++i) {
-			DecodeOptions o;
-			/* XXX: decodeoptions */
-			shared_ptr<ImageMagickDecoder> d (new ImageMagickDecoder (f, *i, o));
-			_imagemagick_decoders.push_back (d);
-			d->connect_video (shared_from_this ());
-		}
-
-		_imagemagick_decoder = _imagemagick_decoders.begin ();
-	}
-
-	if (_audio_from == AUDIO_SNDFILE) {
-		for (list<shared_ptr<SndfileContent> >::iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
-			DecodeOptions o;
-			/* XXX: decodeoptions */
-			shared_ptr<SndfileDecoder> d (new SndfileDecoder (f, *i, o));
-			_sndfile_decoders.push_back (d);
-			d->connect_audio (shared_from_this ());
-		}
-	}
 }
 
 ContentAudioFrame
@@ -202,6 +169,27 @@ Playlist::video_size () const
 	return libdcp::Size ();
 }
 
+ContentVideoFrame
+Playlist::video_length () const
+{
+	switch (_video_from) {
+	case VIDEO_NONE:
+		return 0;
+	case VIDEO_FFMPEG:
+		return _ffmpeg->video_length ();
+	case VIDEO_IMAGEMAGICK:
+	{
+		ContentVideoFrame l = 0;
+		for (list<shared_ptr<ImageMagickContent> >::const_iterator i = _imagemagick.begin(); i != _imagemagick.end(); ++i) {
+			l += (*i)->video_length ();
+		}
+		return l;
+	}
+	}
+
+	return 0;
+}
+
 bool
 Playlist::has_audio () const
 {
@@ -214,9 +202,26 @@ Playlist::disable_video ()
 	_video_from = VIDEO_NONE;
 }
 
+void
+Playlist::disable_audio ()
+{
+	_audio_from = AUDIO_NONE;
+}
+
+void
+Playlist::disable_subtitles ()
+{
+	/* XXX */
+}
+
 bool
 Playlist::pass ()
 {
+	if (!_have_setup_decoders) {
+		setup_decoders ();
+		_have_setup_decoders = true;
+	}
+	
 	bool done = true;
 	
 	if (_video_from == VIDEO_FFMPEG || _audio_from == AUDIO_FFMPEG) {
@@ -264,3 +269,96 @@ Playlist::process_audio (shared_ptr<AudioBuffers> b)
 	Audio (b);
 }
 
+bool
+Playlist::seek (double t)
+{
+	bool r = false;
+	
+	switch (_video_from) {
+	case VIDEO_NONE:
+		break;
+	case VIDEO_FFMPEG:
+		if (_ffmpeg_decoder->seek (t)) {
+			r = true;
+		}
+		break;
+	case VIDEO_IMAGEMAGICK:
+		if ((*_imagemagick_decoder)->seek (t)) {
+			r = true;
+		}
+		break;
+	}
+
+	/* XXX: don't seek audio because we don't need to... */
+
+	return r;
+}
+
+bool
+Playlist::seek_to_last ()
+{
+	bool r = false;
+	
+	switch (_video_from) {
+	case VIDEO_NONE:
+		break;
+	case VIDEO_FFMPEG:
+		if (_ffmpeg_decoder->seek_to_last ()) {
+			r = true;
+		}
+		break;
+	case VIDEO_IMAGEMAGICK:
+		if ((*_imagemagick_decoder)->seek_to_last ()) {
+			r = true;
+		}
+		break;
+	}
+
+	/* XXX: don't seek audio because we don't need to... */
+
+	return r;
+}
+
+void
+Playlist::setup_decoders ()
+{
+	if (_video_from == VIDEO_FFMPEG || _audio_from == AUDIO_FFMPEG) {
+		_ffmpeg_decoder.reset (
+			new FFmpegDecoder (
+				_film, _ffmpeg, _video_from == VIDEO_FFMPEG, _audio_from == AUDIO_FFMPEG, _film->with_subtitles(), _video_sync
+				)
+			);
+	}
+	
+	if (_video_from == VIDEO_FFMPEG) {
+		_ffmpeg_decoder->connect_video (shared_from_this ());
+	}
+
+	if (_audio_from == AUDIO_FFMPEG) {
+		_ffmpeg_decoder->connect_audio (shared_from_this ());
+	}
+
+	if (_video_from == VIDEO_IMAGEMAGICK) {
+		for (list<shared_ptr<ImageMagickContent> >::iterator i = _imagemagick.begin(); i != _imagemagick.end(); ++i) {
+			shared_ptr<ImageMagickDecoder> d (new ImageMagickDecoder (_film, *i));
+			_imagemagick_decoders.push_back (d);
+			d->connect_video (shared_from_this ());
+		}
+
+		_imagemagick_decoder = _imagemagick_decoders.begin ();
+	}
+
+	if (_audio_from == AUDIO_SNDFILE) {
+		for (list<shared_ptr<SndfileContent> >::iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
+			shared_ptr<SndfileDecoder> d (new SndfileDecoder (_film, *i));
+			_sndfile_decoders.push_back (d);
+			d->connect_audio (shared_from_this ());
+		}
+	}
+}
+
+void
+Playlist::disable_video_sync ()
+{
+	_video_sync = false;
+}
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index b42d46036..d374dc98c 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -48,16 +48,25 @@ public:
 	
 	float video_frame_rate () const;
 	libdcp::Size video_size () const;
+	ContentVideoFrame video_length () const;
 
 	void disable_video ();
+	void disable_audio ();
+	void disable_subtitles ();
+	void disable_video_sync ();
 
 	bool pass ();
 	void set_progress (boost::shared_ptr<Job>);
+	bool seek (double);
+	bool seek_to_last ();
 
 private:
 	void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
 	void process_audio (boost::shared_ptr<AudioBuffers>);
+	void setup_decoders ();
 	
+	boost::shared_ptr<const Film> _film;
+
 	enum {
 		VIDEO_NONE,
 		VIDEO_FFMPEG,
@@ -74,9 +83,12 @@ private:
 	std::list<boost::shared_ptr<ImageMagickContent> > _imagemagick;
 	std::list<boost::shared_ptr<SndfileContent> > _sndfile;
 
+	bool _have_setup_decoders;
 	boost::shared_ptr<FFmpegDecoder> _ffmpeg_decoder;
 	bool _ffmpeg_decoder_done;
 	std::list<boost::shared_ptr<ImageMagickDecoder> > _imagemagick_decoders;
 	std::list<boost::shared_ptr<ImageMagickDecoder> >::iterator _imagemagick_decoder;
 	std::list<boost::shared_ptr<SndfileDecoder> > _sndfile_decoders;
+
+	bool _video_sync;
 };
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 8848ff4f8..daa363c5e 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -36,9 +36,9 @@ using boost::optional;
 
 /* XXX */
 
-SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<SndfileContent> c, DecodeOptions o)
-	: Decoder (f, o)
-	, AudioDecoder (f, c, o)
+SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<SndfileContent> c)
+	: Decoder (f)
+	, AudioDecoder (f, c)
 {
 	sf_count_t frames;
 	SNDFILE* sf = open_file (frames);
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index c06b97a60..9a3ef49b0 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -26,7 +26,7 @@ class SndfileContent;
 class SndfileDecoder : public AudioDecoder
 {
 public:
-	SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<SndfileContent>, DecodeOptions);
+	SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<SndfileContent>);
 
 	bool pass ();
 
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index f8810975b..8b74f7766 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -39,11 +39,9 @@ using std::setprecision;
 using boost::shared_ptr;
 
 /** @param s Film to use.
- *  @param o Decode options.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, DecodeOptions o)
+TranscodeJob::TranscodeJob (shared_ptr<Film> f)
 	: Job (f)
-	, _decode_opt (o)
 {
 	
 }
@@ -62,7 +60,7 @@ TranscodeJob::run ()
 		_film->log()->log (N_("Transcode job starting"));
 		_film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
 
-		Transcoder w (_film, _decode_opt, shared_from_this ());
+		Transcoder w (_film, shared_from_this ());
 		w.go ();
 		set_progress (1);
 		set_state (FINISHED_OK);
diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index a409ec97e..def545958 100644
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -23,7 +23,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include "job.h"
-#include "options.h"
 
 class Encoder;
 
@@ -33,7 +32,7 @@ class Encoder;
 class TranscodeJob : public Job
 {
 public:
-	TranscodeJob (boost::shared_ptr<Film> f, DecodeOptions od);
+	TranscodeJob (boost::shared_ptr<Film> f);
 	
 	std::string name () const;
 	void run ();
@@ -41,7 +40,4 @@ public:
 
 protected:
 	int remaining_time () const;
-
-private:
-	DecodeOptions _decode_opt;
 };
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 19d067149..070258008 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -32,7 +32,6 @@
 #include "film.h"
 #include "matcher.h"
 #include "delay_line.h"
-#include "options.h"
 #include "gain.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
@@ -44,11 +43,10 @@ using boost::dynamic_pointer_cast;
 
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
  *  @param f Film that we are transcoding.
- *  @param o Decode options.
  *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, shared_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
 	: _job (j)
 	, _playlist (f->playlist ())
 	, _encoder (new Encoder (f, _playlist))
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 8d34af948..3c47b0c7e 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -18,7 +18,6 @@
 */
 
 /** @file  src/transcoder.h
- *  @brief A class which takes a Film and some Options, then uses those to transcode the film.
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
  *  as a parameter to the constructor.
@@ -36,7 +35,6 @@ class DelayLine;
 class Playlist;
 
 /** @class Transcoder
- *  @brief A class which takes a Film and some Options, then uses those to transcode the film.
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
  *  as a parameter to the constructor.
@@ -46,7 +44,6 @@ class Transcoder
 public:
 	Transcoder (
 		boost::shared_ptr<Film> f,
-		DecodeOptions o,
 		boost::shared_ptr<Job> j
 		);
 
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index ca1e7ab56..33dd433ea 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -22,7 +22,6 @@
 #include "film.h"
 #include "image.h"
 #include "log.h"
-#include "options.h"
 #include "job.h"
 
 #include "i18n.h"
@@ -30,8 +29,8 @@
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<VideoContent> c, DecodeOptions o)
-	: Decoder (f, o)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<VideoContent> c)
+	: Decoder (f)
 	, _video_frame (0)
 	, _last_source_time (0)
 {
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index a52e5448a..03dc4777a 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -28,7 +28,7 @@ class VideoContent;
 class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<VideoContent>, DecodeOptions);
+	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<VideoContent>);
 
 	/** @return video frames per second, or 0 if unknown */
 	virtual float frames_per_second () const = 0;
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index f5756c693..d08fefa90 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -28,7 +28,6 @@
 #include "scaler.h"
 #include "server.h"
 #include "dcp_video_frame.h"
-#include "options.h"
 #include "decoder.h"
 #include "exceptions.h"
 #include "scaler.h"
@@ -151,12 +150,12 @@ main (int argc, char* argv[])
 	server = new ServerDescription (server_host, 1);
 	shared_ptr<Film> film (new Film (film_dir, true));
 
-	DecodeOptions opt;
-	opt.decode_audio = false;
-	opt.decode_subtitles = true;
-	opt.video_sync = true;
+	/* XXX */
+//	opt.decode_audio = false;
+//	opt.decode_subtitles = true;
+//	opt.video_sync = true;
 
-	Decoders decoders = decoder_factory (film, opt);
+	Decoders decoders = decoder_factory (film);
 	try {
 		decoders.video->Video.connect (boost::bind (process_video, _1, _2, _3));
 		bool done = false;
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index ce1c1abe8..f9a91f8fa 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -347,6 +347,7 @@ FilmEditor::make_content_panel ()
                 s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
 
                 _content->InsertColumn (0, "");
+		_content->SetColumnWidth (0, 512);
 
                 wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
                 _content_add = new wxButton (_content_panel, wxID_ANY, _("Add..."));
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 1e2a74be9..42af4b3c0 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -28,13 +28,13 @@
 #include "lib/format.h"
 #include "lib/util.h"
 #include "lib/job_manager.h"
-#include "lib/options.h"
 #include "lib/subtitle.h"
 #include "lib/image.h"
 #include "lib/scaler.h"
 #include "lib/exceptions.h"
 #include "lib/examine_content_job.h"
 #include "lib/filter.h"
+#include "lib/playlist.h"
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "video_decoder.h"
@@ -97,24 +97,13 @@ FilmViewer::film_changed (Film::Property p)
 		break;
 	case Film::CONTENT:
 	{
-		DecodeOptions o;
-		o.decode_audio = false;
-		o.decode_subtitles = true;
-		o.video_sync = false;
-
-		try {
-			_decoders = decoder_factory (_film, o);
-		} catch (StringError& e) {
-			error_dialog (this, wxString::Format (_("Could not open content file (%s)"), std_to_wx(e.what()).data()));
-			return;
-		}
-		
-		if (_decoders.video == 0) {
-			break;
-		}
-		_decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
-		_decoders.video->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
-//		_decoders.video->set_subtitle_stream (_film->subtitle_stream());
+		_playlist = _film->playlist ();
+		_playlist->disable_audio ();
+		_playlist->disable_subtitles ();
+		_playlist->disable_video_sync ();
+
+		_playlist->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
+//		_playlist->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
 		calculate_sizes ();
 		get_frame ();
 		_panel->Refresh ();
@@ -129,9 +118,9 @@ FilmViewer::film_changed (Film::Property p)
 		update_from_raw ();
 		break;
 	case Film::SUBTITLE_STREAM:
-		if (_decoders.video) {
+//		if (_decoders.video) {
 //			_decoders.video->set_subtitle_stream (_film->subtitle_stream ());
-		}
+//		}
 		break;
 	default:
 		break;
@@ -164,7 +153,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 void
 FilmViewer::decoder_changed ()
 {
-	if (_decoders.video == 0 || _decoders.video->seek_to_last ()) {
+	if (!_playlist == 0 || _playlist->seek_to_last ()) {
 		return;
 	}
 
@@ -176,7 +165,7 @@ FilmViewer::decoder_changed ()
 void
 FilmViewer::timer (wxTimerEvent &)
 {
-	if (!_film || !_decoders.video) {
+	if (!_playlist) {
 		return;
 	}
 	
@@ -185,8 +174,8 @@ FilmViewer::timer (wxTimerEvent &)
 
 	get_frame ();
 
-//	if (_film->length()) {
-//		int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->source_frame_rate());
+//	if (_playlist->video_length()) {
+//		int const new_slider_position = 4096 * _playlist->last_source_time() / (_film->length().get() / _film->source_frame_rate());
 //		if (new_slider_position != _slider->GetValue()) {
 //			_slider->SetValue (new_slider_position);
 //		}
@@ -231,13 +220,13 @@ FilmViewer::paint_panel (wxPaintEvent &)
 void
 FilmViewer::slider_moved (wxScrollEvent &)
 {
-//	if (!_film || !_film->length() || !_decoders.video) {
-//		return;
-//	}
+	if (!_film || !_playlist) {
+		return;
+	}
 	
-//	if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->source_frame_rate()))) {
-//		return;
-//	}
+	if (_playlist->seek (_slider->GetValue() * _playlist->video_length() / (4096 * _playlist->video_frame_rate()))) {
+		return;
+	}
 	
 	get_frame ();
 	_panel->Refresh ();
@@ -319,7 +308,7 @@ FilmViewer::raw_to_display ()
 void
 FilmViewer::calculate_sizes ()
 {
-	if (!_film) {
+	if (!_film || !_playlist) {
 		return;
 	}
 
@@ -342,9 +331,9 @@ FilmViewer::calculate_sizes ()
 	   of our _display_frame.
 	*/
 	_display_frame_x = 0;
-//	if (format) {
-//		_display_frame_x = static_cast<float> (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width;
-//	}
+	if (format) {
+		_display_frame_x = static_cast<float> (format->dcp_padding (_playlist)) * _out_size.width / format->dcp_size().width;
+	}
 
 	_film_size = _out_size;
 	_film_size.width -= _display_frame_x * 2;
@@ -392,7 +381,7 @@ FilmViewer::get_frame ()
 	/* Clear our raw frame in case we don't get a new one */
 	_raw_frame.reset ();
 
-	if (_decoders.video == 0) {
+	if (!_playlist) {
 		_display_frame.reset ();
 		return;
 	}
@@ -400,7 +389,7 @@ FilmViewer::get_frame ()
 	try {
 		_got_frame = false;
 		while (!_got_frame) {
-			if (_decoders.video->pass ()) {
+			if (_playlist->pass ()) {
 				/* We didn't get a frame before the decoder gave up,
 				   so clear our display frame.
 				*/
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 456301eb4..b552a3dbc 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -58,6 +58,7 @@ private:
 	void active_jobs_changed (bool);
 
 	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<Playlist> _playlist;
 
 	wxSizer* _v_sizer;
 	wxPanel* _panel;
@@ -65,7 +66,6 @@ private:
 	wxToggleButton* _play_button;
 	wxTimer _timer;
 
-	Decoders _decoders;
 	boost::shared_ptr<Image> _raw_frame;
 	boost::shared_ptr<Subtitle> _raw_sub;
 	boost::shared_ptr<Image> _display_frame;
-- 
cgit v1.2.3


From db468a15e50c8491d4b8462ad0676be905f49065 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 1 Apr 2013 22:49:31 +0100
Subject: Various bits.

---
 src/lib/ab_transcoder.cc       |  24 ++++----
 src/lib/ab_transcoder.h        |   6 +-
 src/lib/analyse_audio_job.cc   |  16 +++---
 src/lib/audio_decoder.cc       |   2 +-
 src/lib/audio_decoder.h        |   2 +-
 src/lib/encoder.cc             |  31 +++++------
 src/lib/encoder.h              |   4 +-
 src/lib/ffmpeg_decoder.cc      |   6 +-
 src/lib/ffmpeg_decoder.h       |   4 +-
 src/lib/film.cc                |  73 ++++++++++++++++++++----
 src/lib/film.h                 |  15 ++++-
 src/lib/format.cc              |  12 ++--
 src/lib/format.h               |  16 +++---
 src/lib/imagemagick_decoder.cc |   4 +-
 src/lib/imagemagick_decoder.h  |   4 +-
 src/lib/playlist.cc            | 124 +++++++++++++++++++++++++++--------------
 src/lib/playlist.h             |  77 ++++++++++++++++++-------
 src/lib/sndfile_decoder.cc     |   4 +-
 src/lib/sndfile_decoder.h      |   4 +-
 src/lib/transcoder.cc          |  22 ++++----
 src/lib/transcoder.h           |   4 +-
 src/lib/video_decoder.cc       |   9 +--
 src/lib/video_decoder.h        |   2 +-
 src/lib/writer.cc              |   7 +--
 src/lib/writer.h               |   4 +-
 src/tools/servomatictest.cc    |   8 +--
 src/wx/audio_dialog.cc         |  11 ++--
 src/wx/audio_dialog.h          |   2 -
 src/wx/film_viewer.cc          |  40 ++++++-------
 src/wx/film_viewer.h           |   2 +-
 wscript                        |   3 +
 31 files changed, 336 insertions(+), 206 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 6fc438ee8..6bf092fee 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -49,20 +49,20 @@ using boost::dynamic_pointer_cast;
 ABTranscoder::ABTranscoder (shared_ptr<Film> a, shared_ptr<Film> b, shared_ptr<Job> j)
 	: _film_a (a)
 	, _film_b (b)
-	, _playlist_a (_film_a->playlist ())
-	, _playlist_b (_film_b->playlist ())
+	, _player_a (_film_a->player ())
+	, _player_b (_film_b->player ())
 	, _job (j)
-	, _encoder (new Encoder (_film_a, _playlist_a))
+	, _encoder (new Encoder (_film_a))
 	, _combiner (new Combiner (a->log()))
 {
-	if (_playlist_a->has_audio ()) {
-		_matcher.reset (new Matcher (_film_a->log(), _playlist_a->audio_frame_rate(), _playlist_a->video_frame_rate()));
-		_delay_line.reset (new DelayLine (_film_a->log(), _playlist_a->audio_channels(), _film_a->audio_delay() * _playlist_a->audio_frame_rate() / 1000));
+	if (_film_a->has_audio ()) {
+		_matcher.reset (new Matcher (_film_a->log(), _film_a->audio_frame_rate(), _film_a->video_frame_rate()));
+		_delay_line.reset (new DelayLine (_film_a->log(), _film_a->audio_channels(), _film_a->audio_delay() * _film_a->audio_frame_rate() / 1000));
 		_gain.reset (new Gain (_film_a->log(), _film_a->audio_gain()));
 	}
 
-	_playlist_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
-	_playlist_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3));
+	_player_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
+	_player_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3));
 
 	if (_matcher) {
 		_combiner->connect_video (_matcher);
@@ -72,7 +72,7 @@ ABTranscoder::ABTranscoder (shared_ptr<Film> a, shared_ptr<Film> b, shared_ptr<J
 	}
 	
 	if (_matcher && _delay_line) {
-		_playlist_a->connect_audio (_delay_line);
+		_player_a->connect_audio (_delay_line);
 		_delay_line->connect_audio (_matcher);
 		_matcher->connect_audio (_gain);
 		_gain->connect_audio (_encoder);
@@ -87,11 +87,11 @@ ABTranscoder::go ()
 	bool done[2] = { false, false };
 	
 	while (1) {
-		done[0] = _playlist_a->pass ();
-		done[1] = _playlist_b->pass ();
+		done[0] = _player_a->pass ();
+		done[1] = _player_b->pass ();
 
 		if (_job) {
-			_playlist_a->set_progress (_job);
+			_player_a->set_progress (_job);
 		}
 
 		if (done[0] && done[1]) {
diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
index 5ce4a03da..b1b01d724 100644
--- a/src/lib/ab_transcoder.h
+++ b/src/lib/ab_transcoder.h
@@ -35,7 +35,7 @@ class Matcher;
 class DelayLine;
 class Gain;
 class Combiner;
-class Playlist;
+class Player;
 
 /** @class ABTranscoder
  *  @brief A transcoder which uses one Film for the left half of the screen, and a different one
@@ -55,8 +55,8 @@ public:
 private:
 	boost::shared_ptr<Film> _film_a;
 	boost::shared_ptr<Film> _film_b;
-	boost::shared_ptr<Playlist> _playlist_a;
-	boost::shared_ptr<Playlist> _playlist_b;
+	boost::shared_ptr<Player> _player_a;
+	boost::shared_ptr<Player> _player_b;
 	boost::shared_ptr<Job> _job;
 	boost::shared_ptr<Encoder> _encoder;
 	boost::shared_ptr<Combiner> _combiner;
diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 6e6dda886..e2c9c5b18 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -50,18 +50,18 @@ AnalyseAudioJob::name () const
 void
 AnalyseAudioJob::run ()
 {
-	shared_ptr<Playlist> playlist = _film->playlist ();
-	playlist->disable_video ();
+	shared_ptr<Player> player = _film->player ();
+	player->disable_video ();
 	
-	playlist->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
+	player->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
 
-	_samples_per_point = max (int64_t (1), playlist->audio_length() / _num_points);
+	_samples_per_point = max (int64_t (1), _film->audio_length() / _num_points);
 
-	_current.resize (playlist->audio_channels ());
-	_analysis.reset (new AudioAnalysis (playlist->audio_channels()));
+	_current.resize (_film->audio_channels ());
+	_analysis.reset (new AudioAnalysis (_film->audio_channels()));
 			 
-	while (!playlist->pass()) {
-		set_progress (float (_done) / playlist->audio_length ());
+	while (!player->pass()) {
+		set_progress (float (_done) / _film->audio_length ());
 	}
 
 	_analysis->write (_film->audio_analysis_path ());
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index e2006a795..df13a984a 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -22,7 +22,7 @@
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<AudioContent> c)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> f)
 	: Decoder (f)
 {
 
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index cbb84b52d..24e2796ae 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -35,7 +35,7 @@ class AudioContent;
 class AudioDecoder : public AudioSource, public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<AudioContent>);
+	AudioDecoder (boost::shared_ptr<const Film>);
 };
 
 #endif
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 00807f863..5c3e56709 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -53,9 +53,8 @@ using namespace boost;
 int const Encoder::_history_size = 25;
 
 /** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Playlist> p)
+Encoder::Encoder (shared_ptr<Film> f)
 	: _film (f)
-	, _playlist (p)
 	, _video_frames_in (0)
 	, _video_frames_out (0)
 #ifdef HAVE_SWRESAMPLE	  
@@ -78,22 +77,22 @@ Encoder::~Encoder ()
 void
 Encoder::process_begin ()
 {
-	if (_playlist->has_audio() && _playlist->audio_frame_rate() != _film->target_audio_sample_rate()) {
+	if (_film->has_audio() && _film->audio_frame_rate() != _film->target_audio_sample_rate()) {
 #ifdef HAVE_SWRESAMPLE
 
 		stringstream s;
-		s << String::compose (N_("Will resample audio from %1 to %2"), _playlist->audio_frame_rate(), _film->target_audio_sample_rate());
+		s << String::compose (N_("Will resample audio from %1 to %2"), _film->audio_frame_rate(), _film->target_audio_sample_rate());
 		_film->log()->log (s.str ());
 
 		/* We will be using planar float data when we call the resampler */
 		_swr_context = swr_alloc_set_opts (
 			0,
-			_playlist->audio_channel_layout(),
+			_film->audio_channel_layout(),
 			AV_SAMPLE_FMT_FLTP,
 			_film->target_audio_sample_rate(),
-			_playlist->audio_channel_layout(),
+			_film->audio_channel_layout(),
 			AV_SAMPLE_FMT_FLTP,
-			_playlist->audio_frame_rate(),
+			_film->audio_frame_rate(),
 			0, 0
 			);
 		
@@ -119,7 +118,7 @@ Encoder::process_begin ()
 		}
 	}
 
-	_writer.reset (new Writer (_film, _playlist));
+	_writer.reset (new Writer (_film));
 }
 
 
@@ -127,9 +126,9 @@ void
 Encoder::process_end ()
 {
 #if HAVE_SWRESAMPLE	
-	if (_playlist->has_audio() && _playlist->audio_channels() && _swr_context) {
+	if (_film->has_audio() && _film->audio_channels() && _swr_context) {
 
-		shared_ptr<AudioBuffers> out (new AudioBuffers (_playlist->audio_channels(), 256));
+		shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_channels(), 256));
 			
 		while (1) {
 			int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0);
@@ -234,7 +233,7 @@ Encoder::frame_done ()
 void
 Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub)
 {
-	FrameRateConversion frc (_playlist->video_frame_rate(), _film->dcp_frame_rate());
+	FrameRateConversion frc (_film->video_frame_rate(), _film->dcp_frame_rate());
 	
 	if (frc.skip && (_video_frames_in % 2)) {
 		++_video_frames_in;
@@ -272,7 +271,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		TIMING ("adding to queue of %1", _queue.size ());
 		_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_playlist),
+						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
 						  _film->subtitle_offset(), _film->subtitle_scale(),
 						  _film->scaler(), _video_frames_out, _film->dcp_frame_rate(), s.second,
 						  _film->colour_lut(), _film->j2k_bandwidth(),
@@ -302,9 +301,9 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 	if (_swr_context) {
 
 		/* Compute the resampled frames count and add 32 for luck */
-		int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _playlist->audio_frame_rate()) + 32;
+		int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _film->audio_frame_rate()) + 32;
 
-		shared_ptr<AudioBuffers> resampled (new AudioBuffers (_playlist->audio_channels(), max_resampled_frames));
+		shared_ptr<AudioBuffers> resampled (new AudioBuffers (_film->audio_channels(), max_resampled_frames));
 
 		/* Resample audio */
 		int const resampled_frames = swr_convert (
@@ -426,8 +425,8 @@ Encoder::encoder_thread (ServerDescription* server)
 void
 Encoder::write_audio (shared_ptr<const AudioBuffers> data)
 {
-	AudioMapping m (_playlist->audio_channels ());
-	if (m.dcp_channels() != _playlist->audio_channels()) {
+	AudioMapping m (_film->audio_channels ());
+	if (m.dcp_channels() != _film->audio_channels()) {
 
 		/* Remap (currently just for mono -> 5.1) */
 
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index c84ee027a..86880bc34 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -51,7 +51,6 @@ class ServerDescription;
 class DCPVideoFrame;
 class EncodedData;
 class Writer;
-class Playlist;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -63,7 +62,7 @@ class Playlist;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-	Encoder (boost::shared_ptr<Film> f, boost::shared_ptr<Playlist>);
+	Encoder (boost::shared_ptr<Film> f);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
@@ -96,7 +95,6 @@ private:
 
 	/** Film that we are encoding */
 	boost::shared_ptr<Film> _film;
-	boost::shared_ptr<Playlist> _playlist;
 
 	/** Mutex for _time_history and _last_frame */
 	mutable boost::mutex _history_mutex;
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 7b56a5971..25ca9bb88 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -61,10 +61,10 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using libdcp::Size;
 
-FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<FFmpegContent> c, bool video, bool audio, bool subtitles, bool video_sync)
+FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegContent> c, bool video, bool audio, bool subtitles, bool video_sync)
 	: Decoder (f)
-	, VideoDecoder (f, c)
-	, AudioDecoder (f, c)
+	, VideoDecoder (f)
+	, AudioDecoder (f)
 	, _ffmpeg_content (c)
 	, _format_context (0)
 	, _video_stream (-1)
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index ef66f09d9..71ecf7906 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -57,7 +57,7 @@ class Log;
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<FFmpegContent>, bool video, bool audio, bool subtitles, bool video_sync);
+	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio, bool subtitles, bool video_sync);
 	~FFmpegDecoder ();
 
 	float frames_per_second () const;
@@ -105,7 +105,7 @@ private:
 
 	std::string stream_name (AVStream* s) const;
 
-	boost::shared_ptr<FFmpegContent> _ffmpeg_content;
+	boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
 	AVFormatContext* _format_context;
 	int _video_stream;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index f2c7a654a..fe16a65fa 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -91,7 +91,8 @@ int const Film::state_version = 4;
  */
 
 Film::Film (string d, bool must_exist)
-	: _use_dci_name (true)
+	: _playlist (new Playlist)
+	, _use_dci_name (true)
 	, _trust_content_headers (true)
 	, _dcp_content_type (0)
 	, _format (0)
@@ -151,6 +152,7 @@ Film::Film (Film const & o)
 	: boost::enable_shared_from_this<Film> (o)
 	/* note: the copied film shares the original's log */
 	, _log               (o._log)
+	, _playlist          (new Playlist)
 	, _directory         (o._directory)
 	, _name              (o._name)
 	, _use_dci_name      (o._use_dci_name)
@@ -175,7 +177,7 @@ Film::Film (Film const & o)
 	, _dcp_frame_rate    (o._dcp_frame_rate)
 	, _dirty             (o._dirty)
 {
-	
+	_playlist->setup (_content);
 }
 
 Film::~Film ()
@@ -554,17 +556,14 @@ Film::file (string f) const
 int
 Film::target_audio_sample_rate () const
 {
-	/* XXX: how often is this method called? */
-	
-	boost::shared_ptr<Playlist> p = playlist ();
-	if (p->has_audio ()) {
+	if (has_audio ()) {
 		return 0;
 	}
 	
 	/* Resample to a DCI-approved sample rate */
-	double t = dcp_audio_sample_rate (p->audio_frame_rate());
+	double t = dcp_audio_sample_rate (audio_frame_rate());
 
-	FrameRateConversion frc (p->video_frame_rate(), dcp_frame_rate());
+	FrameRateConversion frc (video_frame_rate(), dcp_frame_rate());
 
 	/* Compensate if the DCP is being run at a different frame rate
 	   to the source; that is, if the video is run such that it will
@@ -573,7 +572,7 @@ Film::target_audio_sample_rate () const
 	*/
 
 	if (frc.change_speed) {
-		t *= p->video_frame_rate() * frc.factor() / dcp_frame_rate();
+		t *= video_frame_rate() * frc.factor() / dcp_frame_rate();
 	}
 
 	return rint (t);
@@ -1023,11 +1022,11 @@ Film::have_dcp () const
 	return true;
 }
 
-shared_ptr<Playlist>
-Film::playlist () const
+shared_ptr<Player>
+Film::player () const
 {
 	boost::mutex::scoped_lock lm (_state_mutex);
-	return shared_ptr<Playlist> (new Playlist (shared_from_this (), _content));
+	return shared_ptr<Player> (new Player (shared_from_this (), _playlist));
 }
 
 void
@@ -1036,9 +1035,59 @@ Film::add_content (shared_ptr<Content> c)
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
 		_content.push_back (c);
+		_playlist->setup (_content);
 	}
 
 	signal_changed (CONTENT);
 
 	examine_content (c);
 }
+
+ContentAudioFrame
+Film::audio_length () const
+{
+	return _playlist->audio_length ();
+}
+
+int
+Film::audio_channels () const
+{
+	return _playlist->audio_channels ();
+}
+
+int
+Film::audio_frame_rate () const
+{
+	return _playlist->audio_frame_rate ();
+}
+
+int64_t
+Film::audio_channel_layout () const
+{
+	return _playlist->audio_channel_layout ();
+}
+
+bool
+Film::has_audio () const
+{
+	return _playlist->has_audio ();
+}
+
+float
+Film::video_frame_rate () const
+{
+	return _playlist->video_frame_rate ();
+}
+
+libdcp::Size
+Film::video_size () const
+{
+	return _playlist->video_size ();
+}
+
+ContentVideoFrame
+Film::video_length () const
+{
+	return _playlist->video_length ();
+}
+
diff --git a/src/lib/film.h b/src/lib/film.h
index f5f944409..6e097d44e 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -47,6 +47,7 @@ class ExamineContentJob;
 class AnalyseAudioJob;
 class ExternalAudioStream;
 class Content;
+class Player;
 class Playlist;
 
 /** @class Film
@@ -105,7 +106,17 @@ public:
 
 	bool have_dcp () const;
 
-	boost::shared_ptr<Playlist> playlist () const;
+	boost::shared_ptr<Player> player () const;
+
+	ContentAudioFrame audio_length () const;
+	int audio_channels () const;
+	int audio_frame_rate () const;
+	int64_t audio_channel_layout () const;
+	bool has_audio () const;
+	
+	float video_frame_rate () const;
+	libdcp::Size video_size () const;
+	ContentVideoFrame video_length () const;	
 
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
@@ -301,6 +312,8 @@ private:
 	void analyse_audio_finished ();
 	std::string video_state_identifier () const;
 
+	boost::shared_ptr<Playlist> _playlist;
+
 	/** Complete path to directory containing the film metadata;
 	 *  must not be relative.
 	 */
diff --git a/src/lib/format.cc b/src/lib/format.cc
index 05b71f2e5..538bf7953 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -207,9 +207,9 @@ FixedFormat::FixedFormat (int r, libdcp::Size dcp, string id, string n, string d
  *  (so there are dcp_padding() pixels on the left and dcp_padding() on the right)
  */
 int
-Format::dcp_padding (shared_ptr<const Playlist> p) const
+Format::dcp_padding (shared_ptr<const Film> f) const
 {
-	int pad = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_integer(p) / 100.0)) / 2.0);
+	int pad = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_integer(f) / 100.0)) / 2.0);
 
 	/* This comes out -ve for Scope; bodge it */
 	if (pad < 0) {
@@ -232,15 +232,15 @@ VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d,
 }
 
 int
-VariableFormat::ratio_as_integer (shared_ptr<const Playlist> p) const
+VariableFormat::ratio_as_integer (shared_ptr<const Film> f) const
 {
-	return rint (ratio_as_float (p) * 100);
+	return rint (ratio_as_float (f) * 100);
 }
 
 float
-VariableFormat::ratio_as_float (shared_ptr<const Playlist> p) const
+VariableFormat::ratio_as_float (shared_ptr<const Film> f) const
 {
-	return float (p->video_size().width) / p->video_size().height;
+	return float (f->video_size().width) / f->video_size().height;
 }
 
 /** @return A name to be presented to the user */
diff --git a/src/lib/format.h b/src/lib/format.h
index 94c2253de..cc7502893 100644
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -26,7 +26,7 @@
 #include <vector>
 #include "util.h"
 
-class Playlist;
+class Film;
 
 class Format
 {
@@ -42,15 +42,15 @@ public:
 	/** @return the aspect ratio multiplied by 100
 	 *  (e.g. 239 for Cinemascope 2.39:1)
 	 */
-	virtual int ratio_as_integer (boost::shared_ptr<const Playlist> f) const = 0;
+	virtual int ratio_as_integer (boost::shared_ptr<const Film> f) const = 0;
 
 	/** @return the ratio as a floating point number */
-	virtual float ratio_as_float (boost::shared_ptr<const Playlist> f) const = 0;
+	virtual float ratio_as_float (boost::shared_ptr<const Film> f) const = 0;
 
 	/** @return the ratio of the container (including any padding) as a floating point number */
 	float container_ratio_as_float () const;
 
-	int dcp_padding (boost::shared_ptr<const Playlist>) const;
+	int dcp_padding (boost::shared_ptr<const Film>) const;
 
 	/** @return size in pixels of the images that we should
 	 *  put in a DCP for this ratio.  This size will not correspond
@@ -115,11 +115,11 @@ class FixedFormat : public Format
 public:
 	FixedFormat (int, libdcp::Size, std::string, std::string, std::string, std::string);
 
-	int ratio_as_integer (boost::shared_ptr<const Playlist>) const {
+	int ratio_as_integer (boost::shared_ptr<const Film>) const {
 		return _ratio;
 	}
 
-	float ratio_as_float (boost::shared_ptr<const Playlist>) const {
+	float ratio_as_float (boost::shared_ptr<const Film>) const {
 		return _ratio / 100.0;
 	}
 
@@ -136,8 +136,8 @@ class VariableFormat : public Format
 public:
 	VariableFormat (libdcp::Size, std::string, std::string, std::string, std::string);
 
-	int ratio_as_integer (boost::shared_ptr<const Playlist> f) const;
-	float ratio_as_float (boost::shared_ptr<const Playlist> f) const;
+	int ratio_as_integer (boost::shared_ptr<const Film> f) const;
+	float ratio_as_float (boost::shared_ptr<const Film> f) const;
 
 	std::string name () const;
 };
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index c3723f610..279c8bf32 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -32,9 +32,9 @@ using std::cout;
 using boost::shared_ptr;
 using libdcp::Size;
 
-ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<ImageMagickContent> c)
+ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
 	: Decoder (f)
-	, VideoDecoder (f, c)
+	, VideoDecoder (f)
 	, _imagemagick_content (c)
 	, _position (0)
 {
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index a26e283c0..7ad08df03 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -28,7 +28,7 @@ class ImageMagickContent;
 class ImageMagickDecoder : public VideoDecoder
 {
 public:
-	ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<ImageMagickContent>);
+	ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageMagickContent>);
 
 	float frames_per_second () const {
 		/* We don't know */
@@ -82,6 +82,6 @@ protected:
 private:
 	void film_changed (Film::Property);
 
-	boost::shared_ptr<ImageMagickContent> _imagemagick_content;
+	boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
 	ContentVideoFrame _position;
 };
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index fc9edac48..d9bf8ac36 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -30,15 +30,20 @@ using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-Playlist::Playlist (shared_ptr<const Film> f, list<shared_ptr<Content> > c)
-	: _film (f)
-	, _video_from (VIDEO_NONE)
+Playlist::Playlist ()
+	: _video_from (VIDEO_NONE)
 	, _audio_from (AUDIO_NONE)
-	, _have_setup_decoders (false)
-	, _ffmpeg_decoder_done (false)
-	, _video_sync (true)
 {
-	for (list<shared_ptr<Content> >::const_iterator i = c.begin(); i != c.end(); ++i) {
+
+}
+
+void
+Playlist::setup (list<shared_ptr<Content> > content)
+{
+	_video_from = VIDEO_NONE;
+	_audio_from = AUDIO_NONE;
+	
+	for (list<shared_ptr<Content> >::const_iterator i = content.begin(); i != content.end(); ++i) {
 		shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
 		if (fc) {
 			assert (!_ffmpeg);
@@ -76,7 +81,7 @@ Playlist::audio_length () const
 	case AUDIO_SNDFILE:
 	{
 		ContentAudioFrame l = 0;
-		for (list<shared_ptr<SndfileContent> >::const_iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
+		for (list<shared_ptr<const SndfileContent> >::const_iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
 			l += (*i)->audio_length ();
 		}
 		return l;
@@ -97,7 +102,7 @@ Playlist::audio_channels () const
 	case AUDIO_SNDFILE:
 	{
 		int c = 0;
-		for (list<shared_ptr<SndfileContent> >::const_iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
+		for (list<shared_ptr<const SndfileContent> >::const_iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
 			c += (*i)->audio_channels ();
 		}
 		return c;
@@ -180,7 +185,7 @@ Playlist::video_length () const
 	case VIDEO_IMAGEMAGICK:
 	{
 		ContentVideoFrame l = 0;
-		for (list<shared_ptr<ImageMagickContent> >::const_iterator i = _imagemagick.begin(); i != _imagemagick.end(); ++i) {
+		for (list<shared_ptr<const ImageMagickContent> >::const_iterator i = _imagemagick.begin(); i != _imagemagick.end(); ++i) {
 			l += (*i)->video_length ();
 		}
 		return l;
@@ -195,27 +200,40 @@ Playlist::has_audio () const
 {
 	return _audio_from != AUDIO_NONE;
 }
+
+Player::Player (boost::shared_ptr<const Film> f, boost::shared_ptr<const Playlist> p)
+	: _film (f)
+	, _playlist (p)
+	, _video (true)
+	, _audio (true)
+	, _subtitles (true)
+	, _have_setup_decoders (false)
+	, _ffmpeg_decoder_done (false)
+	, _video_sync (true)
+{
+
+}
 		
 void
-Playlist::disable_video ()
+Player::disable_video ()
 {
-	_video_from = VIDEO_NONE;
+	_video = false;
 }
 
 void
-Playlist::disable_audio ()
+Player::disable_audio ()
 {
-	_audio_from = AUDIO_NONE;
+	_audio = false;
 }
 
 void
-Playlist::disable_subtitles ()
+Player::disable_subtitles ()
 {
-	/* XXX */
+	_subtitles = false;
 }
 
 bool
-Playlist::pass ()
+Player::pass ()
 {
 	if (!_have_setup_decoders) {
 		setup_decoders ();
@@ -224,7 +242,7 @@ Playlist::pass ()
 	
 	bool done = true;
 	
-	if (_video_from == VIDEO_FFMPEG || _audio_from == AUDIO_FFMPEG) {
+	if (_playlist->video_from() == Playlist::VIDEO_FFMPEG || _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
 		if (!_ffmpeg_decoder_done) {
 			if (_ffmpeg_decoder->pass ()) {
 				_ffmpeg_decoder_done = true;
@@ -234,7 +252,7 @@ Playlist::pass ()
 		}
 	}
 
-	if (_video_from == VIDEO_IMAGEMAGICK) {
+	if (_playlist->video_from() == Playlist::VIDEO_IMAGEMAGICK) {
 		if (_imagemagick_decoder != _imagemagick_decoders.end ()) {
 			if ((*_imagemagick_decoder)->pass ()) {
 				_imagemagick_decoder++;
@@ -252,37 +270,37 @@ Playlist::pass ()
 }
 
 void
-Playlist::set_progress (shared_ptr<Job> job)
+Player::set_progress (shared_ptr<Job> job)
 {
 	/* XXX */
 }
 
 void
-Playlist::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
+Player::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
 {
 	Video (i, same, s);
 }
 
 void
-Playlist::process_audio (shared_ptr<AudioBuffers> b)
+Player::process_audio (shared_ptr<AudioBuffers> b)
 {
 	Audio (b);
 }
 
 bool
-Playlist::seek (double t)
+Player::seek (double t)
 {
 	bool r = false;
 	
-	switch (_video_from) {
-	case VIDEO_NONE:
+	switch (_playlist->video_from()) {
+	case Playlist::VIDEO_NONE:
 		break;
-	case VIDEO_FFMPEG:
+	case Playlist::VIDEO_FFMPEG:
 		if (_ffmpeg_decoder->seek (t)) {
 			r = true;
 		}
 		break;
-	case VIDEO_IMAGEMAGICK:
+	case Playlist::VIDEO_IMAGEMAGICK:
 		if ((*_imagemagick_decoder)->seek (t)) {
 			r = true;
 		}
@@ -295,19 +313,19 @@ Playlist::seek (double t)
 }
 
 bool
-Playlist::seek_to_last ()
+Player::seek_to_last ()
 {
 	bool r = false;
 	
-	switch (_video_from) {
-	case VIDEO_NONE:
+	switch (_playlist->video_from ()) {
+	case Playlist::VIDEO_NONE:
 		break;
-	case VIDEO_FFMPEG:
+	case Playlist::VIDEO_FFMPEG:
 		if (_ffmpeg_decoder->seek_to_last ()) {
 			r = true;
 		}
 		break;
-	case VIDEO_IMAGEMAGICK:
+	case Playlist::VIDEO_IMAGEMAGICK:
 		if ((*_imagemagick_decoder)->seek_to_last ()) {
 			r = true;
 		}
@@ -320,26 +338,32 @@ Playlist::seek_to_last ()
 }
 
 void
-Playlist::setup_decoders ()
+Player::setup_decoders ()
 {
-	if (_video_from == VIDEO_FFMPEG || _audio_from == AUDIO_FFMPEG) {
+	if ((_video && _playlist->video_from() == Playlist::VIDEO_FFMPEG) || (_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG)) {
 		_ffmpeg_decoder.reset (
 			new FFmpegDecoder (
-				_film, _ffmpeg, _video_from == VIDEO_FFMPEG, _audio_from == AUDIO_FFMPEG, _film->with_subtitles(), _video_sync
+				_film,
+				_playlist->ffmpeg(),
+				_video && _playlist->video_from() == Playlist::VIDEO_FFMPEG,
+				_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG,
+				_subtitles && _film->with_subtitles(),
+				_video_sync
 				)
 			);
 	}
 	
-	if (_video_from == VIDEO_FFMPEG) {
+	if (_video && _playlist->video_from() == Playlist::VIDEO_FFMPEG) {
 		_ffmpeg_decoder->connect_video (shared_from_this ());
 	}
 
-	if (_audio_from == AUDIO_FFMPEG) {
+	if (_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
 		_ffmpeg_decoder->connect_audio (shared_from_this ());
 	}
 
-	if (_video_from == VIDEO_IMAGEMAGICK) {
-		for (list<shared_ptr<ImageMagickContent> >::iterator i = _imagemagick.begin(); i != _imagemagick.end(); ++i) {
+	if (_video && _playlist->video_from() == Playlist::VIDEO_IMAGEMAGICK) {
+		list<shared_ptr<const ImageMagickContent> > ic = _playlist->imagemagick ();
+		for (list<shared_ptr<const ImageMagickContent> >::iterator i = ic.begin(); i != ic.end(); ++i) {
 			shared_ptr<ImageMagickDecoder> d (new ImageMagickDecoder (_film, *i));
 			_imagemagick_decoders.push_back (d);
 			d->connect_video (shared_from_this ());
@@ -348,8 +372,9 @@ Playlist::setup_decoders ()
 		_imagemagick_decoder = _imagemagick_decoders.begin ();
 	}
 
-	if (_audio_from == AUDIO_SNDFILE) {
-		for (list<shared_ptr<SndfileContent> >::iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
+	if (_audio && _playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
+		list<shared_ptr<const SndfileContent> > sc = _playlist->sndfile ();
+		for (list<shared_ptr<const SndfileContent> >::iterator i = sc.begin(); i != sc.end(); ++i) {
 			shared_ptr<SndfileDecoder> d (new SndfileDecoder (_film, *i));
 			_sndfile_decoders.push_back (d);
 			d->connect_audio (shared_from_this ());
@@ -358,7 +383,22 @@ Playlist::setup_decoders ()
 }
 
 void
-Playlist::disable_video_sync ()
+Player::disable_video_sync ()
 {
 	_video_sync = false;
 }
+
+double
+Player::last_video_time () const
+{
+	switch (_playlist->video_from ()) {
+	case Playlist::VIDEO_NONE:
+		return 0;
+	case Playlist::VIDEO_FFMPEG:
+		return _ffmpeg_decoder->last_source_time ();
+	case Playlist::VIDEO_IMAGEMAGICK:
+		return (*_imagemagick_decoder)->last_source_time ();
+	}
+
+	return 0;
+}
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index d374dc98c..827849049 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -35,10 +35,12 @@ class SndfileDecoder;
 class Job;
 class Film;
 
-class Playlist : public VideoSource, public AudioSource, public VideoSink, public AudioSink, public boost::enable_shared_from_this<Playlist>
+class Playlist
 {
 public:
-	Playlist (boost::shared_ptr<const Film>, std::list<boost::shared_ptr<Content> >);
+	Playlist ();
+
+	void setup (std::list<boost::shared_ptr<Content> >);
 
 	ContentAudioFrame audio_length () const;
 	int audio_channels () const;
@@ -50,6 +52,52 @@ public:
 	libdcp::Size video_size () const;
 	ContentVideoFrame video_length () const;
 
+	enum VideoFrom {
+		VIDEO_NONE,
+		VIDEO_FFMPEG,
+		VIDEO_IMAGEMAGICK
+	};
+
+	enum AudioFrom {
+		AUDIO_NONE,
+		AUDIO_FFMPEG,
+		AUDIO_SNDFILE
+	};
+
+	VideoFrom video_from () const {
+		return _video_from;
+	}
+
+	AudioFrom audio_from () const {
+		return _audio_from;
+	}
+
+	boost::shared_ptr<const FFmpegContent> ffmpeg () const {
+		return _ffmpeg;
+	}
+
+	std::list<boost::shared_ptr<const ImageMagickContent> > imagemagick () const {
+		return _imagemagick;
+	}
+
+	std::list<boost::shared_ptr<const SndfileContent> > sndfile () const {
+		return _sndfile;
+	}
+	
+private:
+	VideoFrom _video_from;
+	AudioFrom _audio_from;
+
+	boost::shared_ptr<const FFmpegContent> _ffmpeg;
+	std::list<boost::shared_ptr<const ImageMagickContent> > _imagemagick;
+	std::list<boost::shared_ptr<const SndfileContent> > _sndfile;
+};
+
+class Player : public VideoSource, public AudioSource, public VideoSink, public AudioSink, public boost::enable_shared_from_this<Player>
+{
+public:
+	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+
 	void disable_video ();
 	void disable_audio ();
 	void disable_subtitles ();
@@ -60,29 +108,20 @@ public:
 	bool seek (double);
 	bool seek_to_last ();
 
+	double last_video_time () const;
+
 private:
 	void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
 	void process_audio (boost::shared_ptr<AudioBuffers>);
 	void setup_decoders ();
-	
-	boost::shared_ptr<const Film> _film;
 
-	enum {
-		VIDEO_NONE,
-		VIDEO_FFMPEG,
-		VIDEO_IMAGEMAGICK
-	} _video_from;
+	boost::shared_ptr<const Film> _film;
+	boost::shared_ptr<const Playlist> _playlist;
+	
+	bool _video;
+	bool _audio;
+	bool _subtitles;
 	
-	enum {
-		AUDIO_NONE,
-		AUDIO_FFMPEG,
-		AUDIO_SNDFILE
-	} _audio_from;
-
-	boost::shared_ptr<FFmpegContent> _ffmpeg;
-	std::list<boost::shared_ptr<ImageMagickContent> > _imagemagick;
-	std::list<boost::shared_ptr<SndfileContent> > _sndfile;
-
 	bool _have_setup_decoders;
 	boost::shared_ptr<FFmpegDecoder> _ffmpeg_decoder;
 	bool _ffmpeg_decoder_done;
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index daa363c5e..1f97e5c41 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -36,9 +36,9 @@ using boost::optional;
 
 /* XXX */
 
-SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<SndfileContent> c)
+SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
 	: Decoder (f)
-	, AudioDecoder (f, c)
+	, AudioDecoder (f)
 {
 	sf_count_t frames;
 	SNDFILE* sf = open_file (frames);
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 9a3ef49b0..56fc3a9f0 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -26,7 +26,7 @@ class SndfileContent;
 class SndfileDecoder : public AudioDecoder
 {
 public:
-	SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<SndfileContent>);
+	SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
 
 	bool pass ();
 
@@ -34,5 +34,5 @@ private:
 	SNDFILE* open_file (sf_count_t &);
 	void close_file (SNDFILE*);
 
-	boost::shared_ptr<SndfileContent> _sndfile_content;
+	boost::shared_ptr<const SndfileContent> _sndfile_content;
 };
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 21944c5fc..0ee6f523f 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -47,24 +47,24 @@ using boost::dynamic_pointer_cast;
  */
 Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
 	: _job (j)
-	, _playlist (f->playlist ())
-	, _encoder (new Encoder (f, _playlist))
+	, _player (f->player ())
+	, _encoder (new Encoder (f))
 {
-	if (_playlist->has_audio ()) {
-		_matcher.reset (new Matcher (f->log(), _playlist->audio_frame_rate(), _playlist->video_frame_rate()));
-		_delay_line.reset (new DelayLine (f->log(), _playlist->audio_channels(), f->audio_delay() * _playlist->audio_frame_rate() / 1000));
+	if (f->has_audio ()) {
+		_matcher.reset (new Matcher (f->log(), f->audio_frame_rate(), f->video_frame_rate()));
+		_delay_line.reset (new DelayLine (f->log(), f->audio_channels(), f->audio_delay() * f->audio_frame_rate() / 1000));
 		_gain.reset (new Gain (f->log(), f->audio_gain()));
 	}
 
 	if (_matcher) {
-		_playlist->connect_video (_matcher);
+		_player->connect_video (_matcher);
 		_matcher->connect_video (_encoder);
 	} else {
-		_playlist->connect_video (_encoder);
+		_player->connect_video (_encoder);
 	}
 	
-	if (_matcher && _delay_line && _playlist->has_audio ()) {
-		_playlist->connect_audio (_delay_line);
+	if (_matcher && _delay_line && f->has_audio ()) {
+		_player->connect_audio (_delay_line);
 		_delay_line->connect_audio (_matcher);
 		_matcher->connect_audio (_gain);
 		_gain->connect_audio (_encoder);
@@ -77,10 +77,10 @@ Transcoder::go ()
 	_encoder->process_begin ();
 	try {
 		while (1) {
-			if (_playlist->pass ()) {
+			if (_player->pass ()) {
 				break;
 			}
-			_playlist->set_progress (_job);
+			_player->set_progress (_job);
 		}
 		
 	} catch (...) {
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 856b10f3a..2d032fcf6 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -30,7 +30,7 @@ class Matcher;
 class VideoFilter;
 class Gain;
 class DelayLine;
-class Playlist;
+class Player;
 
 /** @class Transcoder
  *
@@ -50,7 +50,7 @@ public:
 protected:
 	/** A Job that is running this Transcoder, or 0 */
 	boost::shared_ptr<Job> _job;
-	boost::shared_ptr<Playlist> _playlist;
+	boost::shared_ptr<Player> _player;
 	boost::shared_ptr<Encoder> _encoder;
 	boost::shared_ptr<Matcher> _matcher;
 	boost::shared_ptr<DelayLine> _delay_line;
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 33dd433ea..32b06085f 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -29,7 +29,7 @@
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<VideoContent> c)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
 	: Decoder (f)
 	, _video_frame (0)
 	, _last_source_time (0)
@@ -106,10 +106,7 @@ VideoDecoder::set_progress (Job* j) const
 {
 	assert (j);
 
-#if 0
-	XXX
-	if (_film->length()) {
-		j->set_progress (float (_video_frame) / _film->length().get());
+	if (_film->video_length()) {
+		j->set_progress (float (_video_frame) / _film->video_length());
 	}
-#endif	
 }
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 03dc4777a..a2fd5b651 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -28,7 +28,7 @@ class VideoContent;
 class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<VideoContent>);
+	VideoDecoder (boost::shared_ptr<const Film>);
 
 	/** @return video frames per second, or 0 if unknown */
 	virtual float frames_per_second () const = 0;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 5f5dae98f..b08b9caf1 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -42,9 +42,8 @@ using boost::shared_ptr;
 
 int const Writer::_maximum_frames_in_memory = 8;
 
-Writer::Writer (shared_ptr<Film> f, shared_ptr<Playlist> p)
+Writer::Writer (shared_ptr<Film> f)
 	: _film (f)
-	, _playlist (p)
 	, _first_nonexistant_frame (0)
 	, _thread (0)
 	, _finish (false)
@@ -76,7 +75,7 @@ Writer::Writer (shared_ptr<Film> f, shared_ptr<Playlist> p)
 
 	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
-	AudioMapping m (_playlist->audio_channels ());
+	AudioMapping m (_film->audio_channels ());
 	
 	if (m.dcp_channels() > 0) {
 		_sound_asset.reset (
@@ -85,7 +84,7 @@ Writer::Writer (shared_ptr<Film> f, shared_ptr<Playlist> p)
 				N_("audio.mxf"),
 				_film->dcp_frame_rate (),
 				m.dcp_channels (),
-				dcp_audio_sample_rate (_playlist->audio_frame_rate())
+				dcp_audio_sample_rate (_film->audio_frame_rate())
 				)
 			);
 
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 920f592b6..beb16c7b9 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -26,7 +26,6 @@
 class Film;
 class EncodedData;
 class AudioBuffers;
-class Playlist;
 
 namespace libdcp {
 	class MonoPictureAsset;
@@ -64,7 +63,7 @@ bool operator== (QueueItem const & a, QueueItem const & b);
 class Writer : public ExceptionStore
 {
 public:
-	Writer (boost::shared_ptr<Film>, boost::shared_ptr<Playlist>);
+	Writer (boost::shared_ptr<Film>);
 
 	bool can_fake_write (int) const;
 	
@@ -81,7 +80,6 @@ private:
 
 	/** our Film */
 	boost::shared_ptr<Film> _film;
-	boost::shared_ptr<Playlist> _playlist;
 	/** the first frame index that does not already exist in our MXF */
 	int _first_nonexistant_frame;
 
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index 3d847d690..d7e8bbb0e 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -150,14 +150,14 @@ main (int argc, char* argv[])
 	server = new ServerDescription (server_host, 1);
 	shared_ptr<Film> film (new Film (film_dir, true));
 
-	shared_ptr<Playlist> playlist = film->playlist ();
-	playlist->disable_audio ();
+	shared_ptr<Player> player = film->player ();
+	player->disable_audio ();
 
 	try {
-		playlist->Video.connect (boost::bind (process_video, _1, _2, _3));
+		player->Video.connect (boost::bind (process_video, _1, _2, _3));
 		bool done = false;
 		while (!done) {
-			done = playlist->pass ();
+			done = player->pass ();
 		}
 	} catch (std::exception& e) {
 		cerr << "Error: " << e.what() << "\n";
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index b7384fd14..242d37b1e 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -20,7 +20,6 @@
 #include <boost/filesystem.hpp>
 #include "lib/audio_analysis.h"
 #include "lib/film.h"
-#include "lib/playlist.h"
 #include "audio_dialog.h"
 #include "audio_plot.h"
 #include "wx_util.h"
@@ -91,7 +90,6 @@ AudioDialog::set_film (boost::shared_ptr<Film> f)
 	_film_audio_analysis_succeeded_connection.disconnect ();
 	
 	_film = f;
-	_playlist = _film->playlist ();
 
 	try_to_load_analysis ();
 	setup_channels ();
@@ -106,11 +104,11 @@ AudioDialog::set_film (boost::shared_ptr<Film> f)
 void
 AudioDialog::setup_channels ()
 {
-	if (!_playlist->has_audio()) {
+	if (!_film->has_audio()) {
 		return;
 	}
 
-	AudioMapping m (_playlist->audio_channels ());
+	AudioMapping m (_film->audio_channels ());
 	
 	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
 		if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
@@ -136,7 +134,7 @@ AudioDialog::try_to_load_analysis ()
 		
 	_plot->set_analysis (a);
 
-	AudioMapping m (_playlist->audio_channels ());
+	AudioMapping m (_film->audio_channels ());
 	optional<libdcp::Channel> c = m.source_to_dcp (0);
 	if (c) {
 		_channel_checkbox[c.get()]->SetValue (true);
@@ -159,7 +157,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 
 	assert (c < MAX_AUDIO_CHANNELS);
 
-	AudioMapping m (_playlist->audio_channels ());
+	AudioMapping m (_film->audio_channels ());
 	optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (c));
 	if (s) {
 		_plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ());
@@ -174,7 +172,6 @@ AudioDialog::film_changed (Film::Property p)
 		_plot->set_gain (_film->audio_gain ());
 		break;
 	case Film::CONTENT:
-		_playlist = _film->playlist ();
 		setup_channels ();
 		break;
 	default:
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 3cb9c1726..514faeea0 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -25,7 +25,6 @@
 
 class AudioPlot;
 class Film;
-class Playlist;
 
 class AudioDialog : public wxDialog
 {
@@ -43,7 +42,6 @@ private:
 	void setup_channels ();
 
 	boost::shared_ptr<Film> _film;
-	boost::shared_ptr<Playlist> _playlist;
 	AudioPlot* _plot;
 	wxCheckBox* _channel_checkbox[MAX_AUDIO_CHANNELS];
 	wxCheckBox* _type_checkbox[AudioPoint::COUNT];
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 42af4b3c0..79b3d982f 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -97,13 +97,13 @@ FilmViewer::film_changed (Film::Property p)
 		break;
 	case Film::CONTENT:
 	{
-		_playlist = _film->playlist ();
-		_playlist->disable_audio ();
-		_playlist->disable_subtitles ();
-		_playlist->disable_video_sync ();
+		_player = _film->player ();
+		_player->disable_audio ();
+		_player->disable_subtitles ();
+		_player->disable_video_sync ();
 
-		_playlist->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
-//		_playlist->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
+		_player->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
+//		_player->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
 		calculate_sizes ();
 		get_frame ();
 		_panel->Refresh ();
@@ -153,7 +153,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 void
 FilmViewer::decoder_changed ()
 {
-	if (!_playlist == 0 || _playlist->seek_to_last ()) {
+	if (!_player || _player->seek_to_last ()) {
 		return;
 	}
 
@@ -165,7 +165,7 @@ FilmViewer::decoder_changed ()
 void
 FilmViewer::timer (wxTimerEvent &)
 {
-	if (!_playlist) {
+	if (!_player) {
 		return;
 	}
 	
@@ -174,12 +174,12 @@ FilmViewer::timer (wxTimerEvent &)
 
 	get_frame ();
 
-//	if (_playlist->video_length()) {
-//		int const new_slider_position = 4096 * _playlist->last_source_time() / (_film->length().get() / _film->source_frame_rate());
-//		if (new_slider_position != _slider->GetValue()) {
-//			_slider->SetValue (new_slider_position);
-//		}
-//	}
+	if (_film->video_length()) {
+		int const new_slider_position = 4096 * _player->last_video_time() / (_film->video_length() / _film->video_frame_rate());
+		if (new_slider_position != _slider->GetValue()) {
+			_slider->SetValue (new_slider_position);
+		}
+	}
 }
 
 
@@ -220,11 +220,11 @@ FilmViewer::paint_panel (wxPaintEvent &)
 void
 FilmViewer::slider_moved (wxScrollEvent &)
 {
-	if (!_film || !_playlist) {
+	if (!_film || !_player) {
 		return;
 	}
 	
-	if (_playlist->seek (_slider->GetValue() * _playlist->video_length() / (4096 * _playlist->video_frame_rate()))) {
+	if (_player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()))) {
 		return;
 	}
 	
@@ -308,7 +308,7 @@ FilmViewer::raw_to_display ()
 void
 FilmViewer::calculate_sizes ()
 {
-	if (!_film || !_playlist) {
+	if (!_film || !_player) {
 		return;
 	}
 
@@ -332,7 +332,7 @@ FilmViewer::calculate_sizes ()
 	*/
 	_display_frame_x = 0;
 	if (format) {
-		_display_frame_x = static_cast<float> (format->dcp_padding (_playlist)) * _out_size.width / format->dcp_size().width;
+		_display_frame_x = static_cast<float> (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width;
 	}
 
 	_film_size = _out_size;
@@ -381,7 +381,7 @@ FilmViewer::get_frame ()
 	/* Clear our raw frame in case we don't get a new one */
 	_raw_frame.reset ();
 
-	if (!_playlist) {
+	if (!_player) {
 		_display_frame.reset ();
 		return;
 	}
@@ -389,7 +389,7 @@ FilmViewer::get_frame ()
 	try {
 		_got_frame = false;
 		while (!_got_frame) {
-			if (_playlist->pass ()) {
+			if (_player->pass ()) {
 				/* We didn't get a frame before the decoder gave up,
 				   so clear our display frame.
 				*/
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 74ab9798c..1e75045ac 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -57,7 +57,7 @@ private:
 	void active_jobs_changed (bool);
 
 	boost::shared_ptr<Film> _film;
-	boost::shared_ptr<Playlist> _playlist;
+	boost::shared_ptr<Player> _player;
 
 	wxSizer* _v_sizer;
 	wxPanel* _panel;
diff --git a/wscript b/wscript
index fb728ec40..9040738fb 100644
--- a/wscript
+++ b/wscript
@@ -55,6 +55,7 @@ def configure(conf):
 
     if not conf.options.static:
         conf.check_cfg(package = 'libdcp', atleast_version = '0.41', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
+        conf.check_cfg(package = 'libcxml', atleast_version = '0.01', args = '--cflags --libs', uselib_store = 'CXML', mandatory = True)
         conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
         conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
         conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
@@ -71,6 +72,8 @@ def configure(conf):
         conf.env.HAVE_DCP = 1
         conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp']
         conf.env.LIB_DCP = ['glibmm-2.4', 'xml++-2.6', 'ssl', 'crypto', 'bz2']
+        conf.env.HAVE_CXML = 1
+        conf.env.STLIB_CXML = ['cxml']
         conf.env.HAVE_AVFORMAT = 1
         conf.env.STLIB_AVFORMAT = ['avformat']
         conf.env.HAVE_AVFILTER = 1
-- 
cgit v1.2.3


From 190c074cc1508c0aa429452ea920f8f94ef0d0f2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 4 Apr 2013 00:13:27 +0100
Subject: More various bits.

---
 src/lib/audio_source.cc   | 12 +++++++++++-
 src/lib/encoder.cc        |  2 +-
 src/lib/encoder.h         |  2 +-
 src/lib/ffmpeg_content.cc | 10 ++++++----
 src/lib/ffmpeg_decoder.cc | 12 +++++++++++-
 src/lib/ffmpeg_decoder.h  | 10 ++++++++++
 src/lib/film.cc           |  2 +-
 src/lib/playlist.cc       | 25 +++++++++++++++++++++++--
 src/lib/transcode_job.cc  | 34 ++++++++++++++++------------------
 src/lib/transcode_job.h   |  6 ++++--
 src/lib/transcoder.cc     | 12 ++++++++++++
 src/lib/transcoder.h      |  3 +++
 src/lib/video_source.cc   | 15 ++++++++++++++-
 src/wx/film_editor.cc     | 29 +++++++++++++++++++++++++----
 src/wx/film_editor.h      |  1 +
 15 files changed, 139 insertions(+), 36 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/audio_source.cc b/src/lib/audio_source.cc
index 53b0dda15..99b59759d 100644
--- a/src/lib/audio_source.cc
+++ b/src/lib/audio_source.cc
@@ -21,10 +21,20 @@
 #include "audio_sink.h"
 
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::bind;
 
+static void
+process_audio_proxy (weak_ptr<AudioSink> sink, shared_ptr<AudioBuffers> audio)
+{
+	shared_ptr<AudioSink> p = sink.lock ();
+	if (p) {
+		p->process_audio (audio);
+	}
+}
+
 void
 AudioSource::connect_audio (shared_ptr<AudioSink> s)
 {
-	Audio.connect (bind (&AudioSink::process_audio, s, _1));
+	Audio.connect (bind (process_audio_proxy, weak_ptr<AudioSink> (s), _1));
 }
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 5c3e56709..a41ebec51 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -193,7 +193,7 @@ Encoder::process_end ()
  *  or 0 if not known.
  */
 float
-Encoder::current_frames_per_second () const
+Encoder::current_encoding_rate () const
 {
 	boost::mutex::scoped_lock lock (_history_mutex);
 	if (int (_time_history.size()) < _history_size) {
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 2cbd498e8..b85132b72 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -81,7 +81,7 @@ public:
 	/** Called when a processing run has finished */
 	virtual void process_end ();
 
-	float current_frames_per_second () const;
+	float current_encoding_rate () const;
 	int video_frames_out () const;
 
 private:
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index c6344d567..7834cb76e 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -111,12 +111,10 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
 void
 FFmpegContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
 {
-	job->descend (0.5);
-	Content::examine (film, job, quick);
-	job->ascend ();
-
 	job->set_progress_unknown ();
 
+	Content::examine (film, job, quick);
+
 	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false, true));
 
 	ContentVideoFrame video_length = 0;
@@ -166,6 +164,10 @@ FFmpegContent::summary () const
 string
 FFmpegContent::information () const
 {
+	if (video_length() == 0 || video_frame_rate() == 0) {
+		return "";
+	}
+	
 	stringstream s;
 	
 	s << String::compose (_("%1 frames; %2 frames per second"), video_length(), video_frame_rate()) << "\n";
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 3a185bd6a..fdc5189a6 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -61,6 +61,8 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using libdcp::Size;
 
+boost::mutex FFmpegDecoder::_mutex;
+
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegContent> c, bool video, bool audio, bool subtitles, bool video_sync)
 	: Decoder (f)
 	, VideoDecoder (f)
@@ -92,10 +94,12 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegC
 
 FFmpegDecoder::~FFmpegDecoder ()
 {
+	boost::mutex::scoped_lock lm (_mutex);
+	
 	if (_audio_codec_context) {
 		avcodec_close (_audio_codec_context);
 	}
-	
+
 	if (_video_codec_context) {
 		avcodec_close (_video_codec_context);
 	}
@@ -160,6 +164,8 @@ FFmpegDecoder::setup_general ()
 void
 FFmpegDecoder::setup_video ()
 {
+	boost::mutex::scoped_lock lm (_mutex);
+	
 	_video_codec_context = _format_context->streams[_video_stream]->codec;
 	_video_codec = avcodec_find_decoder (_video_codec_context->codec_id);
 
@@ -175,6 +181,8 @@ FFmpegDecoder::setup_video ()
 void
 FFmpegDecoder::setup_audio ()
 {
+	boost::mutex::scoped_lock lm (_mutex);
+	
 	if (!_ffmpeg_content->audio_stream ()) {
 		return;
 	}
@@ -194,6 +202,8 @@ FFmpegDecoder::setup_audio ()
 void
 FFmpegDecoder::setup_subtitle ()
 {
+	boost::mutex::scoped_lock lm (_mutex);
+	
 	if (!_ffmpeg_content->subtitle_stream() || _ffmpeg_content->subtitle_stream()->id >= int (_format_context->nb_streams)) {
 		return;
 	}
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 71ecf7906..5023ac56c 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -82,6 +82,10 @@ public:
 
 private:
 
+	/* No copy construction */
+	FFmpegDecoder (FFmpegDecoder const &);
+	FFmpegDecoder& operator= (FFmpegDecoder const &);
+
 	bool do_seek (double p, bool);
 	PixelFormat pixel_format () const;
 	AVSampleFormat audio_sample_format () const;
@@ -134,4 +138,10 @@ private:
 	bool _decode_audio;
 	bool _decode_subtitles;
 	bool _video_sync;
+
+	/* It would appear (though not completely verified) that one must have
+	   a mutex around calls to avcodec_open* and avcodec_close... and here
+	   it is.
+	*/
+	static boost::mutex _mutex;
 };
diff --git a/src/lib/film.cc b/src/lib/film.cc
index fd72aa1d5..b21b3454d 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -550,7 +550,7 @@ Film::file (string f) const
 int
 Film::target_audio_sample_rate () const
 {
-	if (has_audio ()) {
+	if (!has_audio ()) {
 		return 0;
 	}
 	
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 3da7f938b..dc8ad1ef7 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -25,6 +25,7 @@
 #include "ffmpeg_decoder.h"
 #include "imagemagick_content.h"
 #include "imagemagick_decoder.h"
+#include "job.h"
 
 using std::list;
 using std::cout;
@@ -219,7 +220,7 @@ Player::Player (boost::shared_ptr<const Film> f, boost::shared_ptr<const Playlis
 {
 
 }
-		
+
 void
 Player::disable_video ()
 {
@@ -278,7 +279,27 @@ Player::pass ()
 void
 Player::set_progress (shared_ptr<Job> job)
 {
-	/* XXX */
+	/* Assume progress can be divined from how far through the video we are */
+	switch (_playlist->video_from ()) {
+	case Playlist::VIDEO_NONE:
+		break;
+	case Playlist::VIDEO_FFMPEG:
+		if (_playlist->video_length ()) {
+			job->set_progress (float(_ffmpeg_decoder->video_frame()) / _playlist->video_length ());
+		}
+		break;
+	case Playlist::VIDEO_IMAGEMAGICK:
+	{
+		int n = 0;
+		for (std::list<boost::shared_ptr<ImageMagickDecoder> >::iterator i = _imagemagick_decoders.begin(); i != _imagemagick_decoders.end(); ++i) {
+			if (_imagemagick_decoder == i) {
+				job->set_progress (float (n) / _imagemagick_decoders.size ());
+			}
+			++n;
+		}
+		break;
+	}
+	}
 }
 
 void
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 8b74f7766..0c3b8c37b 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -60,8 +60,8 @@ TranscodeJob::run ()
 		_film->log()->log (N_("Transcode job starting"));
 		_film->log()->log (String::compose (N_("Audio delay is %1ms"), _film->audio_delay()));
 
-		Transcoder w (_film, shared_from_this ());
-		w.go ();
+		_transcoder.reset (new Transcoder (_film, shared_from_this ()));
+		_transcoder->go ();
 		set_progress (1);
 		set_state (FINISHED_OK);
 
@@ -80,13 +80,11 @@ TranscodeJob::run ()
 string
 TranscodeJob::status () const
 {
-//	if (!_encoder) {
-//		return _("0%");
-//	}
+	if (!_transcoder) {
+		return _("0%");
+	}
 
-	/* XXX */
-//	float const fps = _encoder->current_frames_per_second ();
-	float const fps = 0;
+	float const fps = _transcoder->current_encoding_rate ();
 	if (fps == 0) {
 		return Job::status ();
 	}
@@ -105,28 +103,28 @@ TranscodeJob::status () const
 int
 TranscodeJob::remaining_time () const
 {
-	return 0;
-#if 0
-	XXX
-	float fps = _encoder->current_frames_per_second ();
+	if (!_transcoder) {
+		return 0;
+	}
+	
+	float fps = _transcoder->current_encoding_rate ();
+
 	if (fps == 0) {
 		return 0;
 	}
 
-	if (!_video->length()) {
+	if (!_film->video_length()) {
 		return 0;
 	}
 
 	/* Compute approximate proposed length here, as it's only here that we need it */
-	int length = _film->length().get();
-	FrameRateConversion const frc (_film->source_frame_rate(), _film->dcp_frame_rate());
+	int length = _film->video_length();
+	FrameRateConversion const frc (_film->video_frame_rate(), _film->dcp_frame_rate());
 	if (frc.skip) {
 		length /= 2;
 	}
 	/* If we are repeating it shouldn't affect transcode time, so don't take it into account */
 
-	/* We assume that dcp_length() is valid, if it is set */
-	int const left = length - _encoder->video_frames_out();
+	int const left = length - _transcoder->video_frames_out();
 	return left / fps;
-#endif	
 }
diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index def545958..7880a925e 100644
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -24,7 +24,7 @@
 #include <boost/shared_ptr.hpp>
 #include "job.h"
 
-class Encoder;
+class Transcoder;
 
 /** @class TranscodeJob
  *  @brief A job which transcodes from one format to another.
@@ -38,6 +38,8 @@ public:
 	void run ();
 	std::string status () const;
 
-protected:
+private:
 	int remaining_time () const;
+
+	boost::shared_ptr<Transcoder> _transcoder;
 };
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 0ee6f523f..ef3a0e8c1 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -99,3 +99,15 @@ Transcoder::go ()
 	}
 	_encoder->process_end ();
 }
+
+float
+Transcoder::current_encoding_rate () const
+{
+	return _encoder->current_encoding_rate ();
+}
+
+int
+Transcoder::video_frames_out () const
+{
+	return _encoder->video_frames_out ();
+}
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 2d032fcf6..ecc8ebf62 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -47,6 +47,9 @@ public:
 
 	void go ();
 
+	float current_encoding_rate () const;
+	int video_frames_out () const;
+
 protected:
 	/** A Job that is running this Transcoder, or 0 */
 	boost::shared_ptr<Job> _job;
diff --git a/src/lib/video_source.cc b/src/lib/video_source.cc
index 56742e2b4..8101a6d36 100644
--- a/src/lib/video_source.cc
+++ b/src/lib/video_source.cc
@@ -21,10 +21,23 @@
 #include "video_sink.h"
 
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::bind;
 
+static void
+process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
+{
+	boost::shared_ptr<VideoSink> p = sink.lock ();
+	if (p) {
+		p->process_video (i, same, s);
+	}
+}
+
 void
 VideoSource::connect_video (shared_ptr<VideoSink> s)
 {
-	Video.connect (bind (&VideoSink::process_video, s, _1, _2, _3));
+	/* If we bind, say, a Playlist (as the VideoSink) to a Decoder (which is owned
+	   by the Playlist) we create a cycle.  Use a weak_ptr to break it.
+	*/
+	Video.connect (bind (process_video_proxy, boost::weak_ptr<VideoSink> (s), _1, _2, _3));
 }
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index d55104a95..10cb41df0 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -705,16 +705,17 @@ FilmEditor::film_content_changed (int p)
 		setup_show_audio_sensitivity ();
 	} else if (p == VideoContentProperty::VIDEO_LENGTH) {
 		setup_length ();
+		setup_content_information ();
 	} else if (p == FFmpegContentProperty::AUDIO_STREAM) {
 		if (_film->ffmpeg_audio_stream()) {
-			checked_set (_ffmpeg_audio_stream, _film->ffmpeg_audio_stream()->id);
+			checked_set (_ffmpeg_audio_stream, boost::lexical_cast<string> (_film->ffmpeg_audio_stream()->id));
 		}
 		setup_dcp_name ();
 		setup_audio_details ();
 		setup_show_audio_sensitivity ();
 	} else if (p == FFmpegContentProperty::SUBTITLE_STREAM) {
 		if (_film->ffmpeg_subtitle_stream()) {
-			checked_set (_ffmpeg_subtitle_stream, _film->ffmpeg_subtitle_stream()->id);
+			checked_set (_ffmpeg_subtitle_stream, boost::lexical_cast<string> (_film->ffmpeg_subtitle_stream()->id));
 		}
 	}
 }
@@ -1117,7 +1118,7 @@ FilmEditor::setup_audio_details ()
 		} else {
 			s << _film->audio_channels() << " " << wx_to_std (_("channels"));
 		}
-		s << ", " << _film->audio_channels() << wx_to_std (_("Hz"));
+		s << ", " << _film->audio_frame_rate() << wx_to_std (_("Hz"));
 		_audio->SetLabel (std_to_wx (s.str ()));
 	}
 }
@@ -1172,11 +1173,26 @@ FilmEditor::setup_show_audio_sensitivity ()
 void
 FilmEditor::setup_content ()
 {
+	string selected_summary;
+	int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+	if (s != -1) {
+		selected_summary = wx_to_std (_content->GetItemText (s));
+	}
+	
 	_content->DeleteAllItems ();
 
 	ContentList content = _film->content ();
 	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
-		_content->InsertItem (_content->GetItemCount(), std_to_wx ((*i)->summary ()));
+		int const t = _content->GetItemCount ();
+		_content->InsertItem (t, std_to_wx ((*i)->summary ()));
+		if ((*i)->summary() == selected_summary) {
+			_content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+		}
+	}
+
+	if (selected_summary.empty () && !content.empty ()) {
+		/* Select the first item of content if non was selected before */
+		_content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 	}
 }
 
@@ -1246,7 +1262,12 @@ void
 FilmEditor::content_item_selected (wxListEvent &)
 {
         setup_content_button_sensitivity ();
+	setup_content_information ();
+}
 
+void
+FilmEditor::setup_content_information ()
+{
 	int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	if (s == -1) {
 		_content_information->SetValue ("");
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 60da2de4d..97d1e0dd3 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -106,6 +106,7 @@ private:
 	void setup_content_button_sensitivity ();
 	void setup_length ();
 	void setup_format ();
+	void setup_content_information ();
 	
 	void active_jobs_changed (bool);
 
-- 
cgit v1.2.3


From 6bc12a2eeb9c84a539688f2f7eb876e3ea278a9f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 4 Apr 2013 10:13:41 +0100
Subject: Split playlist files up; fix build.

---
 src/lib/ab_transcoder.cc     |   2 +-
 src/lib/analyse_audio_job.cc |   2 +-
 src/lib/encoder.cc           |   2 +-
 src/lib/film.cc              |   1 +
 src/lib/player.cc            | 280 +++++++++++++++++++++++++++++++++++++++++++
 src/lib/player.h             |  77 ++++++++++++
 src/lib/playlist.cc          | 250 --------------------------------------
 src/lib/playlist.h           |  39 ------
 src/lib/transcoder.cc        |   2 +-
 src/lib/writer.cc            |   2 +-
 src/lib/wscript              |   1 +
 src/tools/servomatictest.cc  |   2 +-
 src/wx/film_editor.cc        |   9 +-
 src/wx/film_viewer.cc        |   2 +-
 14 files changed, 371 insertions(+), 300 deletions(-)
 create mode 100644 src/lib/player.cc
 create mode 100644 src/lib/player.h

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 6bf092fee..81aa5a4ba 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -24,7 +24,7 @@
 #include "encoder.h"
 #include "job.h"
 #include "image.h"
-#include "playlist.h"
+#include "player.h"
 #include "matcher.h"
 #include "delay_line.h"
 #include "gain.h"
diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index e2c9c5b18..5ef6515dd 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -21,7 +21,7 @@
 #include "analyse_audio_job.h"
 #include "compose.hpp"
 #include "film.h"
-#include "playlist.h"
+#include "player.h"
 
 #include "i18n.h"
 
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index a41ebec51..2a8d8cc16 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -37,7 +37,7 @@
 #include "format.h"
 #include "cross.h"
 #include "writer.h"
-#include "playlist.h"
+#include "player.h"
 
 #include "i18n.h"
 
diff --git a/src/lib/film.cc b/src/lib/film.cc
index b21b3454d..42f4b1c3d 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -53,6 +53,7 @@
 #include "sndfile_decoder.h"
 #include "analyse_audio_job.h"
 #include "playlist.h"
+#include "player.h"
 #include "ffmpeg_content.h"
 #include "imagemagick_content.h"
 #include "sndfile_content.h"
diff --git a/src/lib/player.cc b/src/lib/player.cc
new file mode 100644
index 000000000..6e2e7ed14
--- /dev/null
+++ b/src/lib/player.cc
@@ -0,0 +1,280 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "player.h"
+#include "film.h"
+#include "ffmpeg_decoder.h"
+#include "imagemagick_decoder.h"
+#include "sndfile_decoder.h"
+#include "playlist.h"
+#include "job.h"
+
+using std::list;
+using boost::shared_ptr;
+
+Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
+	: _film (f)
+	, _playlist (p)
+	, _video (true)
+	, _audio (true)
+	, _subtitles (true)
+	, _have_setup_decoders (false)
+	, _ffmpeg_decoder_done (false)
+	, _video_sync (true)
+{
+
+}
+
+void
+Player::disable_video ()
+{
+	_video = false;
+}
+
+void
+Player::disable_audio ()
+{
+	_audio = false;
+}
+
+void
+Player::disable_subtitles ()
+{
+	_subtitles = false;
+}
+
+bool
+Player::pass ()
+{
+	if (!_have_setup_decoders) {
+		setup_decoders ();
+		_have_setup_decoders = true;
+	}
+	
+	bool done = true;
+	
+	if (_playlist->video_from() == Playlist::VIDEO_FFMPEG || _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
+		if (!_ffmpeg_decoder_done) {
+			if (_ffmpeg_decoder->pass ()) {
+				_ffmpeg_decoder_done = true;
+			} else {
+				done = false;
+			}
+		}
+	}
+
+	if (_playlist->video_from() == Playlist::VIDEO_IMAGEMAGICK) {
+		if (_imagemagick_decoder != _imagemagick_decoders.end ()) {
+			if ((*_imagemagick_decoder)->pass ()) {
+				_imagemagick_decoder++;
+			}
+
+			if (_imagemagick_decoder != _imagemagick_decoders.end ()) {
+				done = false;
+			}
+		}
+	}
+
+	/* XXX: sndfile */
+
+	return done;
+}
+
+void
+Player::set_progress (shared_ptr<Job> job)
+{
+	/* Assume progress can be divined from how far through the video we are */
+	switch (_playlist->video_from ()) {
+	case Playlist::VIDEO_NONE:
+		break;
+	case Playlist::VIDEO_FFMPEG:
+		if (_playlist->video_length ()) {
+			job->set_progress (float(_ffmpeg_decoder->video_frame()) / _playlist->video_length ());
+		}
+		break;
+	case Playlist::VIDEO_IMAGEMAGICK:
+	{
+		int n = 0;
+		for (list<shared_ptr<ImageMagickDecoder> >::iterator i = _imagemagick_decoders.begin(); i != _imagemagick_decoders.end(); ++i) {
+			if (_imagemagick_decoder == i) {
+				job->set_progress (float (n) / _imagemagick_decoders.size ());
+			}
+			++n;
+		}
+		break;
+	}
+	}
+}
+
+void
+Player::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
+{
+	Video (i, same, s);
+}
+
+void
+Player::process_audio (shared_ptr<AudioBuffers> b)
+{
+	Audio (b);
+}
+
+/** @return true on error */
+bool
+Player::seek (double t)
+{
+	if (!_have_setup_decoders) {
+		setup_decoders ();
+		_have_setup_decoders = true;
+	}
+	
+	bool r = false;
+
+	switch (_playlist->video_from()) {
+	case Playlist::VIDEO_NONE:
+		break;
+	case Playlist::VIDEO_FFMPEG:
+		if (!_ffmpeg_decoder || _ffmpeg_decoder->seek (t)) {
+			r = true;
+		}
+		/* We're seeking, so all `all done' bets are off */
+		_ffmpeg_decoder_done = false;
+		break;
+	case Playlist::VIDEO_IMAGEMAGICK:
+		/* Find the decoder that contains this position */
+		_imagemagick_decoder = _imagemagick_decoders.begin ();
+		while (_imagemagick_decoder != _imagemagick_decoders.end ()) {
+			double const this_length = (*_imagemagick_decoder)->video_length() / _film->video_frame_rate ();
+			if (t < this_length) {
+				break;
+			}
+			t -= this_length;
+			++_imagemagick_decoder;
+		}
+
+		if (_imagemagick_decoder != _imagemagick_decoders.end()) {
+			(*_imagemagick_decoder)->seek (t);
+		} else {
+			r = true;
+		}
+		break;
+	}
+
+	/* XXX: don't seek audio because we don't need to... */
+
+	return r;
+}
+
+bool
+Player::seek_to_last ()
+{
+	if (!_have_setup_decoders) {
+		setup_decoders ();
+		_have_setup_decoders = true;
+	}
+
+	bool r = false;
+	
+	switch (_playlist->video_from ()) {
+	case Playlist::VIDEO_NONE:
+		break;
+	case Playlist::VIDEO_FFMPEG:
+		if (!_ffmpeg_decoder || _ffmpeg_decoder->seek_to_last ()) {
+			r = true;
+		}
+
+		/* We're seeking, so all `all done' bets are off */
+		_ffmpeg_decoder_done = false;
+		break;
+	case Playlist::VIDEO_IMAGEMAGICK:
+		if ((*_imagemagick_decoder)->seek_to_last ()) {
+			r = true;
+		}
+		break;
+	}
+
+	/* XXX: don't seek audio because we don't need to... */
+
+	return r;
+}
+
+void
+Player::setup_decoders ()
+{
+	if ((_video && _playlist->video_from() == Playlist::VIDEO_FFMPEG) || (_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG)) {
+		_ffmpeg_decoder.reset (
+			new FFmpegDecoder (
+				_film,
+				_playlist->ffmpeg(),
+				_video && _playlist->video_from() == Playlist::VIDEO_FFMPEG,
+				_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG,
+				_subtitles && _film->with_subtitles(),
+				_video_sync
+				)
+			);
+	}
+	
+	if (_video && _playlist->video_from() == Playlist::VIDEO_FFMPEG) {
+		_ffmpeg_decoder->connect_video (shared_from_this ());
+	}
+
+	if (_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
+		_ffmpeg_decoder->connect_audio (shared_from_this ());
+	}
+
+	if (_video && _playlist->video_from() == Playlist::VIDEO_IMAGEMAGICK) {
+		list<shared_ptr<const ImageMagickContent> > ic = _playlist->imagemagick ();
+		for (list<shared_ptr<const ImageMagickContent> >::iterator i = ic.begin(); i != ic.end(); ++i) {
+			shared_ptr<ImageMagickDecoder> d (new ImageMagickDecoder (_film, *i));
+			_imagemagick_decoders.push_back (d);
+			d->connect_video (shared_from_this ());
+		}
+
+		_imagemagick_decoder = _imagemagick_decoders.begin ();
+	}
+
+	if (_audio && _playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
+		list<shared_ptr<const SndfileContent> > sc = _playlist->sndfile ();
+		for (list<shared_ptr<const SndfileContent> >::iterator i = sc.begin(); i != sc.end(); ++i) {
+			shared_ptr<SndfileDecoder> d (new SndfileDecoder (_film, *i));
+			_sndfile_decoders.push_back (d);
+			d->connect_audio (shared_from_this ());
+		}
+	}
+}
+
+void
+Player::disable_video_sync ()
+{
+	_video_sync = false;
+}
+
+double
+Player::last_video_time () const
+{
+	switch (_playlist->video_from ()) {
+	case Playlist::VIDEO_NONE:
+		return 0;
+	case Playlist::VIDEO_FFMPEG:
+		return _ffmpeg_decoder->last_source_time ();
+	case Playlist::VIDEO_IMAGEMAGICK:
+		return (*_imagemagick_decoder)->last_source_time ();
+	}
+
+	return 0;
+}
diff --git a/src/lib/player.h b/src/lib/player.h
new file mode 100644
index 000000000..bc728d8f2
--- /dev/null
+++ b/src/lib/player.h
@@ -0,0 +1,77 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef DVDOMATIC_PLAYER_H
+#define DVDOMATIC_PLAYER_H
+
+#include <list>
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include "video_source.h"
+#include "audio_source.h"
+#include "video_sink.h"
+#include "audio_sink.h"
+
+class FFmpegDecoder;
+class ImageMagickDecoder;
+class SndfileDecoder;
+class Job;
+class Film;
+class Playlist;
+
+class Player : public VideoSource, public AudioSource, public VideoSink, public AudioSink, public boost::enable_shared_from_this<Player>
+{
+public:
+	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+
+	void disable_video ();
+	void disable_audio ();
+	void disable_subtitles ();
+	void disable_video_sync ();
+
+	bool pass ();
+	void set_progress (boost::shared_ptr<Job>);
+	bool seek (double);
+	bool seek_to_last ();
+
+	double last_video_time () const;
+
+private:
+	void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
+	void process_audio (boost::shared_ptr<AudioBuffers>);
+	void setup_decoders ();
+
+	boost::shared_ptr<const Film> _film;
+	boost::shared_ptr<const Playlist> _playlist;
+	
+	bool _video;
+	bool _audio;
+	bool _subtitles;
+	
+	bool _have_setup_decoders;
+	boost::shared_ptr<FFmpegDecoder> _ffmpeg_decoder;
+	bool _ffmpeg_decoder_done;
+	std::list<boost::shared_ptr<ImageMagickDecoder> > _imagemagick_decoders;
+	std::list<boost::shared_ptr<ImageMagickDecoder> >::iterator _imagemagick_decoder;
+	std::list<boost::shared_ptr<SndfileDecoder> > _sndfile_decoders;
+
+	bool _video_sync;
+};
+
+#endif
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index a7862f116..0a4803f6e 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -208,253 +208,3 @@ Playlist::has_audio () const
 	return _audio_from != AUDIO_NONE;
 }
 
-Player::Player (boost::shared_ptr<const Film> f, boost::shared_ptr<const Playlist> p)
-	: _film (f)
-	, _playlist (p)
-	, _video (true)
-	, _audio (true)
-	, _subtitles (true)
-	, _have_setup_decoders (false)
-	, _ffmpeg_decoder_done (false)
-	, _video_sync (true)
-{
-
-}
-
-void
-Player::disable_video ()
-{
-	_video = false;
-}
-
-void
-Player::disable_audio ()
-{
-	_audio = false;
-}
-
-void
-Player::disable_subtitles ()
-{
-	_subtitles = false;
-}
-
-bool
-Player::pass ()
-{
-	if (!_have_setup_decoders) {
-		setup_decoders ();
-		_have_setup_decoders = true;
-	}
-	
-	bool done = true;
-	
-	if (_playlist->video_from() == Playlist::VIDEO_FFMPEG || _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-		if (!_ffmpeg_decoder_done) {
-			if (_ffmpeg_decoder->pass ()) {
-				_ffmpeg_decoder_done = true;
-			} else {
-				done = false;
-			}
-		}
-	}
-
-	if (_playlist->video_from() == Playlist::VIDEO_IMAGEMAGICK) {
-		if (_imagemagick_decoder != _imagemagick_decoders.end ()) {
-			if ((*_imagemagick_decoder)->pass ()) {
-				_imagemagick_decoder++;
-			}
-
-			if (_imagemagick_decoder != _imagemagick_decoders.end ()) {
-				done = false;
-			}
-		}
-	}
-
-	/* XXX: sndfile */
-
-	return done;
-}
-
-void
-Player::set_progress (shared_ptr<Job> job)
-{
-	/* Assume progress can be divined from how far through the video we are */
-	switch (_playlist->video_from ()) {
-	case Playlist::VIDEO_NONE:
-		break;
-	case Playlist::VIDEO_FFMPEG:
-		if (_playlist->video_length ()) {
-			job->set_progress (float(_ffmpeg_decoder->video_frame()) / _playlist->video_length ());
-		}
-		break;
-	case Playlist::VIDEO_IMAGEMAGICK:
-	{
-		int n = 0;
-		for (std::list<boost::shared_ptr<ImageMagickDecoder> >::iterator i = _imagemagick_decoders.begin(); i != _imagemagick_decoders.end(); ++i) {
-			if (_imagemagick_decoder == i) {
-				job->set_progress (float (n) / _imagemagick_decoders.size ());
-			}
-			++n;
-		}
-		break;
-	}
-	}
-}
-
-void
-Player::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
-{
-	Video (i, same, s);
-}
-
-void
-Player::process_audio (shared_ptr<AudioBuffers> b)
-{
-	Audio (b);
-}
-
-/** @return true on error */
-bool
-Player::seek (double t)
-{
-	if (!_have_setup_decoders) {
-		setup_decoders ();
-		_have_setup_decoders = true;
-	}
-	
-	bool r = false;
-
-	switch (_playlist->video_from()) {
-	case Playlist::VIDEO_NONE:
-		break;
-	case Playlist::VIDEO_FFMPEG:
-		if (!_ffmpeg_decoder || _ffmpeg_decoder->seek (t)) {
-			r = true;
-		}
-		/* We're seeking, so all `all done' bets are off */
-		_ffmpeg_decoder_done = false;
-		break;
-	case Playlist::VIDEO_IMAGEMAGICK:
-		/* Find the decoder that contains this position */
-		_imagemagick_decoder = _imagemagick_decoders.begin ();
-		while (_imagemagick_decoder != _imagemagick_decoders.end ()) {
-			double const this_length = (*_imagemagick_decoder)->video_length() / _film->video_frame_rate ();
-			if (t < this_length) {
-				break;
-			}
-			t -= this_length;
-			++_imagemagick_decoder;
-		}
-
-		if (_imagemagick_decoder != _imagemagick_decoders.end()) {
-			(*_imagemagick_decoder)->seek (t);
-		} else {
-			r = true;
-		}
-		break;
-	}
-
-	/* XXX: don't seek audio because we don't need to... */
-
-	return r;
-}
-
-bool
-Player::seek_to_last ()
-{
-	if (!_have_setup_decoders) {
-		setup_decoders ();
-		_have_setup_decoders = true;
-	}
-
-	bool r = false;
-	
-	switch (_playlist->video_from ()) {
-	case Playlist::VIDEO_NONE:
-		break;
-	case Playlist::VIDEO_FFMPEG:
-		if (!_ffmpeg_decoder || _ffmpeg_decoder->seek_to_last ()) {
-			r = true;
-		}
-
-		/* We're seeking, so all `all done' bets are off */
-		_ffmpeg_decoder_done = false;
-		break;
-	case Playlist::VIDEO_IMAGEMAGICK:
-		if ((*_imagemagick_decoder)->seek_to_last ()) {
-			r = true;
-		}
-		break;
-	}
-
-	/* XXX: don't seek audio because we don't need to... */
-
-	return r;
-}
-
-void
-Player::setup_decoders ()
-{
-	if ((_video && _playlist->video_from() == Playlist::VIDEO_FFMPEG) || (_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG)) {
-		_ffmpeg_decoder.reset (
-			new FFmpegDecoder (
-				_film,
-				_playlist->ffmpeg(),
-				_video && _playlist->video_from() == Playlist::VIDEO_FFMPEG,
-				_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG,
-				_subtitles && _film->with_subtitles(),
-				_video_sync
-				)
-			);
-	}
-	
-	if (_video && _playlist->video_from() == Playlist::VIDEO_FFMPEG) {
-		_ffmpeg_decoder->connect_video (shared_from_this ());
-	}
-
-	if (_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-		_ffmpeg_decoder->connect_audio (shared_from_this ());
-	}
-
-	if (_video && _playlist->video_from() == Playlist::VIDEO_IMAGEMAGICK) {
-		list<shared_ptr<const ImageMagickContent> > ic = _playlist->imagemagick ();
-		for (list<shared_ptr<const ImageMagickContent> >::iterator i = ic.begin(); i != ic.end(); ++i) {
-			shared_ptr<ImageMagickDecoder> d (new ImageMagickDecoder (_film, *i));
-			_imagemagick_decoders.push_back (d);
-			d->connect_video (shared_from_this ());
-		}
-
-		_imagemagick_decoder = _imagemagick_decoders.begin ();
-	}
-
-	if (_audio && _playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
-		list<shared_ptr<const SndfileContent> > sc = _playlist->sndfile ();
-		for (list<shared_ptr<const SndfileContent> >::iterator i = sc.begin(); i != sc.end(); ++i) {
-			shared_ptr<SndfileDecoder> d (new SndfileDecoder (_film, *i));
-			_sndfile_decoders.push_back (d);
-			d->connect_audio (shared_from_this ());
-		}
-	}
-}
-
-void
-Player::disable_video_sync ()
-{
-	_video_sync = false;
-}
-
-double
-Player::last_video_time () const
-{
-	switch (_playlist->video_from ()) {
-	case Playlist::VIDEO_NONE:
-		return 0;
-	case Playlist::VIDEO_FFMPEG:
-		return _ffmpeg_decoder->last_source_time ();
-	case Playlist::VIDEO_IMAGEMAGICK:
-		return (*_imagemagick_decoder)->last_source_time ();
-	}
-
-	return 0;
-}
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 480f1b2ed..29a52d433 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -93,42 +93,3 @@ private:
 	std::list<boost::shared_ptr<const ImageMagickContent> > _imagemagick;
 	std::list<boost::shared_ptr<const SndfileContent> > _sndfile;
 };
-
-class Player : public VideoSource, public AudioSource, public VideoSink, public AudioSink, public boost::enable_shared_from_this<Player>
-{
-public:
-	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
-
-	void disable_video ();
-	void disable_audio ();
-	void disable_subtitles ();
-	void disable_video_sync ();
-
-	bool pass ();
-	void set_progress (boost::shared_ptr<Job>);
-	bool seek (double);
-	bool seek_to_last ();
-
-	double last_video_time () const;
-
-private:
-	void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
-	void process_audio (boost::shared_ptr<AudioBuffers>);
-	void setup_decoders ();
-
-	boost::shared_ptr<const Film> _film;
-	boost::shared_ptr<const Playlist> _playlist;
-	
-	bool _video;
-	bool _audio;
-	bool _subtitles;
-	
-	bool _have_setup_decoders;
-	boost::shared_ptr<FFmpegDecoder> _ffmpeg_decoder;
-	bool _ffmpeg_decoder_done;
-	std::list<boost::shared_ptr<ImageMagickDecoder> > _imagemagick_decoders;
-	std::list<boost::shared_ptr<ImageMagickDecoder> >::iterator _imagemagick_decoder;
-	std::list<boost::shared_ptr<SndfileDecoder> > _sndfile_decoders;
-
-	bool _video_sync;
-};
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index ef3a0e8c1..6744e9193 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -34,7 +34,7 @@
 #include "gain.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "playlist.h"
+#include "player.h"
 
 using std::string;
 using boost::shared_ptr;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index b08b9caf1..d413d33f3 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -28,7 +28,7 @@
 #include "format.h"
 #include "log.h"
 #include "dcp_video_frame.h"
-#include "playlist.h"
+#include "player.h"
 
 #include "i18n.h"
 
diff --git a/src/lib/wscript b/src/lib/wscript
index f2bb678aa..32a2cde23 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -38,6 +38,7 @@ sources = """
           log.cc
           lut.cc
           matcher.cc
+          player.cc
           playlist.cc
           scp_dcp_job.cc
           scaler.cc
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index d7e8bbb0e..d3222faa3 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -33,7 +33,7 @@
 #include "scaler.h"
 #include "log.h"
 #include "video_decoder.h"
-#include "playlist.h"
+#include "player.h"
 
 using std::cout;
 using std::cerr;
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 10cb41df0..ab1fe86ce 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -59,6 +59,7 @@ using std::list;
 using std::vector;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::lexical_cast;
 
 /** @param f Film to edit */
 FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
@@ -332,7 +333,7 @@ FilmEditor::make_content_panel ()
                 _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL);
                 s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
 
-                _content->InsertColumn (0, "");
+                _content->InsertColumn (0, wxT(""));
 		_content->SetColumnWidth (0, 512);
 
                 wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
@@ -1078,7 +1079,7 @@ FilmEditor::ffmpeg_audio_stream_changed (wxCommandEvent &)
 	vector<FFmpegAudioStream> a = _film->ffmpeg_audio_streams ();
 	vector<FFmpegAudioStream>::iterator i = a.begin ();
 	string const s = string_client_data (_ffmpeg_audio_stream->GetClientObject (_ffmpeg_audio_stream->GetSelection ()));
-	while (i != a.end() && i->id != s) {
+	while (i != a.end() && lexical_cast<string> (i->id) != s) {
 		++i;
 	}
 
@@ -1097,7 +1098,7 @@ FilmEditor::ffmpeg_subtitle_stream_changed (wxCommandEvent &)
 	vector<FFmpegSubtitleStream> a = _film->ffmpeg_subtitle_streams ();
 	vector<FFmpegSubtitleStream>::iterator i = a.begin ();
 	string const s = string_client_data (_ffmpeg_subtitle_stream->GetClientObject (_ffmpeg_subtitle_stream->GetSelection ()));
-	while (i != a.end() && i->id != s) {
+	while (i != a.end() && lexical_cast<string> (i->id) != s) {
 		++i;
 	}
 
@@ -1270,7 +1271,7 @@ FilmEditor::setup_content_information ()
 {
 	int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	if (s == -1) {
-		_content_information->SetValue ("");
+		_content_information->SetValue (wxT (""));
 		return;
 	}
 
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 76cff3f65..f6d0f77dc 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -34,7 +34,7 @@
 #include "lib/exceptions.h"
 #include "lib/examine_content_job.h"
 #include "lib/filter.h"
-#include "lib/playlist.h"
+#include "lib/player.h"
 #include "lib/video_content.h"
 #include "lib/ffmpeg_content.h"
 #include "film_viewer.h"
-- 
cgit v1.2.3


From 3429cf48ff2ce056413588be4151be82c8114861 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 4 Apr 2013 10:37:32 +0100
Subject: Some unnecessary boost:: removal.

---
 src/lib/encoder.cc         |  9 +++++----
 src/lib/film.cc            | 12 ++++++------
 src/lib/matcher.cc         |  4 ++--
 src/lib/video_source.cc    |  2 +-
 src/wx/audio_dialog.cc     |  2 +-
 src/wx/film_viewer.cc      |  2 +-
 src/wx/job_manager_view.cc |  4 ++--
 7 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 2a8d8cc16..568307462 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -48,7 +48,8 @@ using std::vector;
 using std::list;
 using std::cout;
 using std::make_pair;
-using namespace boost;
+using boost::shared_ptr;
+using boost::optional;
 
 int const Encoder::_history_size = 25;
 
@@ -231,7 +232,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub)
+Encoder::process_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
 {
 	FrameRateConversion frc (_film->video_frame_rate(), _film->dcp_frame_rate());
 	
@@ -269,7 +270,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
 		TIMING ("adding to queue of %1", _queue.size ());
-		_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
+		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
 						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
 						  _film->subtitle_offset(), _film->subtitle_scale(),
@@ -360,7 +361,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
-		boost::shared_ptr<DCPVideoFrame> vf = _queue.front ();
+		shared_ptr<DCPVideoFrame> vf = _queue.front ();
 		_film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 from queue"), boost::this_thread::get_id(), vf->frame()), Log::VERBOSE);
 		_queue.pop_front ();
 		
diff --git a/src/lib/film.cc b/src/lib/film.cc
index a9d7b7381..976f65313 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1178,7 +1178,7 @@ Film::ffmpeg () const
 vector<FFmpegSubtitleStream>
 Film::ffmpeg_subtitle_streams () const
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		return f->subtitle_streams ();
 	}
@@ -1189,7 +1189,7 @@ Film::ffmpeg_subtitle_streams () const
 boost::optional<FFmpegSubtitleStream>
 Film::ffmpeg_subtitle_stream () const
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		return f->subtitle_stream ();
 	}
@@ -1200,7 +1200,7 @@ Film::ffmpeg_subtitle_stream () const
 vector<FFmpegAudioStream>
 Film::ffmpeg_audio_streams () const
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		return f->audio_streams ();
 	}
@@ -1211,7 +1211,7 @@ Film::ffmpeg_audio_streams () const
 boost::optional<FFmpegAudioStream>
 Film::ffmpeg_audio_stream () const
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		return f->audio_stream ();
 	}
@@ -1222,7 +1222,7 @@ Film::ffmpeg_audio_stream () const
 void
 Film::set_ffmpeg_subtitle_stream (FFmpegSubtitleStream s)
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		f->set_subtitle_stream (s);
 	}
@@ -1231,7 +1231,7 @@ Film::set_ffmpeg_subtitle_stream (FFmpegSubtitleStream s)
 void
 Film::set_ffmpeg_audio_stream (FFmpegAudioStream s)
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		f->set_audio_stream (s);
 	}
diff --git a/src/lib/matcher.cc b/src/lib/matcher.cc
index 48f6ed912..77ed9b651 100644
--- a/src/lib/matcher.cc
+++ b/src/lib/matcher.cc
@@ -37,7 +37,7 @@ Matcher::Matcher (shared_ptr<Log> log, int sample_rate, float frames_per_second)
 }
 
 void
-Matcher::process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s)
+Matcher::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
 {
 	Video (i, same, s);
 	_video_frames++;
@@ -47,7 +47,7 @@ Matcher::process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr
 }
 
 void
-Matcher::process_audio (boost::shared_ptr<AudioBuffers> b)
+Matcher::process_audio (shared_ptr<AudioBuffers> b)
 {
 	Audio (b);
 	_audio_frames += b->frames ();
diff --git a/src/lib/video_source.cc b/src/lib/video_source.cc
index 8101a6d36..1c4d6466c 100644
--- a/src/lib/video_source.cc
+++ b/src/lib/video_source.cc
@@ -27,7 +27,7 @@ using boost::bind;
 static void
 process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
 {
-	boost::shared_ptr<VideoSink> p = sink.lock ();
+	shared_ptr<VideoSink> p = sink.lock ();
 	if (p) {
 		p->process_video (i, same, s);
 	}
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 242d37b1e..1241c2e76 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -84,7 +84,7 @@ AudioDialog::AudioDialog (wxWindow* parent)
 }
 
 void
-AudioDialog::set_film (boost::shared_ptr<Film> f)
+AudioDialog::set_film (shared_ptr<Film> f)
 {
 	_film_changed_connection.disconnect ();
 	_film_audio_analysis_succeeded_connection.disconnect ();
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index f6d0f77dc..316a42a66 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -290,7 +290,7 @@ FilmViewer::raw_to_display ()
 		old_size = _display_frame->size();
 	}
 
-	boost::shared_ptr<Image> input = _raw_frame;
+	shared_ptr<Image> input = _raw_frame;
 
 	pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
 	if (!s.second.empty ()) {
diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index f7d2315cc..a7788ddd0 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -135,7 +135,7 @@ JobManagerView::details_clicked (wxCommandEvent& ev)
 {
 	wxObject* o = ev.GetEventObject ();
 
-	for (map<boost::shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+	for (map<shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
 		if (i->second.details == o) {
 			string s = i->first->error_summary();
 			s[0] = toupper (s[0]);
@@ -149,7 +149,7 @@ JobManagerView::cancel_clicked (wxCommandEvent& ev)
 {
 	wxObject* o = ev.GetEventObject ();
 
-	for (map<boost::shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+	for (map<shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
 		if (i->second.cancel == o) {
 			i->first->cancel ();
 		}
-- 
cgit v1.2.3


From 8750efb9e072cf3b42e6c3c29521c7031c0b5dfd Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 6 Apr 2013 14:42:08 +0100
Subject: Basics of content dialogs.

---
 src/lib/audio_content.cc             |   4 ++
 src/lib/audio_content.h              |   8 +++
 src/lib/audio_mapping.cc             | 103 +++++++++++++++++++++++++++++++++++
 src/lib/audio_mapping.h              |  53 ++++++++++++++++++
 src/lib/encoder.cc                   |   3 +-
 src/lib/sndfile_content.cc           |  84 +++++++++++++++++-----------
 src/lib/sndfile_content.h            |  32 +++++++++--
 src/lib/sndfile_decoder.cc           |  65 +++++++++++-----------
 src/lib/sndfile_decoder.h            |   8 +++
 src/lib/util.cc                      |  52 ------------------
 src/lib/util.h                       |  13 -----
 src/lib/writer.cc                    |   3 +-
 src/lib/wscript                      |   1 +
 src/wx/audio_dialog.cc               |   7 ++-
 src/wx/film_editor.cc                |  79 +++++++++++----------------
 src/wx/film_editor.h                 |   5 +-
 src/wx/imagemagick_content_dialog.cc |  62 +++++++++++++++++++++
 src/wx/imagemagick_content_dialog.h  |  34 ++++++++++++
 src/wx/sndfile_content_dialog.cc     |  67 +++++++++++++++++++++++
 src/wx/sndfile_content_dialog.h      |  36 ++++++++++++
 src/wx/wscript                       |   2 +
 21 files changed, 536 insertions(+), 185 deletions(-)
 create mode 100644 src/lib/audio_mapping.cc
 create mode 100644 src/lib/audio_mapping.h
 create mode 100644 src/wx/imagemagick_content_dialog.cc
 create mode 100644 src/wx/imagemagick_content_dialog.h
 create mode 100644 src/wx/sndfile_content_dialog.cc
 create mode 100644 src/wx/sndfile_content_dialog.h

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 8ca1e83c9..9968f4725 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -22,6 +22,10 @@
 
 using boost::shared_ptr;
 
+int const AudioContentProperty::AUDIO_CHANNELS = 200;
+int const AudioContentProperty::AUDIO_LENGTH = 201;
+int const AudioContentProperty::AUDIO_FRAME_RATE = 202;
+
 AudioContent::AudioContent (boost::filesystem::path f)
 	: Content (f)
 {
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 2bfc20656..d5dbf266b 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -27,6 +27,14 @@ namespace cxml {
 	class Node;
 }
 
+class AudioContentProperty
+{
+public:
+	static int const AUDIO_CHANNELS;
+	static int const AUDIO_LENGTH;
+	static int const AUDIO_FRAME_RATE;
+};
+
 class AudioContent : public virtual Content
 {
 public:
diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
new file mode 100644
index 000000000..3fc423e10
--- /dev/null
+++ b/src/lib/audio_mapping.cc
@@ -0,0 +1,103 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "audio_mapping.h"
+
+using std::map;
+using boost::optional;
+
+AutomaticAudioMapping::AutomaticAudioMapping (int c)
+	: _source_channels (c)
+{
+
+}
+
+optional<libdcp::Channel>
+AutomaticAudioMapping::source_to_dcp (int c) const
+{
+	if (c >= _source_channels) {
+		return optional<libdcp::Channel> ();
+	}
+
+	if (_source_channels == 1) {
+		/* mono sources to centre */
+		return libdcp::CENTRE;
+	}
+	
+	return static_cast<libdcp::Channel> (c);
+}
+
+optional<int>
+AutomaticAudioMapping::dcp_to_source (libdcp::Channel c) const
+{
+	if (_source_channels == 1) {
+		if (c == libdcp::CENTRE) {
+			return 0;
+		} else {
+			return optional<int> ();
+		}
+	}
+
+	if (static_cast<int> (c) >= _source_channels) {
+		return optional<int> ();
+	}
+	
+	return static_cast<int> (c);
+}
+
+int
+AutomaticAudioMapping::dcp_channels () const
+{
+	if (_source_channels == 1) {
+		/* The source is mono, so to put the mono channel into
+		   the centre we need to generate a 5.1 soundtrack.
+		*/
+		return 6;
+	}
+
+	return _source_channels;
+}
+
+optional<int>
+ConfiguredAudioMapping::dcp_to_source (libdcp::Channel c) const
+{
+	map<int, libdcp::Channel>::const_iterator i = _source_to_dcp.begin ();
+	while (i != _source_to_dcp.end() && i->second != c) {
+		++i;
+	}
+
+	if (i == _source_to_dcp.end ()) {
+		return boost::none;
+	}
+
+	return i->first;
+}
+
+optional<libdcp::Channel>
+ConfiguredAudioMapping::source_to_dcp (int c) const
+{
+	map<int, libdcp::Channel>::const_iterator i = _source_to_dcp.find (c);
+	if (i == _source_to_dcp.end ()) {
+		return boost::none;
+	}
+
+	return i->second;
+}
+
+	
diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
new file mode 100644
index 000000000..8804bde06
--- /dev/null
+++ b/src/lib/audio_mapping.h
@@ -0,0 +1,53 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <vector>
+#include <map>
+#include <boost/optional.hpp>
+#include <libdcp/types.h>
+
+class AudioMapping
+{
+public:
+	virtual boost::optional<libdcp::Channel> source_to_dcp (int c) const = 0;
+	virtual boost::optional<int> dcp_to_source (libdcp::Channel c) const = 0;
+};
+
+class AutomaticAudioMapping : public AudioMapping
+{
+public:
+	AutomaticAudioMapping (int);
+
+	boost::optional<libdcp::Channel> source_to_dcp (int c) const;
+	boost::optional<int> dcp_to_source (libdcp::Channel c) const;
+	int dcp_channels () const;
+	
+private:
+	int _source_channels;
+};
+
+class ConfiguredAudioMapping : public AudioMapping
+{
+public:
+	boost::optional<libdcp::Channel> source_to_dcp (int c) const;
+	boost::optional<int> dcp_to_source (libdcp::Channel c) const;
+
+private:
+	std::map<int, libdcp::Channel> _source_to_dcp;
+};
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 568307462..a0b88e33e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -38,6 +38,7 @@
 #include "cross.h"
 #include "writer.h"
 #include "player.h"
+#include "audio_mapping.h"
 
 #include "i18n.h"
 
@@ -426,7 +427,7 @@ Encoder::encoder_thread (ServerDescription* server)
 void
 Encoder::write_audio (shared_ptr<const AudioBuffers> data)
 {
-	AudioMapping m (_film->audio_channels ());
+	AutomaticAudioMapping m (_film->audio_channels ());
 	if (m.dcp_channels() != _film->audio_channels()) {
 
 		/* Remap (currently just for mono -> 5.1) */
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 684405efb..ee4f21eef 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -17,13 +17,18 @@
 
 */
 
+#include <libcxml/cxml.h>
 #include "sndfile_content.h"
+#include "sndfile_decoder.h"
 #include "compose.hpp"
+#include "job.h"
 
 #include "i18n.h"
 
 using std::string;
+using std::stringstream;
 using boost::shared_ptr;
+using boost::lexical_cast;
 
 SndfileContent::SndfileContent (boost::filesystem::path f)
 	: Content (f)
@@ -35,9 +40,10 @@ SndfileContent::SndfileContent (boost::filesystem::path f)
 SndfileContent::SndfileContent (shared_ptr<const cxml::Node> node)
 	: Content (node)
 	, AudioContent (node)
-		   
 {
-
+	_audio_channels = node->number_child<int> ("AudioChannels");
+	_audio_length = node->number_child<ContentAudioFrame> ("AudioLength");
+	_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
 }
 
 string
@@ -49,37 +55,21 @@ SndfileContent::summary () const
 string
 SndfileContent::information () const
 {
-	return "";
-}
-
-int
-SndfileContent::audio_channels () const
-{
-	/* XXX */
-	return 0;
-}
-
-ContentAudioFrame
-SndfileContent::audio_length () const
-{
-	/* XXX */
-	return 0;
-}
-
-int
-SndfileContent::audio_frame_rate () const
-{
-	/* XXX */
-	return 0;
-}
-
-int64_t
-SndfileContent::audio_channel_layout () const
-{
-	/* XXX */
-	return 0;
-}
+	if (_audio_frame_rate == 0) {
+		return "";
+	}
+	
+	stringstream s;
+
+	s << String::compose (
+		_("%1 channels, %2kHz, %3 samples"),
+		audio_channels(),
+		audio_frame_rate() / 1000.0,
+		audio_length()
+		);
 	
+	return s.str ();
+}
 
 bool
 SndfileContent::valid_file (boost::filesystem::path f)
@@ -95,3 +85,33 @@ SndfileContent::clone () const
 {
 	return shared_ptr<Content> (new SndfileContent (*this));
 }
+
+void
+SndfileContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
+{
+	job->set_progress_unknown ();
+	Content::examine (film, job, quick);
+
+	SndfileDecoder dec (film, shared_from_this());
+
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_audio_channels = dec.audio_channels ();
+		_audio_length = dec.audio_length ();
+		_audio_frame_rate = dec.audio_frame_rate ();
+	}
+
+	signal_changed (AudioContentProperty::AUDIO_CHANNELS);
+	signal_changed (AudioContentProperty::AUDIO_LENGTH);
+	signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
+}
+
+void
+SndfileContent::as_xml (xmlpp::Node* node) const
+{
+	node->add_child("Type")->add_child_text ("Sndfile");
+	Content::as_xml (node);
+	node->add_child("AudioChannels")->add_child_text (lexical_cast<string> (_audio_channels));
+	node->add_child("AudioLength")->add_child_text (lexical_cast<string> (_audio_length));
+	node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (_audio_frame_rate));
+}
diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index b696b57a5..27c5f3615 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -17,6 +17,9 @@
 
 */
 
+extern "C" {
+#include <libavutil/audioconvert.h>
+}
 #include "audio_content.h"
 
 namespace cxml {
@@ -33,15 +36,36 @@ public:
 		return boost::dynamic_pointer_cast<SndfileContent> (Content::shared_from_this ());
 	}
 	
+	void examine (boost::shared_ptr<Film>, boost::shared_ptr<Job>, bool);
 	std::string summary () const;
 	std::string information () const;
+	void as_xml (xmlpp::Node *) const;
 	boost::shared_ptr<Content> clone () const;
 
         /* AudioContent */
-        int audio_channels () const;
-        ContentAudioFrame audio_length () const;
-        int audio_frame_rate () const;
-        int64_t audio_channel_layout () const;
+        int audio_channels () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _audio_channels;
+	}
+	
+        ContentAudioFrame audio_length () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _audio_length;
+	}
+	
+        int audio_frame_rate () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _audio_frame_rate;
+	}
+	
+        int64_t audio_channel_layout () const {
+		return av_get_default_channel_layout (audio_channels ());
+	}
 
 	static bool valid_file (boost::filesystem::path);
+
+private:
+	int _audio_channels;
+	ContentAudioFrame _audio_length;
+	int _audio_frame_rate;
 };
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 1f97e5c41..c7311112a 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -28,59 +28,62 @@
 
 using std::vector;
 using std::string;
-using std::stringstream;
 using std::min;
 using std::cout;
 using boost::shared_ptr;
-using boost::optional;
-
-/* XXX */
 
 SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
 	: Decoder (f)
 	, AudioDecoder (f)
+	, _sndfile_content (c)
 {
-	sf_count_t frames;
-	SNDFILE* sf = open_file (frames);
-	sf_close (sf);
+	_sndfile = sf_open (_sndfile_content->file().string().c_str(), SFM_READ, &_info);
+	if (!_sndfile) {
+		throw DecodeError (_("could not open audio file for reading"));
+	}
+
+	_remaining = _info.frames;
 }
 
-SNDFILE*
-SndfileDecoder::open_file (sf_count_t & frames)
+SndfileDecoder::~SndfileDecoder ()
 {
-	frames = 0;
-	
-	SF_INFO info;
-	SNDFILE* s = sf_open (_sndfile_content->file().string().c_str(), SFM_READ, &info);
-	if (!s) {
-		throw DecodeError (_("could not open external audio file for reading"));
+	if (_sndfile) {
+		sf_close (_sndfile);
 	}
-
-	frames = info.frames;
-	return s;
 }
 
 bool
 SndfileDecoder::pass ()
 {
-	sf_count_t frames;
-	SNDFILE* sndfile = open_file (frames);
-
 	/* Do things in half second blocks as I think there may be limits
 	   to what FFmpeg (and in particular the resampler) can cope with.
 	*/
 	sf_count_t const block = _sndfile_content->audio_frame_rate() / 2;
+	sf_count_t const this_time = min (block, _remaining);
+	
+	shared_ptr<AudioBuffers> audio (new AudioBuffers (_sndfile_content->audio_channels(), this_time));
+	sf_read_float (_sndfile, audio->data(0), this_time);
+	audio->set_frames (this_time);
+	Audio (audio);
+	_remaining -= this_time;
 
-	shared_ptr<AudioBuffers> audio (new AudioBuffers (_sndfile_content->audio_channels(), block));
-	while (frames > 0) {
-		sf_count_t const this_time = min (block, frames);
-		sf_read_float (sndfile, audio->data(0), this_time);
-		audio->set_frames (this_time);
-		Audio (audio);
-		frames -= this_time;
-	}
+	return (_remaining == 0);
+}
 
-	sf_close (sndfile);
+int
+SndfileDecoder::audio_channels () const
+{
+	return _info.channels;
+}
 
-	return true;
+ContentAudioFrame
+SndfileDecoder::audio_length () const
+{
+	return _info.frames;
+}
+
+int
+SndfileDecoder::audio_frame_rate () const
+{
+	return _info.samplerate;
 }
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 56fc3a9f0..2900afea0 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -27,12 +27,20 @@ class SndfileDecoder : public AudioDecoder
 {
 public:
 	SndfileDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const SndfileContent>);
+	~SndfileDecoder ();
 
 	bool pass ();
 
+	int audio_channels () const;
+	ContentAudioFrame audio_length () const;
+	int audio_frame_rate () const;
+
 private:
 	SNDFILE* open_file (sf_count_t &);
 	void close_file (SNDFILE*);
 
 	boost::shared_ptr<const SndfileContent> _sndfile_content;
+	SNDFILE* _sndfile;
+	SF_INFO _info;
+	ContentAudioFrame _remaining;
 };
diff --git a/src/lib/util.cc b/src/lib/util.cc
index e0de82c64..1e60b43fc 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -914,58 +914,6 @@ audio_channel_name (int c)
 	return channels[c];
 }
 
-AudioMapping::AudioMapping (int c)
-	: _source_channels (c)
-{
-
-}
-
-optional<libdcp::Channel>
-AudioMapping::source_to_dcp (int c) const
-{
-	if (c >= _source_channels) {
-		return optional<libdcp::Channel> ();
-	}
-
-	if (_source_channels == 1) {
-		/* mono sources to centre */
-		return libdcp::CENTRE;
-	}
-	
-	return static_cast<libdcp::Channel> (c);
-}
-
-optional<int>
-AudioMapping::dcp_to_source (libdcp::Channel c) const
-{
-	if (_source_channels == 1) {
-		if (c == libdcp::CENTRE) {
-			return 0;
-		} else {
-			return optional<int> ();
-		}
-	}
-
-	if (static_cast<int> (c) >= _source_channels) {
-		return optional<int> ();
-	}
-	
-	return static_cast<int> (c);
-}
-
-int
-AudioMapping::dcp_channels () const
-{
-	if (_source_channels == 1) {
-		/* The source is mono, so to put the mono channel into
-		   the centre we need to generate a 5.1 soundtrack.
-		*/
-		return 6;
-	}
-
-	return _source_channels;
-}
-
 FrameRateConversion::FrameRateConversion (float source, int dcp)
 	: skip (false)
 	, repeat (false)
diff --git a/src/lib/util.h b/src/lib/util.h
index 23ebd52bc..1fe6212e4 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -194,19 +194,6 @@ private:
 	float** _data;
 };
 
-class AudioMapping
-{
-public:
-	AudioMapping (int);
-
-	boost::optional<libdcp::Channel> source_to_dcp (int c) const;
-	boost::optional<int> dcp_to_source (libdcp::Channel c) const;
-	int dcp_channels () const;
-
-private:
-	int _source_channels;
-};
-
 extern int64_t video_frames_to_audio_frames (ContentVideoFrame v, float audio_sample_rate, float frames_per_second);
 extern std::pair<std::string, int> cpu_info ();
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 5d38860e7..6df1a1f21 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -31,6 +31,7 @@
 #include "dcp_video_frame.h"
 #include "dcp_content_type.h"
 #include "player.h"
+#include "audio_mapping.h"
 
 #include "i18n.h"
 
@@ -77,7 +78,7 @@ Writer::Writer (shared_ptr<Film> f)
 
 	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
-	AudioMapping m (_film->audio_channels ());
+	AutomaticAudioMapping m (_film->audio_channels ());
 	
 	if (m.dcp_channels() > 0) {
 		_sound_asset.reset (
diff --git a/src/lib/wscript b/src/lib/wscript
index 32a2cde23..896598a0e 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -8,6 +8,7 @@ sources = """
           audio_analysis.cc
           audio_content.cc
           audio_decoder.cc
+          audio_mapping.cc
           audio_source.cc
           config.cc
           combiner.cc
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 1241c2e76..f53ea7c19 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -20,6 +20,7 @@
 #include <boost/filesystem.hpp>
 #include "lib/audio_analysis.h"
 #include "lib/film.h"
+#include "lib/audio_mapping.h"
 #include "audio_dialog.h"
 #include "audio_plot.h"
 #include "wx_util.h"
@@ -108,7 +109,7 @@ AudioDialog::setup_channels ()
 		return;
 	}
 
-	AudioMapping m (_film->audio_channels ());
+	AutomaticAudioMapping m (_film->audio_channels ());
 	
 	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
 		if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
@@ -134,7 +135,7 @@ AudioDialog::try_to_load_analysis ()
 		
 	_plot->set_analysis (a);
 
-	AudioMapping m (_film->audio_channels ());
+	AutomaticAudioMapping m (_film->audio_channels ());
 	optional<libdcp::Channel> c = m.source_to_dcp (0);
 	if (c) {
 		_channel_checkbox[c.get()]->SetValue (true);
@@ -157,7 +158,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 
 	assert (c < MAX_AUDIO_CHANNELS);
 
-	AudioMapping m (_film->audio_channels ());
+	AutomaticAudioMapping m (_film->audio_channels ());
 	optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (c));
 	if (s) {
 		_plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ());
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 58fc077a3..6c42359fb 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -49,6 +49,8 @@
 #include "dci_metadata_dialog.h"
 #include "scaler.h"
 #include "audio_dialog.h"
+#include "imagemagick_content_dialog.h"
+#include "sndfile_content_dialog.h"
 
 using std::string;
 using std::cout;
@@ -198,9 +200,9 @@ FilmEditor::connect_to_widgets ()
 	_content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler (FilmEditor::content_item_selected), 0, this);
 	_content_add->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this);
 	_content_remove->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_remove_clicked), 0, this);
+	_content_edit->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_edit_clicked), 0, this);
 	_content_earlier->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_earlier_clicked), 0, this);
 	_content_later->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_later_clicked), 0, this);
-	_imagemagick_video_length->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::imagemagick_video_length_changed), 0, this);
 	_left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
 	_right_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this);
 	_top_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this);
@@ -343,6 +345,8 @@ FilmEditor::make_content_panel ()
                 b->Add (_content_add);
                 _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
                 b->Add (_content_remove);
+                _content_edit = new wxButton (_content_panel, wxID_ANY, _("Edit..."));
+                b->Add (_content_edit);
                 _content_earlier = new wxButton (_content_panel, wxID_ANY, _("Earlier"));
                 b->Add (_content_earlier);
                 _content_later = new wxButton (_content_panel, wxID_ANY, _("Later"));
@@ -355,21 +359,6 @@ FilmEditor::make_content_panel ()
 
 	_content_information = new wxTextCtrl (_content_panel, wxID_ANY, wxT ("\n\n\n\n"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY | wxTE_MULTILINE);
 	_content_sizer->Add (_content_information, 1, wxEXPAND | wxALL, 6);
-
-	wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
-	_content_sizer->Add (grid, 0, wxEXPAND | wxALL, 6);
-
-	{
-		add_label_to_sizer (grid, _content_panel, (_("Duration")));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_imagemagick_video_length = new wxSpinCtrl (_content_panel);
-		s->Add (_imagemagick_video_length);
-		/// TRANSLATORS: this is an abbreviation for seconds, the unit of time
-		add_label_to_sizer (s, _content_panel, _("s"));
-		grid->Add (s);
-	}
-
-	_imagemagick_video_length->SetRange (1, 3600);
 }
 
 void
@@ -723,14 +712,9 @@ FilmEditor::film_content_changed (weak_ptr<Content> content, int property)
 		setup_show_audio_sensitivity ();
 	} else if (property == VideoContentProperty::VIDEO_LENGTH) {
 		setup_length ();
-
 		boost::shared_ptr<Content> c = content.lock ();
 		if (c && c == selected_content()) {
 			setup_content_information ();
-			shared_ptr<ImageMagickContent> im = dynamic_pointer_cast<ImageMagickContent> (c);
-			if (im) {
-				checked_set (_imagemagick_video_length, im->video_length() / 24);
-			}
 		}
 	} else if (property == FFmpegContentProperty::AUDIO_STREAM) {
 		if (_film->ffmpeg_audio_stream()) {
@@ -1258,6 +1242,33 @@ FilmEditor::content_remove_clicked (wxCommandEvent &)
 	}
 }
 
+void
+FilmEditor::content_edit_clicked (wxCommandEvent &)
+{
+	shared_ptr<Content> c = selected_content ();
+	if (!c) {
+		return;
+	}
+
+	shared_ptr<ImageMagickContent> im = dynamic_pointer_cast<ImageMagickContent> (c);
+	if (im) {
+		ImageMagickContentDialog* d = new ImageMagickContentDialog (this, im);
+		int const r = d->ShowModal ();
+		d->Destroy ();
+
+		if (r == wxID_OK) {
+			im->set_video_length (d->video_length() * 24);
+		}
+	}
+
+	shared_ptr<SndfileContent> sf = dynamic_pointer_cast<SndfileContent> (c);
+	if (sf) {
+		SndfileContentDialog* d = new SndfileContentDialog (this, sf);
+		d->ShowModal ();
+		d->Destroy ();
+	}
+}
+
 void
 FilmEditor::content_earlier_clicked (wxCommandEvent &)
 {
@@ -1281,15 +1292,6 @@ FilmEditor::content_item_selected (wxListEvent &)
 {
         setup_content_button_sensitivity ();
 	setup_content_information ();
-
-	shared_ptr<Content> c = selected_content ();
-	if (c) {
-		shared_ptr<ImageMagickContent> im = dynamic_pointer_cast<ImageMagickContent> (c);
-		_imagemagick_video_length->Enable (im);
-		if (im) {
-			checked_set (_imagemagick_video_length, im->video_length() / 24);
-		}
-	}
 }
 
 void
@@ -1310,27 +1312,12 @@ FilmEditor::setup_content_button_sensitivity ()
         _content_add->Enable (_generally_sensitive);
 
 	bool const have_selection = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) != -1;
+        _content_edit->Enable (have_selection && _generally_sensitive);
         _content_remove->Enable (have_selection && _generally_sensitive);
         _content_earlier->Enable (have_selection && _generally_sensitive);
         _content_later->Enable (have_selection && _generally_sensitive);
 }
 
-void
-FilmEditor::imagemagick_video_length_changed (wxCommandEvent &)
-{
-	shared_ptr<Content> c = selected_content ();
-	if (!c) {
-		return;
-	}
-
-	shared_ptr<ImageMagickContent> im = dynamic_pointer_cast<ImageMagickContent> (c);
-	if (!im) {
-		return;
-	}
-	
-	im->set_video_length (_imagemagick_video_length->GetValue() * 24);
-}
-
 shared_ptr<Content>
 FilmEditor::selected_content ()
 {
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 2870714f9..b6f6a24ee 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -16,7 +16,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-
+ 
 /** @file src/film_editor.h
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
  */
@@ -66,6 +66,7 @@ private:
 	void content_item_selected (wxListEvent &);
 	void content_add_clicked (wxCommandEvent &);
 	void content_remove_clicked (wxCommandEvent &);
+	void content_edit_clicked (wxCommandEvent &);
 	void content_earlier_clicked (wxCommandEvent &);
 	void content_later_clicked (wxCommandEvent &);
 	void imagemagick_video_length_changed (wxCommandEvent &);
@@ -131,10 +132,10 @@ private:
 	wxListCtrl* _content;
 	wxButton* _content_add;
 	wxButton* _content_remove;
+	wxButton* _content_edit;
 	wxButton* _content_earlier;
 	wxButton* _content_later;
 	wxTextCtrl* _content_information;
-	wxSpinCtrl* _imagemagick_video_length;
 	wxButton* _edit_dci_button;
 	wxChoice* _format;
 	wxStaticText* _format_description;
diff --git a/src/wx/imagemagick_content_dialog.cc b/src/wx/imagemagick_content_dialog.cc
new file mode 100644
index 000000000..726e4b8e2
--- /dev/null
+++ b/src/wx/imagemagick_content_dialog.cc
@@ -0,0 +1,62 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/spinctrl.h>
+#include "lib/imagemagick_content.h"
+#include "imagemagick_content_dialog.h"
+#include "wx_util.h"
+
+using boost::shared_ptr;
+
+ImageMagickContentDialog::ImageMagickContentDialog (wxWindow* parent, shared_ptr<ImageMagickContent> content)
+	: wxDialog (parent, wxID_ANY, _("Image"))
+{
+	wxFlexGridSizer* grid = new wxFlexGridSizer (3, 6, 6);
+	grid->AddGrowableCol (1, 1);
+
+	{
+		add_label_to_sizer (grid, this, (_("Duration")));
+		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_video_length = new wxSpinCtrl (this);
+		s->Add (_video_length);
+		/// TRANSLATORS: this is an abbreviation for seconds, the unit of time
+		add_label_to_sizer (s, this, _("s"));
+		grid->Add (s);
+	}
+
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	overall_sizer->Add (grid, 1, wxEXPAND | wxALL, 6);
+
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	SetSizer (overall_sizer);
+	overall_sizer->Layout ();
+	overall_sizer->SetSizeHints (this);
+
+	checked_set (_video_length, content->video_length () / 24);
+}
+
+int
+ImageMagickContentDialog::video_length () const
+{
+	return _video_length->GetValue ();
+}
diff --git a/src/wx/imagemagick_content_dialog.h b/src/wx/imagemagick_content_dialog.h
new file mode 100644
index 000000000..2fa955929
--- /dev/null
+++ b/src/wx/imagemagick_content_dialog.h
@@ -0,0 +1,34 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/wx.h>
+
+class wxSpinCtrl;
+class ImageMagickContent;
+
+class ImageMagickContentDialog : public wxDialog
+{
+public:
+	ImageMagickContentDialog (wxWindow *, boost::shared_ptr<ImageMagickContent>);
+
+	int video_length () const;
+
+private:
+	wxSpinCtrl* _video_length;
+};
diff --git a/src/wx/sndfile_content_dialog.cc b/src/wx/sndfile_content_dialog.cc
new file mode 100644
index 000000000..f305b158c
--- /dev/null
+++ b/src/wx/sndfile_content_dialog.cc
@@ -0,0 +1,67 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "lib/util.h"
+#include "lib/sndfile_content.h"
+#include "sndfile_content_dialog.h"
+#include "wx_util.h"
+
+using boost::shared_ptr;
+
+SndfileContentDialog::SndfileContentDialog (wxWindow* parent, shared_ptr<SndfileContent> content)
+	: wxDialog (parent, wxID_ANY, _("Sound file"))
+{
+	wxFlexGridSizer* grid = new wxFlexGridSizer (7, 6, 0);
+
+	add_label_to_sizer (grid, this, wxT (""));
+	add_label_to_sizer (grid, this, _("L"));
+	add_label_to_sizer (grid, this, _("R"));
+	add_label_to_sizer (grid, this, _("C"));
+	add_label_to_sizer (grid, this, _("Lfe"));
+	add_label_to_sizer (grid, this, _("Ls"));
+	add_label_to_sizer (grid, this, _("Rs"));
+
+	_buttons.resize (content->audio_channels ());
+	for (int i = 0; i < content->audio_channels(); ++i) {
+
+		if (content->audio_channels() == 1) {
+			add_label_to_sizer (grid, this, _("Source"));
+		} else {
+			add_label_to_sizer (grid, this, wxString::Format (_("Source %d"), i + 1));
+		}
+		
+		for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) {
+			wxRadioButton* b = new wxRadioButton (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, j ? 0 : wxRB_GROUP);
+			_buttons[i].push_back (b);
+			grid->Add (b, wxSHRINK);
+		}
+	}
+
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	overall_sizer->Add (grid, 1, wxEXPAND | wxALL, 6);
+
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	SetSizer (overall_sizer);
+	overall_sizer->Layout ();
+	overall_sizer->SetSizeHints (this);
+}
diff --git a/src/wx/sndfile_content_dialog.h b/src/wx/sndfile_content_dialog.h
new file mode 100644
index 000000000..5a328892a
--- /dev/null
+++ b/src/wx/sndfile_content_dialog.h
@@ -0,0 +1,36 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <vector>
+#include <boost/shared_ptr.hpp>
+#include <wx/wx.h>
+#include "lib/audio_mapping.h"
+
+class SndfileContent;
+
+class SndfileContentDialog : public wxDialog
+{
+public:
+	SndfileContentDialog (wxWindow *, boost::shared_ptr<SndfileContent>);
+
+	ConfiguredAudioMapping audio_mapping () const;
+
+private:
+	std::vector<std::vector<wxRadioButton *> > _buttons;
+};
diff --git a/src/wx/wscript b/src/wx/wscript
index 42bb8ca88..bd21af6ce 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -14,11 +14,13 @@ sources = """
           filter_dialog.cc
           filter_view.cc
           gain_calculator_dialog.cc
+          imagemagick_content_dialog.cc
           job_manager_view.cc
           job_wrapper.cc
           new_film_dialog.cc
           properties_dialog.cc
           server_dialog.cc
+          sndfile_content_dialog.cc
           wx_util.cc
           wx_ui_signaller.cc
           """
-- 
cgit v1.2.3


From c921cfe23b593d7c367ad76094308c5f08037374 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 6 Apr 2013 23:57:46 +0100
Subject: Various work on audio channel mapping.

---
 src/lib/analyse_audio_job.cc     |   4 +-
 src/lib/audio_mapping.cc         | 100 ++++++++++++-------------
 src/lib/audio_mapping.h          |  52 +++++++------
 src/lib/encoder.cc               |   3 +
 src/lib/ffmpeg_content.cc        |   3 +-
 src/lib/film.cc                  |  16 +++-
 src/lib/film.h                   |  12 ++-
 src/lib/imagemagick_content.cc   |   2 +-
 src/lib/playlist.cc              |  45 +++++++++++
 src/lib/playlist.h               |   3 +
 src/lib/sndfile_content.cc       |   7 +-
 src/lib/writer.cc                |   6 +-
 src/wx/audio_dialog.cc           |  36 +--------
 src/wx/audio_dialog.h            |   1 -
 src/wx/audio_mapping_view.cc     | 156 +++++++++++++++++++++++++++++++++++++++
 src/wx/audio_mapping_view.h      |  35 +++++++++
 src/wx/film_editor.cc            |  55 +++++++++-----
 src/wx/film_editor.h             |   6 +-
 src/wx/sndfile_content_dialog.cc |  67 -----------------
 src/wx/sndfile_content_dialog.h  |  36 ---------
 src/wx/wscript                   |   2 +-
 21 files changed, 401 insertions(+), 246 deletions(-)
 create mode 100644 src/wx/audio_mapping_view.cc
 create mode 100644 src/wx/audio_mapping_view.h
 delete mode 100644 src/wx/sndfile_content_dialog.cc
 delete mode 100644 src/wx/sndfile_content_dialog.h

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 5ef6515dd..50096d7c1 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -57,8 +57,8 @@ AnalyseAudioJob::run ()
 
 	_samples_per_point = max (int64_t (1), _film->audio_length() / _num_points);
 
-	_current.resize (_film->audio_channels ());
-	_analysis.reset (new AudioAnalysis (_film->audio_channels()));
+	_current.resize (MAX_AUDIO_CHANNELS);
+	_analysis.reset (new AudioAnalysis (MAX_AUDIO_CHANNELS));
 			 
 	while (!player->pass()) {
 		set_progress (float (_done) / _film->audio_length ());
diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index 3fc423e10..48cc23307 100644
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -19,85 +19,77 @@
 
 #include "audio_mapping.h"
 
-using std::map;
-using boost::optional;
-
-AutomaticAudioMapping::AutomaticAudioMapping (int c)
-	: _source_channels (c)
+using std::list;
+using std::cout;
+using std::make_pair;
+using std::pair;
+using boost::shared_ptr;
+
+void
+AudioMapping::add (Channel c, libdcp::Channel d)
 {
-
+	_content_to_dcp.push_back (make_pair (c, d));
 }
 
-optional<libdcp::Channel>
-AutomaticAudioMapping::source_to_dcp (int c) const
+/* XXX: this is grotty */
+int
+AudioMapping::dcp_channels () const
 {
-	if (c >= _source_channels) {
-		return optional<libdcp::Channel> ();
+	for (list<pair<Channel, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
+		if (((int) i->second) > 2) {
+			return 6;
+		}
 	}
 
-	if (_source_channels == 1) {
-		/* mono sources to centre */
-		return libdcp::CENTRE;
-	}
-	
-	return static_cast<libdcp::Channel> (c);
+	return 2;
 }
 
-optional<int>
-AutomaticAudioMapping::dcp_to_source (libdcp::Channel c) const
+list<AudioMapping::Channel>
+AudioMapping::dcp_to_content (libdcp::Channel d) const
 {
-	if (_source_channels == 1) {
-		if (c == libdcp::CENTRE) {
-			return 0;
-		} else {
-			return optional<int> ();
+	list<AudioMapping::Channel> c;
+	for (list<pair<Channel, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
+		if (i->second == d) {
+			c.push_back (i->first);
 		}
 	}
 
-	if (static_cast<int> (c) >= _source_channels) {
-		return optional<int> ();
-	}
-	
-	return static_cast<int> (c);
+	return c;
 }
 
-int
-AutomaticAudioMapping::dcp_channels () const
+list<AudioMapping::Channel>
+AudioMapping::content_channels () const
 {
-	if (_source_channels == 1) {
-		/* The source is mono, so to put the mono channel into
-		   the centre we need to generate a 5.1 soundtrack.
-		*/
-		return 6;
+	list<AudioMapping::Channel> c;
+	for (list<pair<Channel, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
+		if (find (c.begin(), c.end(), i->first) == c.end ()) {
+			c.push_back (i->first);
+		}
 	}
 
-	return _source_channels;
+	return c;
 }
 
-optional<int>
-ConfiguredAudioMapping::dcp_to_source (libdcp::Channel c) const
+list<libdcp::Channel>
+AudioMapping::content_to_dcp (Channel c) const
 {
-	map<int, libdcp::Channel>::const_iterator i = _source_to_dcp.begin ();
-	while (i != _source_to_dcp.end() && i->second != c) {
-		++i;
-	}
-
-	if (i == _source_to_dcp.end ()) {
-		return boost::none;
+	list<libdcp::Channel> d;
+	for (list<pair<Channel, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
+		if (i->first == c) {
+			d.push_back (i->second);
+		}
 	}
 
-	return i->first;
+	return d;
 }
 
-optional<libdcp::Channel>
-ConfiguredAudioMapping::source_to_dcp (int c) const
+bool
+operator== (AudioMapping::Channel const & a, AudioMapping::Channel const & b)
 {
-	map<int, libdcp::Channel>::const_iterator i = _source_to_dcp.find (c);
-	if (i == _source_to_dcp.end ()) {
-		return boost::none;
-	}
-
-	return i->second;
+	shared_ptr<const AudioContent> sa = a.content.lock ();
+	shared_ptr<const AudioContent> sb = b.content.lock ();
+	return sa == sb && a.index == b.index;
 }
 
 	
+	
diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 8804bde06..10ac20b48 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -17,37 +17,43 @@
 
 */
 
-#include <vector>
-#include <map>
-#include <boost/optional.hpp>
+#ifndef DVDOMATIC_AUDIO_MAPPING_H
+#define DVDOMATIC_AUDIO_MAPPING_H
+
+#include <list>
+#include <string>
 #include <libdcp/types.h>
+#include <boost/shared_ptr.hpp>
+#include "audio_content.h"
 
 class AudioMapping
 {
 public:
-	virtual boost::optional<libdcp::Channel> source_to_dcp (int c) const = 0;
-	virtual boost::optional<int> dcp_to_source (libdcp::Channel c) const = 0;
-};
-
-class AutomaticAudioMapping : public AudioMapping
-{
-public:
-	AutomaticAudioMapping (int);
+	struct Channel {
+		Channel (boost::weak_ptr<const AudioContent> c, int i)
+			: content (c)
+			, index (i)
+		{}
+		
+		boost::weak_ptr<const AudioContent> content;
+		int index;
+	};
+
+	void add (Channel, libdcp::Channel);
 
-	boost::optional<libdcp::Channel> source_to_dcp (int c) const;
-	boost::optional<int> dcp_to_source (libdcp::Channel c) const;
 	int dcp_channels () const;
-	
-private:
-	int _source_channels;
-};
+	std::list<Channel> dcp_to_content (libdcp::Channel) const;
+	std::list<std::pair<Channel, libdcp::Channel> > content_to_dcp () const {
+		return _content_to_dcp;
+	}
 
-class ConfiguredAudioMapping : public AudioMapping
-{
-public:
-	boost::optional<libdcp::Channel> source_to_dcp (int c) const;
-	boost::optional<int> dcp_to_source (libdcp::Channel c) const;
+	std::list<Channel> content_channels () const;
+	std::list<libdcp::Channel> content_to_dcp (Channel) const;
 
 private:
-	std::map<int, libdcp::Channel> _source_to_dcp;
+	std::list<std::pair<Channel, libdcp::Channel> > _content_to_dcp;
 };
+
+extern bool operator== (AudioMapping::Channel const &, AudioMapping::Channel const &);
+
+#endif
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index a0b88e33e..0542587a0 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -427,6 +427,8 @@ Encoder::encoder_thread (ServerDescription* server)
 void
 Encoder::write_audio (shared_ptr<const AudioBuffers> data)
 {
+#if 0
+	XXX
 	AutomaticAudioMapping m (_film->audio_channels ());
 	if (m.dcp_channels() != _film->audio_channels()) {
 
@@ -444,6 +446,7 @@ Encoder::write_audio (shared_ptr<const AudioBuffers> data)
 
 		data = b;
 	}
+#endif	
 
 	_writer->write (data);
 }
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index cc95105e5..d36abe2c3 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -152,12 +152,13 @@ FFmpegContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
         signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
         signal_changed (FFmpegContentProperty::AUDIO_STREAMS);
         signal_changed (FFmpegContentProperty::AUDIO_STREAM);
+        signal_changed (AudioContentProperty::AUDIO_CHANNELS);
 }
 
 string
 FFmpegContent::summary () const
 {
-	return String::compose (_("Movie: %1"), file().filename ());
+	return String::compose (_("Movie: %1"), file().filename().string());
 }
 
 string
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 69d2a28e2..b1f740ec2 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -960,6 +960,7 @@ Film::signal_changed (Property p)
 	case Film::CONTENT:
 		_playlist->setup (content ());
 		set_dcp_frame_rate (best_dcp_frame_rate (video_frame_rate ()));
+		set_audio_mapping (_playlist->default_audio_mapping ());
 		break;
 	default:
 		break;
@@ -1235,12 +1236,25 @@ Film::set_ffmpeg_audio_stream (FFmpegAudioStream s)
 	}
 }
 
+void
+Film::set_audio_mapping (AudioMapping m)
+{
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_audio_mapping = m;
+	}
+
+	signal_changed (AUDIO_MAPPING);
+}
+
 void
 Film::content_changed (boost::weak_ptr<Content> c, int p)
 {
 	if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
 		set_dcp_frame_rate (best_dcp_frame_rate (video_frame_rate ()));
-	}
+	} else if (p == AudioContentProperty::AUDIO_CHANNELS) {
+		set_audio_mapping (_playlist->default_audio_mapping ());
+	}		
 
 	if (ui_signaller) {
 		ui_signaller->emit (boost::bind (boost::ref (ContentChanged), c, p));
diff --git a/src/lib/film.h b/src/lib/film.h
index 9c5f561e6..532d32bdc 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -36,6 +36,7 @@
 #include "dci_metadata.h"
 #include "types.h"
 #include "ffmpeg_content.h"
+#include "audio_mapping.h"
 
 class DCPContentType;
 class Format;
@@ -146,7 +147,8 @@ public:
 		COLOUR_LUT,
 		J2K_BANDWIDTH,
 		DCI_METADATA,
-		DCP_FRAME_RATE
+		DCP_FRAME_RATE,
+		AUDIO_MAPPING
 	};
 
 
@@ -262,6 +264,11 @@ public:
 		return _dcp_frame_rate;
 	}
 
+	AudioMapping audio_mapping () const {
+		boost::mutex::scoped_lock lm (_state_mutex);
+		return _audio_mapping;
+	}
+
 	/* SET */
 
 	void set_directory (std::string);
@@ -294,6 +301,7 @@ public:
 	void set_dci_metadata (DCIMetadata);
 	void set_dcp_frame_rate (int);
 	void set_dci_date_today ();
+	void set_audio_mapping (AudioMapping);
 
 	/** Emitted when some property has of the Film has changed */
 	mutable boost::signals2::signal<void (Property)> Changed;
@@ -314,6 +322,7 @@ private:
 	void read_metadata ();
 	void content_changed (boost::weak_ptr<Content>, int);
 	boost::shared_ptr<FFmpegContent> ffmpeg () const;
+	void setup_default_audio_mapping ();
 
 	/** Log to write to */
 	boost::shared_ptr<Log> _log;
@@ -378,6 +387,7 @@ private:
 	int _dcp_frame_rate;
 	/** The date that we should use in a DCI name */
 	boost::gregorian::date _dci_date;
+	AudioMapping _audio_mapping;
 
 	/** true if our state has changed since we last saved it */
 	mutable bool _dirty;
diff --git a/src/lib/imagemagick_content.cc b/src/lib/imagemagick_content.cc
index 912c180a8..59fde40bb 100644
--- a/src/lib/imagemagick_content.cc
+++ b/src/lib/imagemagick_content.cc
@@ -45,7 +45,7 @@ ImageMagickContent::ImageMagickContent (shared_ptr<const cxml::Node> node)
 string
 ImageMagickContent::summary () const
 {
-	return String::compose (_("Image: %1"), file().filename ());
+	return String::compose (_("Image: %1"), file().filename().string());
 }
 
 bool
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index e0220ef6f..3f7905fa9 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -30,6 +30,7 @@
 using std::list;
 using std::cout;
 using std::vector;
+using std::min;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
@@ -224,3 +225,47 @@ Playlist::content_changed (weak_ptr<Content> c, int p)
 {
 	ContentChanged (c, p);
 }
+
+AudioMapping
+Playlist::default_audio_mapping () const
+{
+	AudioMapping m;
+
+	switch (_audio_from) {
+	case AUDIO_NONE:
+		break;
+	case AUDIO_FFMPEG:
+		if (_ffmpeg->audio_channels() == 1) {
+			/* Map mono sources to centre */
+			m.add (AudioMapping::Channel (_ffmpeg, 0), libdcp::CENTRE);
+		} else {
+			int const N = min (_ffmpeg->audio_channels (), MAX_AUDIO_CHANNELS);
+			/* Otherwise just start with a 1:1 mapping */
+			for (int i = 0; i < N; ++i) {
+				m.add (AudioMapping::Channel (_ffmpeg, i), (libdcp::Channel) i);
+			}
+		}
+		break;
+
+	case AUDIO_SNDFILE:
+	{
+		int n = 0;
+		for (list<shared_ptr<const SndfileContent> >::const_iterator i = _sndfile.begin(); i != _sndfile.end(); ++i) {
+			cout << "sndfile " << (*i)->audio_channels() << "\n";
+			for (int j = 0; j < (*i)->audio_channels(); ++j) {
+				m.add (AudioMapping::Channel (*i, j), (libdcp::Channel) n);
+				++n;
+				if (n >= MAX_AUDIO_CHANNELS) {
+					break;
+				}
+			}
+			if (n >= MAX_AUDIO_CHANNELS) {
+				break;
+			}
+		}
+		break;
+	}
+	}
+
+	return m;
+}
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 1a24a0227..1d189cb07 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -25,6 +25,7 @@
 #include "video_sink.h"
 #include "audio_sink.h"
 #include "ffmpeg_content.h"
+#include "audio_mapping.h"
 
 class Content;
 class FFmpegContent;
@@ -53,6 +54,8 @@ public:
 	libdcp::Size video_size () const;
 	ContentVideoFrame video_length () const;
 
+	AudioMapping default_audio_mapping () const;
+
 	enum VideoFrom {
 		VIDEO_NONE,
 		VIDEO_FFMPEG,
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index ee4f21eef..539b0dfb5 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -27,12 +27,16 @@
 
 using std::string;
 using std::stringstream;
+using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
 SndfileContent::SndfileContent (boost::filesystem::path f)
 	: Content (f)
 	, AudioContent (f)
+	, _audio_channels (0)
+	, _audio_length (0)
+	, _audio_frame_rate (0)
 {
 
 }
@@ -49,7 +53,7 @@ SndfileContent::SndfileContent (shared_ptr<const cxml::Node> node)
 string
 SndfileContent::summary () const
 {
-	return String::compose (_("Sound file: %1"), file().filename ());
+	return String::compose (_("Sound file: %1"), file().filename().string());
 }
 
 string
@@ -115,3 +119,4 @@ SndfileContent::as_xml (xmlpp::Node* node) const
 	node->add_child("AudioLength")->add_child_text (lexical_cast<string> (_audio_length));
 	node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (_audio_frame_rate));
 }
+
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 6df1a1f21..7258826ba 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -78,15 +78,13 @@ Writer::Writer (shared_ptr<Film> f)
 
 	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
-	AutomaticAudioMapping m (_film->audio_channels ());
-	
-	if (m.dcp_channels() > 0) {
+	if (_film->audio_channels() > 0) {
 		_sound_asset.reset (
 			new libdcp::SoundAsset (
 				_film->dir (_film->dcp_name()),
 				N_("audio.mxf"),
 				_film->dcp_frame_rate (),
-				m.dcp_channels (),
+				_film->audio_mapping().dcp_channels (),
 				dcp_audio_sample_rate (_film->audio_frame_rate())
 				)
 			);
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index f53ea7c19..4c50260fa 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -20,7 +20,6 @@
 #include <boost/filesystem.hpp>
 #include "lib/audio_analysis.h"
 #include "lib/film.h"
-#include "lib/audio_mapping.h"
 #include "audio_dialog.h"
 #include "audio_plot.h"
 #include "wx_util.h"
@@ -93,7 +92,6 @@ AudioDialog::set_film (shared_ptr<Film> f)
 	_film = f;
 
 	try_to_load_analysis ();
-	setup_channels ();
 	_plot->set_gain (_film->audio_gain ());
 
 	_film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
@@ -102,23 +100,6 @@ AudioDialog::set_film (shared_ptr<Film> f)
 	SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data()));
 }
 
-void
-AudioDialog::setup_channels ()
-{
-	if (!_film->has_audio()) {
-		return;
-	}
-
-	AutomaticAudioMapping m (_film->audio_channels ());
-	
-	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-		if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
-			_channel_checkbox[i]->Show ();
-		} else {
-			_channel_checkbox[i]->Hide ();
-		}
-	}
-}	
 
 void
 AudioDialog::try_to_load_analysis ()
@@ -135,12 +116,8 @@ AudioDialog::try_to_load_analysis ()
 		
 	_plot->set_analysis (a);
 
-	AutomaticAudioMapping m (_film->audio_channels ());
-	optional<libdcp::Channel> c = m.source_to_dcp (0);
-	if (c) {
-		_channel_checkbox[c.get()]->SetValue (true);
-		_plot->set_channel_visible (0, true);
-	}
+	_channel_checkbox[0]->SetValue (true);
+	_plot->set_channel_visible (0, true);
 
 	for (int i = 0; i < AudioPoint::COUNT; ++i) {
 		_type_checkbox[i]->SetValue (true);
@@ -158,11 +135,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 
 	assert (c < MAX_AUDIO_CHANNELS);
 
-	AutomaticAudioMapping m (_film->audio_channels ());
-	optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (c));
-	if (s) {
-		_plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ());
-	}
+	_plot->set_channel_visible (c, _channel_checkbox[c]->GetValue ());
 }
 
 void
@@ -172,9 +145,6 @@ AudioDialog::film_changed (Film::Property p)
 	case Film::AUDIO_GAIN:
 		_plot->set_gain (_film->audio_gain ());
 		break;
-	case Film::CONTENT:
-		setup_channels ();
-		break;
 	default:
 		break;
 	}
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 514faeea0..db1d74f30 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -39,7 +39,6 @@ private:
 	void type_clicked (wxCommandEvent &);
 	void smoothing_changed (wxScrollEvent &);
 	void try_to_load_analysis ();
-	void setup_channels ();
 
 	boost::shared_ptr<Film> _film;
 	AudioPlot* _plot;
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
new file mode 100644
index 000000000..d62609d22
--- /dev/null
+++ b/src/wx/audio_mapping_view.cc
@@ -0,0 +1,156 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/wx.h>
+#include <wx/renderer.h>
+#include <wx/grid.h>
+#include <libdcp/types.h>
+#include "lib/audio_mapping.h"
+#include "audio_mapping_view.h"
+#include "wx_util.h"
+
+using std::cout;
+using std::list;
+using boost::shared_ptr;
+
+/* This could go away with wxWidgets 2.9, which has an API call
+   to find these values.
+*/
+
+#ifdef __WXMSW__
+#define CHECKBOX_WIDTH 16
+#define CHECKBOX_HEIGHT 16
+#endif
+
+#ifdef __WXGTK__
+#define CHECKBOX_WIDTH 20
+#define CHECKBOX_HEIGHT 20
+#endif
+
+
+class NoSelectionStringRenderer : public wxGridCellStringRenderer
+{
+public:
+	void Draw (wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, const wxRect& rect, int row, int col, bool)
+	{
+		wxGridCellStringRenderer::Draw (grid, attr, dc, rect, row, col, false);
+	}
+};
+
+class CheckBoxRenderer : public wxGridCellRenderer
+{
+public:
+
+	void Draw (wxGrid& grid, wxGridCellAttr &, wxDC& dc, const wxRect& rect, int row, int col, bool)
+	{
+		wxRendererNative::Get().DrawCheckBox (
+			&grid,
+			dc, rect,
+			grid.GetCellValue (row, col) == "1" ? static_cast<int>(wxCONTROL_CHECKED) : 0
+			);
+	}
+
+	wxSize GetBestSize (wxGrid &, wxGridCellAttr &, wxDC &, int, int)
+	{
+		return wxSize (CHECKBOX_WIDTH + 4, CHECKBOX_HEIGHT + 4);
+	}
+	
+	wxGridCellRenderer* Clone () const
+	{
+		return new CheckBoxRenderer;
+	}
+};
+
+
+AudioMappingView::AudioMappingView (wxWindow* parent)
+	: wxPanel (parent, wxID_ANY)
+{
+	_grid = new wxGrid (this, wxID_ANY);
+
+	_grid->CreateGrid (0, 7);
+	_grid->HideRowLabels ();
+	_grid->DisableDragRowSize ();
+	_grid->DisableDragColSize ();
+	_grid->EnableEditing (false);
+	_grid->SetCellHighlightPenWidth (0);
+	_grid->SetDefaultRenderer (new NoSelectionStringRenderer);
+
+	_grid->SetColLabelValue (0, _("Content channel"));
+	_grid->SetColLabelValue (1, _("L"));
+	_grid->SetColLabelValue (2, _("R"));
+	_grid->SetColLabelValue (3, _("C"));
+	_grid->SetColLabelValue (4, _("Lfe"));
+	_grid->SetColLabelValue (5, _("Ls"));
+	_grid->SetColLabelValue (6, _("Rs"));
+
+	_grid->AutoSize ();
+
+	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+	s->Add (_grid, 1, wxEXPAND);
+	SetSizerAndFit (s);
+
+	Connect (wxID_ANY, wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler (AudioMappingView::left_click), 0, this);
+}
+
+void
+AudioMappingView::left_click (wxGridEvent& ev)
+{
+	if (ev.GetCol() == 0) {
+		return;
+	}
+	
+	if (_grid->GetCellValue (ev.GetRow(), ev.GetCol()) == "1") {
+		_grid->SetCellValue (ev.GetRow(), ev.GetCol(), "0");
+	} else {
+		_grid->SetCellValue (ev.GetRow(), ev.GetCol(), "1");
+	}
+}
+
+void
+AudioMappingView::set_mapping (AudioMapping map)
+{
+	if (_grid->GetNumberRows ()) {
+		_grid->DeleteRows (0, _grid->GetNumberRows ());
+	}
+
+	list<AudioMapping::Channel> content_channels = map.content_channels ();
+	_grid->InsertRows (0, content_channels.size ());
+
+	for (size_t r = 0; r < content_channels.size(); ++r) {
+		for (int c = 1; c < 7; ++c) {
+			_grid->SetCellRenderer (r, c, new CheckBoxRenderer);
+		}
+	}
+	
+	int n = 0;
+	for (list<AudioMapping::Channel>::iterator i = content_channels.begin(); i != content_channels.end(); ++i) {
+		shared_ptr<const AudioContent> ac = i->content.lock ();
+		assert (ac);
+		_grid->SetCellValue (n, 0, wxString::Format ("%s %d", std_to_wx (ac->file().filename().string()), i->index + 1));
+
+		list<libdcp::Channel> const d = map.content_to_dcp (*i);
+		for (list<libdcp::Channel>::const_iterator j = d.begin(); j != d.end(); ++j) {
+			_grid->SetCellValue (n, static_cast<int> (*j) + 1, "1");
+		}
+		++n;
+	}
+
+	_grid->AutoSize ();
+}
+
diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
new file mode 100644
index 000000000..36429412f
--- /dev/null
+++ b/src/wx/audio_mapping_view.h
@@ -0,0 +1,35 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/signals2.hpp>
+#include <wx/wx.h>
+#include <wx/grid.h>
+
+class AudioMappingView : public wxPanel
+{
+public:
+	AudioMappingView (wxWindow *);
+
+	void set_mapping (AudioMapping);
+
+private:
+	void left_click (wxGridEvent &);
+
+	wxGrid* _grid;
+};
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 6c42359fb..6f08b6567 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -50,7 +50,7 @@
 #include "scaler.h"
 #include "audio_dialog.h"
 #include "imagemagick_content_dialog.h"
-#include "sndfile_content_dialog.h"
+#include "audio_mapping_view.h"
 
 using std::string;
 using std::cout;
@@ -197,7 +197,9 @@ FilmEditor::connect_to_widgets ()
 	_edit_dci_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
 	_format->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::format_changed), 0, this);
 	_trust_content_headers->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::trust_content_headers_changed), 0, this);
-	_content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler (FilmEditor::content_item_selected), 0, this);
+	_content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler (FilmEditor::content_selection_changed), 0, this);
+	_content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler (FilmEditor::content_selection_changed), 0, this);
+	_content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler (FilmEditor::content_activated), 0, this);
 	_content_add->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this);
 	_content_remove->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_remove_clicked), 0, this);
 	_content_edit->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_edit_clicked), 0, this);
@@ -406,6 +408,9 @@ FilmEditor::make_audio_panel ()
                 grid->Add (s, 1, wxEXPAND);
         }
 
+	_audio_mapping = new AudioMappingView (_audio_panel);
+	_audio_sizer->Add (_audio_mapping, 1, wxEXPAND | wxALL, 6);
+	
 	_audio_gain->SetRange (-60, 60);
 	_audio_delay->SetRange (-1000, 1000);
 }
@@ -691,6 +696,10 @@ FilmEditor::film_changed (Film::Property p)
 			_frame_rate_description->SetLabel (wxT (""));
 			_best_dcp_frame_rate->Disable ();
 		}
+		break;
+	case Film::AUDIO_MAPPING:
+		_audio_mapping->set_mapping (_film->audio_mapping ());
+		break;
 	}
 }
 
@@ -849,6 +858,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::J2K_BANDWIDTH);
 	film_changed (Film::DCI_METADATA);
 	film_changed (Film::DCP_FRAME_RATE);
+	film_changed (Film::AUDIO_MAPPING);
 
 	film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::SUBTITLE_STREAMS);
 	film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::SUBTITLE_STREAM);
@@ -1242,6 +1252,15 @@ FilmEditor::content_remove_clicked (wxCommandEvent &)
 	}
 }
 
+void
+FilmEditor::content_activated (wxListEvent& ev)
+{
+	ContentList c = _film->content ();
+	assert (ev.GetIndex() >= 0 && size_t (ev.GetIndex()) < c.size ());
+
+	edit_content (c[ev.GetIndex()]);
+}
+
 void
 FilmEditor::content_edit_clicked (wxCommandEvent &)
 {
@@ -1250,22 +1269,19 @@ FilmEditor::content_edit_clicked (wxCommandEvent &)
 		return;
 	}
 
+	edit_content (c);
+}
+
+void
+FilmEditor::edit_content (shared_ptr<Content> c)
+{
 	shared_ptr<ImageMagickContent> im = dynamic_pointer_cast<ImageMagickContent> (c);
 	if (im) {
 		ImageMagickContentDialog* d = new ImageMagickContentDialog (this, im);
-		int const r = d->ShowModal ();
-		d->Destroy ();
-
-		if (r == wxID_OK) {
-			im->set_video_length (d->video_length() * 24);
-		}
-	}
-
-	shared_ptr<SndfileContent> sf = dynamic_pointer_cast<SndfileContent> (c);
-	if (sf) {
-		SndfileContentDialog* d = new SndfileContentDialog (this, sf);
 		d->ShowModal ();
 		d->Destroy ();
+
+		im->set_video_length (d->video_length() * 24);
 	}
 }
 
@@ -1288,7 +1304,7 @@ FilmEditor::content_later_clicked (wxCommandEvent &)
 }
 
 void
-FilmEditor::content_item_selected (wxListEvent &)
+FilmEditor::content_selection_changed (wxListEvent &)
 {
         setup_content_button_sensitivity ();
 	setup_content_information ();
@@ -1311,11 +1327,12 @@ FilmEditor::setup_content_button_sensitivity ()
 {
         _content_add->Enable (_generally_sensitive);
 
-	bool const have_selection = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) != -1;
-        _content_edit->Enable (have_selection && _generally_sensitive);
-        _content_remove->Enable (have_selection && _generally_sensitive);
-        _content_earlier->Enable (have_selection && _generally_sensitive);
-        _content_later->Enable (have_selection && _generally_sensitive);
+	shared_ptr<Content> selection = selected_content ();
+
+        _content_edit->Enable (selection && _generally_sensitive && dynamic_pointer_cast<ImageMagickContent> (selection));
+        _content_remove->Enable (selection && _generally_sensitive);
+        _content_earlier->Enable (selection && _generally_sensitive);
+        _content_later->Enable (selection && _generally_sensitive);
 }
 
 shared_ptr<Content>
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index b6f6a24ee..bc6b045c4 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -33,6 +33,7 @@ class wxListCtrl;
 class wxListEvent;
 class Film;
 class AudioDialog;
+class AudioMappingView;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -63,7 +64,8 @@ private:
 	void top_crop_changed (wxCommandEvent &);
 	void bottom_crop_changed (wxCommandEvent &);
 	void trust_content_headers_changed (wxCommandEvent &);
-	void content_item_selected (wxListEvent &);
+	void content_selection_changed (wxListEvent &);
+	void content_activated (wxListEvent &);
 	void content_add_clicked (wxCommandEvent &);
 	void content_remove_clicked (wxCommandEvent &);
 	void content_edit_clicked (wxCommandEvent &);
@@ -110,6 +112,7 @@ private:
 	
 	void active_jobs_changed (bool);
 	boost::shared_ptr<Content> selected_content ();
+	void edit_content (boost::shared_ptr<Content>);
 
 	wxNotebook* _notebook;
 	wxPanel* _film_panel;
@@ -152,6 +155,7 @@ private:
 	wxButton* _show_audio;
 	wxSpinCtrl* _audio_delay;
 	wxChoice* _ffmpeg_audio_stream;
+	AudioMappingView* _audio_mapping;
 	wxCheckBox* _with_subtitles;
 	wxChoice* _ffmpeg_subtitle_stream;
 	wxSpinCtrl* _subtitle_offset;
diff --git a/src/wx/sndfile_content_dialog.cc b/src/wx/sndfile_content_dialog.cc
deleted file mode 100644
index f305b158c..000000000
--- a/src/wx/sndfile_content_dialog.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "lib/util.h"
-#include "lib/sndfile_content.h"
-#include "sndfile_content_dialog.h"
-#include "wx_util.h"
-
-using boost::shared_ptr;
-
-SndfileContentDialog::SndfileContentDialog (wxWindow* parent, shared_ptr<SndfileContent> content)
-	: wxDialog (parent, wxID_ANY, _("Sound file"))
-{
-	wxFlexGridSizer* grid = new wxFlexGridSizer (7, 6, 0);
-
-	add_label_to_sizer (grid, this, wxT (""));
-	add_label_to_sizer (grid, this, _("L"));
-	add_label_to_sizer (grid, this, _("R"));
-	add_label_to_sizer (grid, this, _("C"));
-	add_label_to_sizer (grid, this, _("Lfe"));
-	add_label_to_sizer (grid, this, _("Ls"));
-	add_label_to_sizer (grid, this, _("Rs"));
-
-	_buttons.resize (content->audio_channels ());
-	for (int i = 0; i < content->audio_channels(); ++i) {
-
-		if (content->audio_channels() == 1) {
-			add_label_to_sizer (grid, this, _("Source"));
-		} else {
-			add_label_to_sizer (grid, this, wxString::Format (_("Source %d"), i + 1));
-		}
-		
-		for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) {
-			wxRadioButton* b = new wxRadioButton (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, j ? 0 : wxRB_GROUP);
-			_buttons[i].push_back (b);
-			grid->Add (b, wxSHRINK);
-		}
-	}
-
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (grid, 1, wxEXPAND | wxALL, 6);
-
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
-}
diff --git a/src/wx/sndfile_content_dialog.h b/src/wx/sndfile_content_dialog.h
deleted file mode 100644
index 5a328892a..000000000
--- a/src/wx/sndfile_content_dialog.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <wx/wx.h>
-#include "lib/audio_mapping.h"
-
-class SndfileContent;
-
-class SndfileContentDialog : public wxDialog
-{
-public:
-	SndfileContentDialog (wxWindow *, boost::shared_ptr<SndfileContent>);
-
-	ConfiguredAudioMapping audio_mapping () const;
-
-private:
-	std::vector<std::vector<wxRadioButton *> > _buttons;
-};
diff --git a/src/wx/wscript b/src/wx/wscript
index bd21af6ce..7f9cde9ac 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -5,6 +5,7 @@ import i18n
 
 sources = """
           audio_dialog.cc
+          audio_mapping_view.cc
           audio_plot.cc
           config_dialog.cc
           dci_metadata_dialog.cc
@@ -20,7 +21,6 @@ sources = """
           new_film_dialog.cc
           properties_dialog.cc
           server_dialog.cc
-          sndfile_content_dialog.cc
           wx_util.cc
           wx_ui_signaller.cc
           """
-- 
cgit v1.2.3


From 263eee639546964aaa57f5d2d3b24008ecfe8adb Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 7 Apr 2013 12:45:46 +0100
Subject: A few fixes; try to support sndfile audio in player.

---
 src/lib/encoder.cc    | 31 ++--------------------
 src/lib/encoder.h     |  2 --
 src/lib/player.cc     | 36 +++++++++++++++++++++----
 src/lib/player.h      |  7 +++--
 src/lib/util.cc       | 73 +++++++++++++++++++++++++++++++++++++--------------
 src/lib/util.h        |  1 +
 src/wx/film_editor.cc |  5 +++-
 src/wx/film_viewer.cc | 23 +++++++---------
 8 files changed, 106 insertions(+), 72 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 0542587a0..46d11c556 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -144,7 +144,7 @@ Encoder::process_end ()
 			}
 
 			out->set_frames (frames);
-			write_audio (out);
+			_writer->write (out);
 		}
 
 		swr_free (&_swr_context);
@@ -323,7 +323,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 	}
 #endif
 
-	write_audio (data);
+	_writer->write (data);
 }
 
 void
@@ -423,30 +423,3 @@ Encoder::encoder_thread (ServerDescription* server)
 		_condition.notify_all ();
 	}
 }
-
-void
-Encoder::write_audio (shared_ptr<const AudioBuffers> data)
-{
-#if 0
-	XXX
-	AutomaticAudioMapping m (_film->audio_channels ());
-	if (m.dcp_channels() != _film->audio_channels()) {
-
-		/* Remap (currently just for mono -> 5.1) */
-
-		shared_ptr<AudioBuffers> b (new AudioBuffers (m.dcp_channels(), data->frames ()));
-		for (int i = 0; i < m.dcp_channels(); ++i) {
-			optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (i));
-			if (!s) {
-				b->make_silent (i);
-			} else {
-				memcpy (b->data()[i], data->data()[s.get()], data->frames() * sizeof(float));
-			}
-		}
-
-		data = b;
-	}
-#endif	
-
-	_writer->write (data);
-}
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index b85132b72..70e6eea9a 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -88,8 +88,6 @@ private:
 	
 	void frame_done ();
 	
-	void write_audio (boost::shared_ptr<const AudioBuffers> data);
-
 	void encoder_thread (ServerDescription *);
 	void terminate_threads ();
 
diff --git a/src/lib/player.cc b/src/lib/player.cc
index ac046fcc0..756c3b854 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -22,6 +22,7 @@
 #include "ffmpeg_decoder.h"
 #include "imagemagick_decoder.h"
 #include "sndfile_decoder.h"
+#include "sndfile_content.h"
 #include "playlist.h"
 #include "job.h"
 
@@ -95,7 +96,16 @@ Player::pass ()
 		}
 	}
 
-	/* XXX: sndfile */
+	if (_playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
+		for (list<shared_ptr<SndfileDecoder> >::iterator i = _sndfile_decoders.begin(); i != _sndfile_decoders.end(); ++i) {
+			if (!(*i)->pass ()) {
+				done = false;
+			}
+		}
+
+		Audio (_sndfile_buffers);
+		_sndfile_buffers.reset ();
+	}
 
 	return done;
 }
@@ -133,9 +143,25 @@ Player::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
 }
 
 void
-Player::process_audio (shared_ptr<AudioBuffers> b)
+Player::process_audio (weak_ptr<const AudioContent> c, shared_ptr<AudioBuffers> b)
 {
-	Audio (b);
+	if (_playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
+		AudioMapping mapping = _film->audio_mapping ();
+		if (!_sndfile_buffers) {
+			_sndfile_buffers.reset (new AudioBuffers (mapping.dcp_channels(), b->frames ()));
+			_sndfile_buffers->make_silent ();
+		}
+
+		for (int i = 0; i < b->channels(); ++i) {
+			list<libdcp::Channel> dcp = mapping.content_to_dcp (AudioMapping::Channel (c, i));
+			for (list<libdcp::Channel>::iterator j = dcp.begin(); j != dcp.end(); ++j) {
+				_sndfile_buffers->accumulate (b, i, static_cast<int> (*j));
+			}
+		}
+
+	} else {
+		Audio (b);
+	}
 }
 
 /** @return true on error */
@@ -238,7 +264,7 @@ Player::setup_decoders ()
 	}
 
 	if (_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-		_ffmpeg_decoder->connect_audio (shared_from_this ());
+		_ffmpeg_decoder->Audio.connect (bind (&Player::process_audio, this, _playlist->ffmpeg (), _1));
 	}
 
 	if (_video && _playlist->video_from() == Playlist::VIDEO_IMAGEMAGICK) {
@@ -257,7 +283,7 @@ Player::setup_decoders ()
 		for (list<shared_ptr<const SndfileContent> >::iterator i = sc.begin(); i != sc.end(); ++i) {
 			shared_ptr<SndfileDecoder> d (new SndfileDecoder (_film, *i));
 			_sndfile_decoders.push_back (d);
-			d->connect_audio (shared_from_this ());
+			d->Audio.connect (bind (&Player::process_audio, this, *i, _1));
 		}
 	}
 }
diff --git a/src/lib/player.h b/src/lib/player.h
index 79203692e..afc856316 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -34,8 +34,9 @@ class SndfileDecoder;
 class Job;
 class Film;
 class Playlist;
+class AudioContent;
 
-class Player : public VideoSource, public AudioSource, public VideoSink, public AudioSink, public boost::enable_shared_from_this<Player>
+class Player : public VideoSource, public AudioSource, public VideoSink, public boost::enable_shared_from_this<Player>
 {
 public:
 	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
@@ -54,7 +55,7 @@ public:
 
 private:
 	void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
-	void process_audio (boost::shared_ptr<AudioBuffers>);
+	void process_audio (boost::weak_ptr<const AudioContent>, boost::shared_ptr<AudioBuffers>);
 	void setup_decoders ();
 	void playlist_changed ();
 	void content_changed (boost::weak_ptr<Content>, int);
@@ -73,6 +74,8 @@ private:
 	std::list<boost::shared_ptr<ImageMagickDecoder> >::iterator _imagemagick_decoder;
 	std::list<boost::shared_ptr<SndfileDecoder> > _sndfile_decoders;
 
+	boost::shared_ptr<AudioBuffers> _sndfile_buffers;
+
 	bool _video_sync;
 };
 
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 1e60b43fc..760b826c7 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -63,8 +63,26 @@ extern "C" {
 
 #include "i18n.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::stringstream;
+using std::setfill;
+using std::ostream;
+using std::endl;
+using std::vector;
+using std::hex;
+using std::setw;
+using std::ifstream;
+using std::ios;
+using std::min;
+using std::max;
+using std::list;
+using std::multimap;
+using std::istream;
+using std::numeric_limits;
+using std::pair;
+using boost::shared_ptr;
+using boost::thread;
+using boost::lexical_cast;
 using libdcp::Size;
 
 thread::id ui_thread;
@@ -243,7 +261,7 @@ dvdomatic_setup ()
 	Filter::setup_filters ();
 	SoundProcessor::setup_sound_processors ();
 
-	ui_thread = this_thread::get_id ();
+	ui_thread = boost::this_thread::get_id ();
 }
 
 #ifdef DVDOMATIC_WINDOWS
@@ -498,16 +516,16 @@ Socket::Socket (int timeout)
 	, _socket (_io_service)
 	, _timeout (timeout)
 {
-	_deadline.expires_at (posix_time::pos_infin);
+	_deadline.expires_at (boost::posix_time::pos_infin);
 	check ();
 }
 
 void
 Socket::check ()
 {
-	if (_deadline.expires_at() <= asio::deadline_timer::traits_type::now ()) {
+	if (_deadline.expires_at() <= boost::asio::deadline_timer::traits_type::now ()) {
 		_socket.close ();
-		_deadline.expires_at (posix_time::pos_infin);
+		_deadline.expires_at (boost::posix_time::pos_infin);
 	}
 
 	_deadline.async_wait (boost::bind (&Socket::check, this));
@@ -517,14 +535,14 @@ Socket::check ()
  *  @param endpoint End-point to connect to.
  */
 void
-Socket::connect (asio::ip::basic_resolver_entry<asio::ip::tcp> const & endpoint)
+Socket::connect (boost::asio::ip::basic_resolver_entry<boost::asio::ip::tcp> const & endpoint)
 {
-	_deadline.expires_from_now (posix_time::seconds (_timeout));
-	system::error_code ec = asio::error::would_block;
-	_socket.async_connect (endpoint, lambda::var(ec) = lambda::_1);
+	_deadline.expires_from_now (boost::posix_time::seconds (_timeout));
+	boost::system::error_code ec = boost::asio::error::would_block;
+	_socket.async_connect (endpoint, boost::lambda::var(ec) = boost::lambda::_1);
 	do {
 		_io_service.run_one();
-	} while (ec == asio::error::would_block);
+	} while (ec == boost::asio::error::would_block);
 
 	if (ec || !_socket.is_open ()) {
 		throw NetworkError (_("connect timed out"));
@@ -538,14 +556,14 @@ Socket::connect (asio::ip::basic_resolver_entry<asio::ip::tcp> const & endpoint)
 void
 Socket::write (uint8_t const * data, int size)
 {
-	_deadline.expires_from_now (posix_time::seconds (_timeout));
-	system::error_code ec = asio::error::would_block;
+	_deadline.expires_from_now (boost::posix_time::seconds (_timeout));
+	boost::system::error_code ec = boost::asio::error::would_block;
 
-	asio::async_write (_socket, asio::buffer (data, size), lambda::var(ec) = lambda::_1);
+	boost::asio::async_write (_socket, boost::asio::buffer (data, size), boost::lambda::var(ec) = boost::lambda::_1);
 	
 	do {
 		_io_service.run_one ();
-	} while (ec == asio::error::would_block);
+	} while (ec == boost::asio::error::would_block);
 
 	if (ec) {
 		throw NetworkError (ec.message ());
@@ -566,14 +584,14 @@ Socket::write (uint32_t v)
 void
 Socket::read (uint8_t* data, int size)
 {
-	_deadline.expires_from_now (posix_time::seconds (_timeout));
-	system::error_code ec = asio::error::would_block;
+	_deadline.expires_from_now (boost::posix_time::seconds (_timeout));
+	boost::system::error_code ec = boost::asio::error::would_block;
 
-	asio::async_read (_socket, asio::buffer (data, size), lambda::var(ec) = lambda::_1);
+	boost::asio::async_read (_socket, boost::asio::buffer (data, size), boost::lambda::var(ec) = boost::lambda::_1);
 
 	do {
 		_io_service.run_one ();
-	} while (ec == asio::error::would_block);
+	} while (ec == boost::asio::error::would_block);
 	
 	if (ec) {
 		throw NetworkError (ec.message ());
@@ -850,11 +868,26 @@ AudioBuffers::move (int from, int to, int frames)
 	}
 }
 
+/** Add data from from `from', `from_channel' to our channel `to_channel' */
+void
+AudioBuffers::accumulate (shared_ptr<AudioBuffers> from, int from_channel, int to_channel)
+{
+	int const N = frames ();
+	assert (from->frames() == N);
+
+	float* s = from->data (from_channel);
+	float* d = _data[to_channel];
+
+	for (int i = 0; i < N; ++i) {
+		*d++ += *s++;
+	}
+}
+
 /** Trip an assert if the caller is not in the UI thread */
 void
 ensure_ui_thread ()
 {
-	assert (this_thread::get_id() == ui_thread);
+	assert (boost::this_thread::get_id() == ui_thread);
 }
 
 /** @param v Content video frame.
diff --git a/src/lib/util.h b/src/lib/util.h
index 1fe6212e4..f4af7c22b 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -182,6 +182,7 @@ public:
 
 	void copy_from (AudioBuffers* from, int frames_to_copy, int read_offset, int write_offset);
 	void move (int from, int to, int frames);
+	void accumulate (boost::shared_ptr<AudioBuffers>, int, int);
 
 private:
 	/** Number of channels */
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 6f08b6567..071393139 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1344,6 +1344,9 @@ FilmEditor::selected_content ()
 	}
 
 	ContentList c = _film->content ();
-	assert (s >= 0 && size_t (s) < c.size ());
+	if (s < 0 || size_t (s) >= c.size ()) {
+		return shared_ptr<Content> ();
+	}
+	
 	return c[s];
 }
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 4d8685dd0..bd56efd57 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -84,18 +84,6 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
 	_play_button->Connect (wxID_ANY, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler (FilmViewer::play_clicked), 0, this);
 	_timer.Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (FilmViewer::timer), 0, this);
 
-	if (f) {
-		/* We need a player before we set_film() so that the first frame will be displayed */
-		_player = f->player ();
-		_player->disable_audio ();
-		_player->disable_video_sync ();
-		/* Don't disable subtitles here as we may need them, and it's nice to be able to turn them
-		   on and off without needing obtain a new Player.
-		*/
-		
-		_player->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
-	}
-
 	set_film (f);
 
 	JobManager::instance()->ActiveJobsChanged.connect (
@@ -142,13 +130,22 @@ FilmViewer::set_film (shared_ptr<Film> f)
 	if (_film == f) {
 		return;
 	}
-	
+
 	_film = f;
 
 	if (!_film) {
 		return;
 	}
 
+	_player = f->player ();
+	_player->disable_audio ();
+	_player->disable_video_sync ();
+	/* Don't disable subtitles here as we may need them, and it's nice to be able to turn them
+	   on and off without needing obtain a new Player.
+	*/
+	
+	_player->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
+	
 	_film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 
 	film_changed (Film::CONTENT);
-- 
cgit v1.2.3


From 4dee3db5222be7972930dbc621e9ab15a81d33d2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 10 Apr 2013 20:45:07 +0100
Subject: Remove believed unnecessary audio channel layout stuff for resampler.

---
 src/lib/audio_content.h       |  2 --
 src/lib/encoder.cc            | 13 ++++++++++---
 src/lib/ffmpeg_content.cc     | 16 +++-------------
 src/lib/ffmpeg_content.h      | 11 +++--------
 src/lib/ffmpeg_decoder.cc     |  2 +-
 src/lib/film.cc               |  6 ------
 src/lib/film.h                |  1 -
 src/lib/imagemagick_decoder.h | 12 ------------
 src/lib/playlist.cc           | 22 ----------------------
 src/lib/playlist.h            |  1 -
 src/lib/sndfile_content.h     |  4 ----
 11 files changed, 17 insertions(+), 73 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index d5dbf266b..dbd55943d 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -45,8 +45,6 @@ public:
         virtual int audio_channels () const = 0;
         virtual ContentAudioFrame audio_length () const = 0;
         virtual int audio_frame_rate () const = 0;
-        virtual int64_t audio_channel_layout () const = 0;
-	
 };
 
 #endif
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 46d11c556..b897c8a31 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -86,13 +86,20 @@ Encoder::process_begin ()
 		s << String::compose (N_("Will resample audio from %1 to %2"), _film->audio_frame_rate(), _film->target_audio_sample_rate());
 		_film->log()->log (s.str ());
 
-		/* We will be using planar float data when we call the resampler */
+		/* We will be using planar float data when we call the
+		   resampler.  As far as I can see, the audio channel
+		   layout is not necessary for our purposes; it seems
+		   only to be used get the number of channels and
+		   decide if rematrixing is needed.  It won't be, since
+		   input and output layouts are the same.
+		*/
+		   
 		_swr_context = swr_alloc_set_opts (
 			0,
-			_film->audio_channel_layout(),
+			av_get_default_channel_layout (_film->audio_channels ()),
 			AV_SAMPLE_FMT_FLTP,
 			_film->target_audio_sample_rate(),
-			_film->audio_channel_layout(),
+			av_get_default_channel_layout (_film->audio_channels ()),
 			AV_SAMPLE_FMT_FLTP,
 			_film->audio_frame_rate(),
 			0, 0
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 0424fbc33..577dbd14d 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -216,7 +216,7 @@ FFmpegContent::audio_channels () const
                 return 0;
         }
 
-        return _audio_stream->channels ();
+        return _audio_stream->channels;
 }
 
 int
@@ -229,16 +229,6 @@ FFmpegContent::audio_frame_rate () const
         return _audio_stream->frame_rate;
 }
 
-int64_t
-FFmpegContent::audio_channel_layout () const
-{
-        if (!_audio_stream) {
-                return 0;
-        }
-
-        return _audio_stream->channel_layout;
-}
-	
 bool
 operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b)
 {
@@ -256,7 +246,7 @@ FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
 	name = node->string_child ("Name");
 	id = node->number_child<int> ("Id");
 	frame_rate = node->number_child<int> ("FrameRate");
-	channel_layout = node->number_child<int64_t> ("ChannelLayout");
+	channels = node->number_child<int64_t> ("Channels");
 }
 
 void
@@ -265,7 +255,7 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const
 	root->add_child("Name")->add_child_text (name);
 	root->add_child("Id")->add_child_text (lexical_cast<string> (id));
 	root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate));
-	root->add_child("ChannelLayout")->add_child_text (lexical_cast<string> (channel_layout));
+	root->add_child("Channels")->add_child_text (lexical_cast<string> (channels));
 }
 
 /** Construct a SubtitleStream from a value returned from to_string().
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index cc603e680..b49e5790e 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -27,25 +27,21 @@
 class FFmpegAudioStream
 {
 public:
-        FFmpegAudioStream (std::string n, int i, int f, int64_t c)
+        FFmpegAudioStream (std::string n, int i, int f, int c)
                 : name (n)
                 , id (i)
                 , frame_rate (f)
-                , channel_layout (c)
+		, channels (c)
         {}
 
 	FFmpegAudioStream (boost::shared_ptr<const cxml::Node>);
 
 	void as_xml (xmlpp::Node *) const;
 	
-        int channels () const {
-                return av_get_channel_layout_nb_channels (channel_layout);
-        }
-        
         std::string name;
         int id;
         int frame_rate;
-        int64_t channel_layout;
+	int channels;
 };
 
 extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
@@ -98,7 +94,6 @@ public:
         int audio_channels () const;
         ContentAudioFrame audio_length () const;
         int audio_frame_rate () const;
-        int64_t audio_channel_layout () const;
 	
         std::vector<FFmpegSubtitleStream> subtitle_streams () const {
                 boost::mutex::scoped_lock lm (_mutex);
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index d0b1de748..eac1d91ae 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -143,7 +143,7 @@ FFmpegDecoder::setup_general ()
 			}
 			
 			_audio_streams.push_back (
-				FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channel_layout)
+				FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channels)
 				);
 			
 		} else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 35a07b399..5f1b89d0c 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1131,12 +1131,6 @@ Film::audio_frame_rate () const
 	return _playlist->audio_frame_rate ();
 }
 
-int64_t
-Film::audio_channel_layout () const
-{
-	return _playlist->audio_channel_layout ();
-}
-
 bool
 Film::has_audio () const
 {
diff --git a/src/lib/film.h b/src/lib/film.h
index 532d32bdc..4d994996e 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -106,7 +106,6 @@ public:
 	ContentAudioFrame audio_length () const;
 	int audio_channels () const;
 	int audio_frame_rate () const;
-	int64_t audio_channel_layout () const;
 	bool has_audio () const;
 	
 	float video_frame_rate () const;
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 52c7bec18..40a89bb15 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -37,18 +37,6 @@ public:
 	libdcp::Size native_size () const;
 	ContentVideoFrame video_length () const;
 
-	int audio_channels () const {
-		return 0;
-	}
-
-	int audio_sample_rate () const {
-		return 0;
-	}
-
-	int64_t audio_channel_layout () const {
-		return 0;
-	}
-
 	bool seek (double);
 	bool pass ();
 
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 717c1dace..f346cb6e0 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -143,28 +143,6 @@ Playlist::audio_frame_rate () const
 	return 0;
 }
 
-int64_t
-Playlist::audio_channel_layout () const
-{
-	/* XXX: assuming that all content has the same layout */
-
-	switch (_audio_from) {
-	case AUDIO_FFMPEG:
-	{
-		shared_ptr<const FFmpegContent> fc = first_ffmpeg ();
-		if (fc) {
-			return fc->audio_channel_layout ();
-		}
-		break;
-	}
-	case AUDIO_SNDFILE:
-		/* XXX */
-		return 0;
-	}
-
-	return 0;
-}
-
 float
 Playlist::video_frame_rate () const
 {
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 4dd27f675..6384dce1c 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -47,7 +47,6 @@ public:
 	ContentAudioFrame audio_length () const;
 	int audio_channels () const;
 	int audio_frame_rate () const;
-	int64_t audio_channel_layout () const;
 	bool has_audio () const;
 	
 	float video_frame_rate () const;
diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 27c5f3615..e8e86b603 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -58,10 +58,6 @@ public:
 		return _audio_frame_rate;
 	}
 	
-        int64_t audio_channel_layout () const {
-		return av_get_default_channel_layout (audio_channels ());
-	}
-
 	static bool valid_file (boost::filesystem::path);
 
 private:
-- 
cgit v1.2.3


From 7ee21d16c01b90c22192cd10f118419881fe504e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 13 Apr 2013 12:53:40 +0100
Subject: DVD-o-matic -> DCP-o-matic.

---
 Doxyfile                           |   2 +-
 README                             |  13 +-
 TODO                               | 137 ------
 builds/control-12.04-32            |   8 +-
 builds/control-12.04-64            |   8 +-
 builds/control-12.10-32            |   8 +-
 builds/control-12.10-64            |   8 +-
 cscript                            |  14 +-
 cscript.py                         |   8 -
 debian/changelog                   | 136 +++---
 debian/copyright                   |   4 +-
 debian/files                       |   2 +-
 debian/rules                       |   2 +-
 doc/mainpage.txt                   |  20 +-
 doc/manual/Makefile                |  22 +-
 doc/manual/dvdomatic-html.xsl      |  12 -
 doc/manual/dvdomatic-pdf.xsl       |  17 -
 doc/manual/dvdomatic.css           |  19 -
 doc/manual/dvdomatic.sty           |  68 ---
 doc/manual/dvdomatic.xml           | 932 -------------------------------------
 dvdomatic.desktop.in               |  10 -
 hacks/python-playback/config.py    |   2 -
 hacks/python-playback/dvdomatic    | 209 ---------
 hacks/python-playback/film.py      | 188 --------
 hacks/python-playback/film_view.py | 212 ---------
 hacks/python-playback/player.py    | 112 -----
 hacks/python-playback/ratio.py     |  56 ---
 hacks/python-playback/screens      |  62 ---
 hacks/python-playback/screens.py   |  85 ----
 hacks/python-playback/thumbs.py    |  76 ---
 hacks/python-playback/util.py      |   7 -
 hacks/python-playback/xrandr-notes |  17 -
 icons/128x128/dvdomatic.png        | Bin 18365 -> 0 bytes
 icons/16x16/dvdomatic.png          | Bin 211 -> 0 bytes
 icons/22x22/dvdomatic.png          | Bin 994 -> 0 bytes
 icons/32x32/dvdomatic.png          | Bin 1747 -> 0 bytes
 icons/48x48/dvdomatic.png          | Bin 3407 -> 0 bytes
 icons/64x64/dvdomatic.png          | Bin 5421 -> 0 bytes
 run/dvdomatic                      |  15 -
 src/lib/audio_analysis.h           |   4 +-
 src/lib/audio_content.h            |   4 +-
 src/lib/audio_decoder.h            |   4 +-
 src/lib/audio_mapping.h            |   4 +-
 src/lib/audio_sink.h               |   4 +-
 src/lib/audio_source.h             |   4 +-
 src/lib/config.cc                  |   4 +-
 src/lib/config.h                   |   4 +-
 src/lib/content.h                  |   4 +-
 src/lib/cross.cc                   |  10 +-
 src/lib/cross.h                    |   4 +-
 src/lib/dci_metadata.h             |   4 +-
 src/lib/dcp_content_type.h         |   4 +-
 src/lib/dcp_video_frame.cc         |   2 +-
 src/lib/decoder.h                  |   4 +-
 src/lib/encoder.cc                 |   2 +-
 src/lib/encoder.h                  |   4 +-
 src/lib/exceptions.h               |   4 +-
 src/lib/ffmpeg_content.h           |   4 +-
 src/lib/film.cc                    |  10 +-
 src/lib/film.h                     |   6 +-
 src/lib/filter.h                   |   4 +-
 src/lib/filter_graph.h             |   4 +-
 src/lib/i18n.h                     |   2 +-
 src/lib/image.h                    |   4 +-
 src/lib/job.cc                     |   4 +-
 src/lib/job.h                      |   4 +-
 src/lib/job_manager.cc             |   2 +-
 src/lib/log.h                      |   4 +-
 src/lib/player.h                   |   4 +-
 src/lib/po/es_ES.po                |   6 +-
 src/lib/po/fr_FR.po                |   8 +-
 src/lib/po/it_IT.po                |   4 +-
 src/lib/po/sv_SE.po                |   6 +-
 src/lib/processor.h                |   4 +-
 src/lib/scaler.h                   |   4 +-
 src/lib/sound_processor.h          |   4 +-
 src/lib/timer.h                    |   4 +-
 src/lib/types.h                    |   4 +-
 src/lib/ui_signaller.h             |   4 +-
 src/lib/util.cc                    |  28 +-
 src/lib/util.h                     |  14 +-
 src/lib/version.h                  |   4 +-
 src/lib/video_content.h            |   4 +-
 src/lib/video_decoder.h            |   4 +-
 src/lib/video_sink.h               |   4 +-
 src/lib/video_source.h             |   4 +-
 src/lib/wscript                    |  10 +-
 src/tools/dvdomatic.cc             | 578 -----------------------
 src/tools/makedcp.cc               |  12 +-
 src/tools/po/es_ES.po              |  58 +--
 src/tools/po/fr_FR.po              |  58 +--
 src/tools/po/it_IT.po              |  56 +--
 src/tools/po/sv_SE.po              |  58 +--
 src/tools/servomatic_cli.cc        |   4 +-
 src/tools/servomatic_gui.cc        |   6 +-
 src/tools/servomatictest.cc        |   2 +-
 src/tools/wscript                  |  14 +-
 src/wx/audio_dialog.cc             |   2 +-
 src/wx/config_dialog.cc            |   6 +-
 src/wx/config_dialog.h             |   4 +-
 src/wx/po/es_ES.po                 |  16 +-
 src/wx/po/fr_FR.po                 |  16 +-
 src/wx/po/it_IT.po                 |  16 +-
 src/wx/po/sv_SE.po                 |  18 +-
 src/wx/wscript                     |  12 +-
 src/wx/wx_util.cc                  |   2 +-
 test/test.cc                       |  14 +-
 test/wscript                       |   2 +-
 windows/dvdomatic.bmp              | Bin 343254 -> 0 bytes
 windows/dvdomatic.ico              | Bin 9662 -> 0 bytes
 windows/dvdomatic.rc               |   3 -
 windows/dvdomatic_taskbar.ico      | Bin 1150 -> 0 bytes
 windows/installer.nsi.32.in        |  70 +--
 windows/installer.nsi.64.in        |  72 +--
 wscript                            |  24 +-
 115 files changed, 515 insertions(+), 3345 deletions(-)
 delete mode 100644 TODO
 delete mode 100644 cscript.py
 delete mode 100644 doc/manual/dvdomatic-html.xsl
 delete mode 100644 doc/manual/dvdomatic-pdf.xsl
 delete mode 100644 doc/manual/dvdomatic.css
 delete mode 100644 doc/manual/dvdomatic.sty
 delete mode 100644 doc/manual/dvdomatic.xml
 delete mode 100644 dvdomatic.desktop.in
 delete mode 100644 hacks/python-playback/config.py
 delete mode 100755 hacks/python-playback/dvdomatic
 delete mode 100644 hacks/python-playback/film.py
 delete mode 100644 hacks/python-playback/film_view.py
 delete mode 100644 hacks/python-playback/player.py
 delete mode 100644 hacks/python-playback/ratio.py
 delete mode 100644 hacks/python-playback/screens
 delete mode 100644 hacks/python-playback/screens.py
 delete mode 100644 hacks/python-playback/thumbs.py
 delete mode 100644 hacks/python-playback/util.py
 delete mode 100644 hacks/python-playback/xrandr-notes
 delete mode 100644 icons/128x128/dvdomatic.png
 delete mode 100644 icons/16x16/dvdomatic.png
 delete mode 100644 icons/22x22/dvdomatic.png
 delete mode 100644 icons/32x32/dvdomatic.png
 delete mode 100644 icons/48x48/dvdomatic.png
 delete mode 100644 icons/64x64/dvdomatic.png
 delete mode 100755 run/dvdomatic
 delete mode 100644 src/tools/dvdomatic.cc
 delete mode 100644 windows/dvdomatic.bmp
 delete mode 100644 windows/dvdomatic.ico
 delete mode 100644 windows/dvdomatic.rc
 delete mode 100644 windows/dvdomatic_taskbar.ico

(limited to 'src/lib/encoder.cc')

diff --git a/Doxyfile b/Doxyfile
index 56f7e1d3c..4ed65e4f1 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -26,7 +26,7 @@ DOXYFILE_ENCODING      = UTF-8
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
-PROJECT_NAME           = DVD-o-matic
+PROJECT_NAME           = DCP-o-matic
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
diff --git a/README b/README
index fd3983c29..c218ed1a5 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-dvd-o-matic
+DCP-o-matic
 -----------
 
 Hello!
@@ -33,27 +33,22 @@ You will need these libraries:
     libsndfile
     libssh
 
-and also the command line tool:
-
-    vobcopy (if you want to rip DVDs straight into DVD-o-matic)
-
 
 Documentation
 -------------
 
-There is a manual available at http://carlh.net/software/dvdomatic
+There is a manual available at http://carlh.net/software/dcpomatic
 The DocBook source for this is in doc/manual.
 
 
 In a nutshell
 -------------
 
-The `dvdomatic' program is a GTK front-end which is probably easiest
+The `dcpomatic' program is a GTK front-end which is probably easiest
 to use.  It will create a directory for a particular project, and write
 its data to that directory.  The basic approach is:
 
 "File->New"; specify a directory.
-Choose "Jobs->Copy from DVD" to read a DVD from your drive, if you have one.
 Fill in the fields in the window (most importantly the `content' field:
   specify your video, and the `Name' field: give your project [and hence DCP]
   a name.)
@@ -76,7 +71,7 @@ Server/client
 -------------
 
 Running the `servomatic' program on a remote machine will make it
-listen on port 6192 (by default) and process requests from a dvdomatic
+listen on port 6192 (by default) and process requests from a dcpomatic
 instance.  This has been written with no thought to security, so don't
 do it over the public internet!  The connection will probably need to
 be 1 Gb/s to make it worthwhile.
diff --git a/TODO b/TODO
deleted file mode 100644
index 17f02e429..000000000
--- a/TODO
+++ /dev/null
@@ -1,137 +0,0 @@
-Make a DCP with subs using subtitle edit.
-
-Look at http://liblqr.wikidot.com/en:manual
-
-EC2
-
-Small instance $0.085 ph
-Sintel Trailer 1080p @ 200000 Mbps
-1247 frames @ 24fps ie 51.96s
-Took 1h20 to encode
-
-High-CPU medium $0.186 ph
-Sintel Trailer 1080p @ 200000 Mbps
-1247 frames @ 24fps ie 51.96s
-Took 23m to encode
-
-High-CPU extra-large $0.744 ph
-Sintel Trailer 1080p @ 200000 Mbps
-1247 frames @ 24fps ie 51.96s
-
-
-Transfer in free
-Transfer out $0.120 per GB
-
-
-Port DVD rip
-
-Write still j2ks straight to a MXF.
-md5_data to use openssl
-Write all j2ks straight to a MXF?  Possible?
-
-Standardise j2c/j2k
-Format name in ~/.dvdomatic screws up with spaces; use ID or something
-Thumbnails are poorly named
-x-thread signaller
-Restartable jobs somehow
-More logging
-Nice error when trying to thumbnail with no content.
-Destroy _buffer_src_context / _buffer_sink_context
-Don't start later jobs when one breaks.
-Compute time remaining based on more recent information.
-Use lexical_cast more
-Do deps better
-
-options summary
-
-1: L
-2: R
-3: C
-4: Lfe
-5: Ls
-6: Rs
-
-City Screen
-
-Screen 1: "1.37" masking preset, projector only has DCI 133 preset.
-
-With 1480x1080 alignment in DCI 133: bottom you see purple, yellow; top purple; left and right no lines
-With 1480x1080 alignment in DCI Flat: outside masks, but you see bottom purple, yellow; left/right all; top purple
-
-
-Screen 2: no real masking preset, projector has DCI 133 and DCI 137
-
-1480x1080, DCI 133
-L yellow purple
-R none
-B purple
-T none
-1480x1080, DCI 137
-L all
-R all but blue
-T purple
-B purple
-
-
-Screen 3: projector has DCI 1.38
-
-1480x1080
-L, R, T none
-B purple + yellow
-
-
-films-0.6: Dolby Countdown looks as though it's 3D.  THX Terminator 2 fucked
-(these on default settings)
-fq/gradfun --- no obvious effect
-hqdn3d --- pretty good denoising
-ow --- no obvious effect
-tn --- interesting; much noise reduction, bad artefacts on movement, colour tint even in black
-unsharp --- worse
-
-Benchmark SWS options: lanczos ?
-hqdn3d=0:0:6 ? (turn off chroma/luma blurring)
-
-Lanczos; no visible effect on Ghostbusters.
-
-
-THX_Monster with master Intel Core 2 Duo E4600 (2.4GHz), slave Intel Core i3 M350 (2.27GHz)
-1920 x 1080 original -> DCI Flat
-240 frames
-
-[Gbit: gigabit ethernet rather than 100Mbit]
-[im-mod: after modification to memcpy RGB data then to RGB -> XYZ in the encode thread
-[hack1]: after modification to pass YUV and to swscale in the encode thread (includes im-mod)
-[hack2]: modified hack1
-				Time		Seconds		FPS		Speedup relative to 1 local
-1 local:       		 	20m57		1257		0.19		x 1	
-2 local:    		 	11m24		 684		0.35		x 1.84
-2 local [im-mod]:  		13m13
-2 local + 1 slave:	 	6m34		 394		0.61		x 3.19
-2 local + 2 slave:	 	5m13		 313		0.77		x 4.02
-2 local + 4 slave:	 	5m05		 303		0.79		x 4.15
-2 local + 4 slave [Gbit]:	2m50		 170		1.41		x 7.39
-2 local + 4 slave [Gbit,im-mod]:2m33
-2 local + 4 slave [Gbit,hack1]: 3m20
-2 local + 4 slave [Gbit,hack2]: 2m22
-1 local + 8 slave [Gbit]:	2m28		 148		1.62		x 8.49
-2 local + 8 slave [Gbit]:	2m41		 161		1.49		x 7.81
-2 local + 8 slave [Gbit,im-mod]:2m35
-
-
-
-Just encode 52s
-Encode + Image create 1m27
-Encode + Image create (memcpy, not convert) 53s.
-
-THX_Monster with master Intel Core i3 M350 (2.27GHz), slave Intel Core 2 Duo E4600 (2.4GHz)
-1920 x 1080 original -> DCI Flat
-240 frames
-
-
-4 local:			2m45
-4 local [im-mod]:		2m53
-4 local + 2 slave [Gbit]:	2m22
-4 local + 4 slave [Gbit]:	2m21
-4 local + 4 slave [Gbit,in-mod]:2m21
-
-
diff --git a/builds/control-12.04-32 b/builds/control-12.04-32
index 8cb5aceb3..d31a5e384 100644
--- a/builds/control-12.04-32
+++ b/builds/control-12.04-32
@@ -1,15 +1,15 @@
-Source: dvdomatic
+Source: dcpomatic
 Section: video
 Priority: extra
 Maintainer: Carl Hetherington <cth@carlh.net>
 Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7)
 Standards-Version: 3.9.3
-Homepage: http://carlh.net/software/dvdomatic
+Homepage: http://carlh.net/software/dcpomatic
 
-Package: dvdomatic
+Package: dcpomatic
 Architecture: i386
 Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1)
 Description: Generator of Digital Cinema Packages (DCPs)
-  DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio
+  DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
   digital projectors.
diff --git a/builds/control-12.04-64 b/builds/control-12.04-64
index cdb15a87b..5d41558b6 100644
--- a/builds/control-12.04-64
+++ b/builds/control-12.04-64
@@ -1,15 +1,15 @@
-Source: dvdomatic
+Source: dcpomatic
 Section: video
 Priority: extra
 Maintainer: Carl Hetherington <cth@carlh.net>
 Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7)
 Standards-Version: 3.9.3
-Homepage: http://carlh.net/software/dvdomatic
+Homepage: http://carlh.net/software/dcpomatic
 
-Package: dvdomatic
+Package: dcpomatic
 Architecture: amd64
 Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libsndfile1 (>= 1.0.25), libmagick++4 (>= 8:6.6.9.7), libxml++2.6-2 (>= 2.34.1)
 Description: Generator of Digital Cinema Packages (DCPs)
-  DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio
+  DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
   digital projectors.
diff --git a/builds/control-12.10-32 b/builds/control-12.10-32
index 1dc91b701..67933f2ed 100644
--- a/builds/control-12.10-32
+++ b/builds/control-12.10-32
@@ -1,15 +1,15 @@
-Source: dvdomatic
+Source: dcpomatic
 Section: video
 Priority: extra
 Maintainer: Carl Hetherington <cth@carlh.net>
 Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7)
 Standards-Version: 3.9.3
-Homepage: http://carlh.net/software/dvdomatic
+Homepage: http://carlh.net/software/dcpomatic
 
-Package: dvdomatic
+Package: dcpomatic
 Architecture: i386
 Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2)
 Description: Generator of Digital Cinema Packages (DCPs)
-  DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio
+  DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
   digital projectors.
diff --git a/builds/control-12.10-64 b/builds/control-12.10-64
index ed0b36b2e..cddf80007 100644
--- a/builds/control-12.10-64
+++ b/builds/control-12.10-64
@@ -1,15 +1,15 @@
-Source: dvdomatic
+Source: dcpomatic
 Section: video
 Priority: extra
 Maintainer: Carl Hetherington <cth@carlh.net>
 Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7)
 Standards-Version: 3.9.3
-Homepage: http://carlh.net/software/dvdomatic
+Homepage: http://carlh.net/software/dcpomatic
 
-Package: dvdomatic
+Package: dcpomatic
 Architecture: amd64
 Depends: libc6 (>= 2.15), libwxgtk2.8-0 (>= 2.8.12.1), libssh-4 (>= 0.5.2), libboost-filesystem1.49.0 (>= 1.49.0), libboost-thread1.49.0 (>= 1.49.0), libsndfile1 (>= 1.0.25), libmagick++5 (>= 8:6.7.7.10), libxml++2.6-2 (>= 2.34.2)
 Description: Generator of Digital Cinema Packages (DCPs)
-  DVD-o-matic generates Digital Cinema Packages (DCPs) from video and audio
+  DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
   files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
   digital projectors.
diff --git a/cscript b/cscript
index 4873df654..07840c109 100644
--- a/cscript
+++ b/cscript
@@ -25,13 +25,13 @@ def build(environment, variant, version):
         shutil.copyfile(os.path.join('builds', 'control-%s' % variant), os.path.join('debian', 'control'))
         command('./waf dist')
         f = open(os.path.join('debian', 'files'), 'w')
-        print >>f,'dvdomatic_%s-1_%s.deb video extra' % (version, cpu)
+        print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu)
         shutil.rmtree('build/deb', ignore_errors=True)
         os.makedirs('build/deb')
         os.chdir('build/deb')
-        shutil.move('../../dvdomatic-%s.tar.bz2' % version, 'dvdomatic_%s.orig.tar.bz2' % version)
-        command('tar xjf dvdomatic_%s.orig.tar.bz2' % version)
-        os.chdir('dvdomatic-%s' % version)
+        shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version)
+        command('tar xjf dcpomatic_%s.orig.tar.bz2' % version)
+        os.chdir('dcpomatic-%s' % version)
         command('dch -b -v %s-1 "New upstream release."' % version)
         command('dpkg-source -b .')
         command('dpkg-buildpackage')
@@ -39,9 +39,9 @@ def build(environment, variant, version):
 
 def make_pot():
     command('./waf pot')
-    return [os.path.abspath('build/src/lib/libdvdomatic.pot'),
-            os.path.abspath('build/src/wx/libdvdomatic-wx.pot'),
-	    os.path.abspath('build/src/tools/dvdomatic.pot')]
+    return [os.path.abspath('build/src/lib/libdcpomatic.pot'),
+            os.path.abspath('build/src/wx/libdcpomatic-wx.pot'),
+	    os.path.abspath('build/src/tools/dcpomatic.pot')]
 
 def make_manual():
     os.chdir('doc/manual')
diff --git a/cscript.py b/cscript.py
deleted file mode 100644
index 9b8fa46c0..000000000
--- a/cscript.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import cdist
-
-def builds():
-	return ['source']
-
-def build_source():
-	cdist.build_source_waf()
-
diff --git a/debian/changelog b/debian/changelog
index d1cea437d..0a53eff15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,298 +1,298 @@
-dvdomatic (0.83-1) UNRELEASED; urgency=low
+dcpomatic (0.83-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Wed, 10 Apr 2013 12:48:25 +0100
 
-dvdomatic (0.82-1) UNRELEASED; urgency=low
+dcpomatic (0.82-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 09 Apr 2013 23:43:35 +0100
 
-dvdomatic (0.82beta1-1) UNRELEASED; urgency=low
+dcpomatic (0.82beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 09 Apr 2013 21:48:56 +0100
 
-dvdomatic (0.81-1) UNRELEASED; urgency=low
+dcpomatic (0.81-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 09 Apr 2013 19:48:04 +0100
 
-dvdomatic (0.81beta1-1) UNRELEASED; urgency=low
+dcpomatic (0.81beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 09 Apr 2013 15:37:32 +0100
 
-dvdomatic (0.80-1) UNRELEASED; urgency=low
+dcpomatic (0.80-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 07 Apr 2013 23:48:12 +0100
 
-dvdomatic (0.80beta4-1) UNRELEASED; urgency=low
+dcpomatic (0.80beta4-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 07 Apr 2013 23:08:49 +0100
 
-dvdomatic (0.80beta3-1) UNRELEASED; urgency=low
+dcpomatic (0.80beta3-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 07 Apr 2013 22:44:29 +0100
 
-dvdomatic (0.80beta2-1) UNRELEASED; urgency=low
+dcpomatic (0.80beta2-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 07 Apr 2013 22:19:34 +0100
 
-dvdomatic (0.80beta1-1) UNRELEASED; urgency=low
+dcpomatic (0.80beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 07 Apr 2013 18:21:33 +0100
 
-dvdomatic (0.79-1) UNRELEASED; urgency=low
+dcpomatic (0.79-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Mon, 01 Apr 2013 22:37:03 +0100
 
-dvdomatic (0.78-1) UNRELEASED; urgency=low
+dcpomatic (0.78-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 31 Mar 2013 02:43:03 +0100
 
-dvdomatic (0.78beta16-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta16-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 28 Mar 2013 16:28:05 +0000
 
-dvdomatic (0.78beta15-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta15-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 28 Mar 2013 14:25:56 +0000
 
-dvdomatic (0.78beta14-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta14-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 28 Mar 2013 10:38:07 +0000
 
-dvdomatic (0.78beta13-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta13-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Wed, 27 Mar 2013 12:26:55 +0000
 
-dvdomatic (0.78beta12-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta12-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 26 Mar 2013 21:13:54 +0000
 
-dvdomatic (0.78beta11-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta11-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 26 Mar 2013 17:34:49 +0000
 
-dvdomatic (0.78beta10-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta10-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 26 Mar 2013 11:35:15 +0000
 
-dvdomatic (0.78beta9-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta9-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 26 Mar 2013 10:36:05 +0000
 
-dvdomatic (0.78beta8-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta8-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 26 Mar 2013 00:59:36 +0000
 
-dvdomatic (0.78beta7-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta7-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 26 Mar 2013 00:19:21 +0000
 
-dvdomatic (0.78beta6-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta6-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Mon, 25 Mar 2013 00:08:10 +0000
 
-dvdomatic (0.78beta5-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta5-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 21 Mar 2013 16:32:21 +0000
 
-dvdomatic (0.78beta4-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta4-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Wed, 20 Mar 2013 15:01:10 +0000
 
-dvdomatic (0.78beta3-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta3-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Wed, 20 Mar 2013 10:49:17 +0000
 
-dvdomatic (0.78beta2-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta2-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 19 Mar 2013 21:35:50 +0000
 
-dvdomatic (0.78beta1-1) UNRELEASED; urgency=low
+dcpomatic (0.78beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 19 Mar 2013 20:50:54 +0000
 
-dvdomatic (0.77-1) UNRELEASED; urgency=low
+dcpomatic (0.77-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 14 Mar 2013 17:12:03 +0000
 
-dvdomatic (0.77beta2-1) UNRELEASED; urgency=low
+dcpomatic (0.77beta2-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 14 Mar 2013 15:50:43 +0000
 
-dvdomatic (0.77beta1-1) UNRELEASED; urgency=low
+dcpomatic (0.77beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 14 Mar 2013 15:14:01 +0000
 
-dvdomatic (0.76-1) UNRELEASED; urgency=low
+dcpomatic (0.76-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 05 Mar 2013 13:30:28 +0000
 
-dvdomatic (0.76beta3-1) UNRELEASED; urgency=low
+dcpomatic (0.76beta3-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 05 Mar 2013 12:47:20 +0000
 
-dvdomatic (0.76beta2-1) UNRELEASED; urgency=low
+dcpomatic (0.76beta2-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Fri, 01 Mar 2013 18:32:16 +0000
 
-dvdomatic (0.76beta1-1) UNRELEASED; urgency=low
+dcpomatic (0.76beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Fri, 01 Mar 2013 17:36:55 +0000
 
-dvdomatic (0.75-1) UNRELEASED; urgency=low
+dcpomatic (0.75-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Wed, 27 Feb 2013 11:03:07 +0000
 
-dvdomatic (0.75beta1-1) UNRELEASED; urgency=low
+dcpomatic (0.75beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Wed, 27 Feb 2013 08:20:42 +0000
 
-dvdomatic (0.74-1) UNRELEASED; urgency=low
+dcpomatic (0.74-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sat, 23 Feb 2013 22:57:20 +0000
 
-dvdomatic (0.74beta1-1) UNRELEASED; urgency=low
+dcpomatic (0.74beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sat, 23 Feb 2013 21:44:22 +0000
 
-dvdomatic (0.73-1) UNRELEASED; urgency=low
+dcpomatic (0.73-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 21 Feb 2013 00:43:40 +0000
 
-dvdomatic (0.73beta9-1) UNRELEASED; urgency=low
+dcpomatic (0.73beta9-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Wed, 20 Feb 2013 23:40:24 +0000
 
-dvdomatic (0.73beta8-1) UNRELEASED; urgency=low
+dcpomatic (0.73beta8-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Mon, 18 Feb 2013 22:35:51 +0000
 
-dvdomatic (0.73beta7-1) UNRELEASED; urgency=low
+dcpomatic (0.73beta7-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Mon, 18 Feb 2013 20:38:51 +0000
 
-dvdomatic (0.73beta6-1) UNRELEASED; urgency=low
+dcpomatic (0.73beta6-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 17 Feb 2013 23:05:56 +0000
 
-dvdomatic (0.73beta3-1) UNRELEASED; urgency=low
+dcpomatic (0.73beta3-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 17 Feb 2013 23:05:05 +0000
 
-dvdomatic (0.73beta2-1) UNRELEASED; urgency=low
+dcpomatic (0.73beta2-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sat, 16 Feb 2013 22:42:32 +0000
 
-dvdomatic (0.73beta1-1) UNRELEASED; urgency=low
+dcpomatic (0.73beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sat, 16 Feb 2013 21:19:24 +0000
 
-dvdomatic (0.72-1) UNRELEASED; urgency=low
+dcpomatic (0.72-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 24 Jan 2013 15:31:57 +0000
 
-dvdomatic (0.71-1) UNRELEASED; urgency=low
+dcpomatic (0.71-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 24 Jan 2013 11:36:04 +0000
 
-dvdomatic (0.70-1) UNRELEASED; urgency=low
+dcpomatic (0.70-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -300,7 +300,7 @@ dvdomatic (0.70-1) UNRELEASED; urgency=low
 
  -- Carl Hetherington <cth@carlh.net>  Sat, 12 Jan 2013 23:07:15 +0000
 
-dvdomatic (0.70beta3-1) UNRELEASED; urgency=low
+dcpomatic (0.70beta3-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -309,13 +309,13 @@ dvdomatic (0.70beta3-1) UNRELEASED; urgency=low
 
  -- Carl Hetherington <cth@carlh.net>  Sun, 06 Jan 2013 23:44:24 +0000
 
-dvdomatic (0.68-1) UNRELEASED; urgency=low
+dcpomatic (0.68-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 23 Dec 2012 01:43:44 +0000
 
-dvdomatic (0.68beta10-1) UNRELEASED; urgency=low
+dcpomatic (0.68beta10-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -325,91 +325,91 @@ dvdomatic (0.68beta10-1) UNRELEASED; urgency=low
 
  -- Carl Hetherington <cth@carlh.net>  Sat, 22 Dec 2012 13:27:27 +0000
 
-dvdomatic (0.68beta5-1) unstable; urgency=low
+dcpomatic (0.68beta5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 20 Dec 2012 07:53:46 +0000
 
-dvdomatic (0.68beta4-1) unstable; urgency=low
+dcpomatic (0.68beta4-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 20 Dec 2012 07:48:45 +0000
 
-dvdomatic (0.68beta3-1) unstable; urgency=low
+dcpomatic (0.68beta3-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 20 Dec 2012 00:35:45 +0000
 
-dvdomatic (0.68beta2-1) unstable; urgency=low
+dcpomatic (0.68beta2-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Wed, 19 Dec 2012 11:22:58 +0000
 
-dvdomatic (0.68beta1-1) unstable; urgency=low
+dcpomatic (0.68beta1-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Wed, 19 Dec 2012 10:11:13 +0000
 
-dvdomatic (0.67-1) unstable; urgency=low
+dcpomatic (0.67-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 18 Dec 2012 23:49:27 +0000
 
-dvdomatic (0.66-1) unstable; urgency=low
+dcpomatic (0.66-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 18 Dec 2012 11:29:04 +0000
 
-dvdomatic (0.65-1) unstable; urgency=low
+dcpomatic (0.65-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 18 Dec 2012 09:24:56 +0000
 
-dvdomatic (0.64-1) unstable; urgency=low
+dcpomatic (0.64-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Thu, 13 Dec 2012 21:52:09 +0000
 
-dvdomatic (0.63pre-1) unstable; urgency=low
+dcpomatic (0.63pre-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 11 Dec 2012 23:15:52 +0000
 
-dvdomatic (0.60-1) unstable; urgency=low
+dcpomatic (0.60-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Tue, 11 Dec 2012 22:46:04 +0000
 
-dvdomatic (0.59-1) unstable; urgency=low
+dcpomatic (0.59-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Mon, 10 Dec 2012 20:58:19 +0000
 
-dvdomatic (0.59beta5-1) unstable; urgency=low
+dcpomatic (0.59beta5-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 09 Dec 2012 23:51:55 +0000
 
-dvdomatic (0.59beta4-1) unstable; urgency=low
+dcpomatic (0.59beta4-1) unstable; urgency=low
 
   * New upstream release.
 
  -- Carl Hetherington <carl@houllier.lan>  Sun, 09 Dec 2012 21:38:00 +0000
 
-dvdomatic (0.59beta1-1) unstable; urgency=low
+dcpomatic (0.59beta1-1) unstable; urgency=low
 
   * Initial release.
 
diff --git a/debian/copyright b/debian/copyright
index 2579947e4..0cf23aacd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: dvdomatic
-Source: <url://carlh.net/software/dvdomatic>
+Upstream-Name: dcpomatic
+Source: <url://carlh.net/software/dcpomatic>
 
 Files: *
 Copyright: 2012 Carl Hetherington <cth@carlh.net>
diff --git a/debian/files b/debian/files
index 7639f05ac..ca46cf438 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-dvdomatic_0.59beta1-1_i386.deb video extra
+dcpomatic_0.59beta1-1_i386.deb video extra
diff --git a/debian/rules b/debian/rules
index 3320087a5..ba42e5291 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,5 +19,5 @@ override_dh_auto_build:
 	./waf --nocache build
 
 override_dh_auto_install:
-	./waf --nocache install --destdir=debian/dvdomatic
+	./waf --nocache install --destdir=debian/dcpomatic
 
diff --git a/doc/mainpage.txt b/doc/mainpage.txt
index 59c578899..649c9c609 100644
--- a/doc/mainpage.txt
+++ b/doc/mainpage.txt
@@ -1,37 +1,37 @@
-/** @mainpage DVD-o-matic
+/** @mainpage DCP-o-matic
  *
- *  DVD-o-matic is a tool to create digital cinema packages (DCPs) from
+ *  DCP-o-matic is a tool to create digital cinema packages (DCPs) from
  *  video files, or from sets of TIFF image files.  It is written in C++
  *  and distributed under the GPL.
  *
  *  Video files are decoded using FFmpeg (http://ffmpeg.org), so any video
- *  supported by FFmpeg should be usable with DVD-o-matic.  DVD-o-matic's output has been
+ *  supported by FFmpeg should be usable with DCP-o-matic.  DCP-o-matic's output has been
  *  tested on numerous digital projectors.
  *
- *  DVD-o-matic allows you to crop black borders from movies, scale them to the correct
+ *  DCP-o-matic allows you to crop black borders from movies, scale them to the correct
  *  aspect ratio and apply FFmpeg filters.  The time-consuming encoding of JPEG2000 files
  *  can be parallelised amongst any number of processors on the local host and any number
  *  of servers over a network.
  *
- *  DVD-o-matic can also make DCPs from still images, for advertisements and such-like.
+ *  DCP-o-matic can also make DCPs from still images, for advertisements and such-like.
  * 
- *  Parts of DVD-o-matic are based on OpenDCP (http://code.google.com/p/opendcp),
+ *  Parts of DCP-o-matic are based on OpenDCP (http://code.google.com/p/opendcp),
  *  written by Terrence Meiczinger.
  *
- *  DVD-o-matic uses libopenjpeg (http://code.google.com/p/openjpeg/) for JPEG2000 encoding
+ *  DCP-o-matic uses libopenjpeg (http://code.google.com/p/openjpeg/) for JPEG2000 encoding
  *  and libsndfile (http://www.mega-nerd.com/libsndfile/) for WAV file manipulation.  It
  *  also makes heavy use of the boost libraries (http://www.boost.org/).  ImageMagick
  *  (http://www.imagemagick.org/) is used for still-image encoding and decoding, and the GUI is
  *  built using wxWidgets (http://wxwidgets.org/).  It also uses libmhash (http://mhash.sourceforge.net/)
  *  for debugging purposes.
  *
- *  Thanks are due to the authors and communities of all DVD-o-matic's dependencies.
+ *  Thanks are due to the authors and communities of all DCP-o-matic's dependencies.
  * 
- *  DVD-o-matic is distributed in the hope that there are still cinemas with projectionists
+ *  DCP-o-matic is distributed in the hope that there are still cinemas with projectionists
  *  who might want to use it.  As Mark Kermode says, "if it doesn't have a projectionist
  *  it's not a cinema - it's a sweetshop with a video-screen."
  *
  *  Email correspondance is welcome to cth@carlh.net
  *
- *  More details can be found at http://carlh.net/software/dvdomatic
+ *  More details can be found at http://carlh.net/software/dcpomatic
  */
diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 94abc8516..115d7c3c8 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -1,4 +1,4 @@
-# DVD-o-matic manual makefile
+# DCP-o-matic manual makefile
 
 all:	html pdf
 
@@ -8,7 +8,7 @@ SCREENSHOTS := file-new.png video-new-film.png still-new-film.png click-content-
                still-select-content-file.png examine-thumbs.png \
                calculate-audio-gain.png prefs.png making-dcp.png filters.png film-tab.png video-tab.png audio-tab.png subtitles-tab.png
 
-XML := dvdomatic.xml
+XML := dcpomatic.xml
 
 GRAPHICS := 
 
@@ -70,7 +70,7 @@ diagrams/%.pdf:	diagrams/%.svg
 # HTML
 #
 
-html:	$(XML) dvdomatic-html.xsl extensions-html.ent dvdomatic.css \
+html:	$(XML) dcpomatic-html.xsl extensions-html.ent dcpomatic.css \
 	$(addprefix html/screenshots/,$(SCREENSHOTS)) \
 	$(subst .svg,.png,$(addprefix diagrams/,$(DIAGRAMS))) \
 	$(subst .svg,.png,$(addprefix graphics/,$(GRAPHICS))) \
@@ -80,19 +80,19 @@ html:	$(XML) dvdomatic-html.xsl extensions-html.ent dvdomatic.css \
 	cp extensions-html.ent extensions.ent
 
 #	DocBoox -> html
-	xmlto html -m dvdomatic-html.xsl dvdomatic.xml --skip-validation -o html
+	xmlto html -m dcpomatic-html.xsl dcpomatic.xml --skip-validation -o html
 
 #	Copy graphics and CSS in
 #	mkdir -p html/diagrams html/graphics
 #	cp diagrams/*.png html/diagrams
 #	cp graphics/*.png html/graphics
-	cp dvdomatic.css html
+	cp dcpomatic.css html
 
 #
 # PDF
 #
 
-pdf:	$(XML) dvdomatic-pdf.xsl extensions-pdf.ent screenshots/*.png $(subst .svg,.pdf,$(addprefix diagrams/,$(DIAGRAMS)))
+pdf:	$(XML) dcpomatic-pdf.xsl extensions-pdf.ent screenshots/*.png $(subst .svg,.pdf,$(addprefix diagrams/,$(DIAGRAMS)))
 
 # 	The DocBook needs to know what file extensions to look for
 # 	for screenshots and diagrams; use the correct file to tell it.
@@ -100,14 +100,14 @@ pdf:	$(XML) dvdomatic-pdf.xsl extensions-pdf.ent screenshots/*.png $(subst .svg,
 
 	mkdir -p pdf
 
-	dblatex -p dvdomatic-pdf.xsl -s dvdomatic.sty -r pptex.py -T native dvdomatic.xml -t pdf -o pdf/dvdomatic.pdf
+	dblatex -p dcpomatic-pdf.xsl -s dcpomatic.sty -r pptex.py -T native dcpomatic.xml -t pdf -o pdf/dcpomatic.pdf
 
 
 #
 # LaTeX (handy for debugging)
 #
 
-tex:	$(XML) dvdomatic-pdf.xsl extensions-pdf.ent
+tex:	$(XML) dcpomatic-pdf.xsl extensions-pdf.ent
 
 # 	The DocBook needs to know what file extensions to look for
 # 	for screenshots and diagrams; use the correct file to tell it.
@@ -116,8 +116,8 @@ tex:	$(XML) dvdomatic-pdf.xsl extensions-pdf.ent
 	mkdir -p tex
 
 # 	-P <foo> removes the revhistory table
-	dblatex -P doc.collab.show=0 -P latex.output.revhistory=0 -p dvdomatic-pdf.xsl -s dvdomatic.sty -r pptex.py -T native dvdomatic.xml -t tex -o tex/dvdomatic.tex
+	dblatex -P doc.collab.show=0 -P latex.output.revhistory=0 -p dcpomatic-pdf.xsl -s dcpomatic.sty -r pptex.py -T native dcpomatic.xml -t tex -o tex/dcpomatic.tex
 
 
-clean:;	rm -rf html pdf diagrams/*.pdf diagrams/*.png graphics/*.png *.aux dvdomatic.cb dvdomatic.cb2 dvdomatic.glo dvdomatic.idx dvdomatic.ilg
-	rm -rf dvdomatic.ind dvdomatic.lof dvdomatic.log dvdomatic.tex dvdomatic.toc extensions.ent dvdomatic.out
+clean:;	rm -rf html pdf diagrams/*.pdf diagrams/*.png graphics/*.png *.aux dcpomatic.cb dcpomatic.cb2 dcpomatic.glo dcpomatic.idx dcpomatic.ilg
+	rm -rf dcpomatic.ind dcpomatic.lof dcpomatic.log dcpomatic.tex dcpomatic.toc extensions.ent dcpomatic.out
diff --git a/doc/manual/dvdomatic-html.xsl b/doc/manual/dvdomatic-html.xsl
deleted file mode 100644
index 059d7ead7..000000000
--- a/doc/manual/dvdomatic-html.xsl
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-<!-- Our CSS -->
-<xsl:param name="html.stylesheet" select="'dvdomatic.css'"/>
-
-<!-- I can't fathom xmlto's logic with image scaling, so I've turned it off -->
-<xsl:param name="ignore.image.scaling" select="1"/>
-
-</xsl:stylesheet>
diff --git a/doc/manual/dvdomatic-pdf.xsl b/doc/manual/dvdomatic-pdf.xsl
deleted file mode 100644
index 414fb64b8..000000000
--- a/doc/manual/dvdomatic-pdf.xsl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding="iso-8859-1"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
-
-<!-- colour links in black -->
-<xsl:param name="latex.hyperparam">colorlinks,linkcolor=black,urlcolor=black</xsl:param>
-
-<!-- no revhistory table -->
-<xsl:param name="doc.collab.show">0</xsl:param>
-<xsl:param name="latex.output.revhistory">0</xsl:param>
-
-<!-- hack images to vaguely the right size -->
-<xsl:param name="imagedata.default.scale">scale=0.6</xsl:param>
-
-<!-- don't make too-ridiculous section numbers -->
-<xsl:param name="doc.section.depth">3</xsl:param>
-
-</xsl:stylesheet>
diff --git a/doc/manual/dvdomatic.css b/doc/manual/dvdomatic.css
deleted file mode 100644
index 0e4982f20..000000000
--- a/doc/manual/dvdomatic.css
+++ /dev/null
@@ -1,19 +0,0 @@
-body {
-    font-family: luxi sans, sans-serif;
-    margin-left: 4em;
-    margin-right: 4em;
-    margin-top: 1em;
-    margin-bottom: 1em;
-    background-color: #E2E8EE;
-}
-
-div.sidebar {
-    margin-left: 1em;
-    margin-right: 1em;
-    padding-left: 1em;
-    padding-right: 1em;
-    border-color: #000000;
-    border-width: 2px;
-    border-style: solid;
-    background-color: #E2E8EE;
-}
diff --git a/doc/manual/dvdomatic.sty b/doc/manual/dvdomatic.sty
deleted file mode 100644
index 834e581fc..000000000
--- a/doc/manual/dvdomatic.sty
+++ /dev/null
@@ -1,68 +0,0 @@
-%%
-%% This style is derivated from the docbook one
-%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ardour}[2007/04/04 My DocBook Style]
-
-%% Just use the original package and pass the options
-\RequirePackageWithOptions{docbook}
-
-% Use a nice font
-\usepackage{lmodern}
-
-% Define \dbend as the dangerous bend sign
-\font\manual=manfnt
-\def\dbend{{\manual\char127}}
-
-% Redefine sidebar environment to use the dangerous bend style
-% Danger, Will Robinson!
-\def\sidebar{\begin{trivlist}\item[]\noindent%
-\begingroup\hangindent=2pc\hangafter=-2%\clubpenalty=10000%
-\def\par{\endgraf\endgroup}%
-\hbox to0pt{\hskip-\hangindent\dbend\hfill}\ignorespaces}
-\def\endsidebar{\par\end{trivlist}}
-
-
-% Futz with the title page; basically a copy of
-% /usr/share/texmf/tex/latex/dblatex/style/dbk_title.sty
-% with authors added.
-
-\def\DBKcover{
-\ifthenelse{\equal{\DBKedition}{}}{\def\edhead{}}{\def\edhead{Ed. \DBKedition}}
-
-\pagestyle{empty}
-
-% interligne double
-\setlength{\oldbaselineskip}{\baselineskip}
-\setlength{\baselineskip}{2\oldbaselineskip}
-\textsf{
-\vfill
-\vspace{2.5cm}
-\begin{center}
-  \huge{\textbf{\DBKtitle}}\\ %
-  \ \\ %
-  \ \\ %
-  \Large{\DBKauthor}\\ %
-  \ifx\DBKsubtitle\relax\else%
-    \underline{\ \ \ \ \ \ \ \ \ \ \ }\\ %
-    \ \\ %
-    \huge{\textbf{\DBKsubtitle}}\\ %
-  \fi
-\end{center}
-\vfill
-\setlength{\baselineskip}{\oldbaselineskip}
-\hspace{1cm}
-\vspace{1cm}
-\begin{center}
-\begin{tabular}{p{7cm} p{7cm}}
-\Large{\DBKreference{} \edhead} & \\
-\end{tabular}
-\end{center}
-}
-
-% Format for the other pages
-\newpage
-\setlength{\baselineskip}{\oldbaselineskip}
-%\chead[]{\DBKcheadfront}
-\lfoot[]{}
-}
diff --git a/doc/manual/dvdomatic.xml b/doc/manual/dvdomatic.xml
deleted file mode 100644
index 58315eca6..000000000
--- a/doc/manual/dvdomatic.xml
+++ /dev/null
@@ -1,932 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book [
-<!ENTITY % sgml.features "IGNORE">
-<!ENTITY % xml.features "INCLUDE">
-<!ENTITY % dbcent PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
-   "/usr/share/xml/docbook/schema/dtd/4.5/dbcentx.mod">
-%dbcent;
-<!ENTITY % extensions SYSTEM "extensions.ent">
-%extensions;
-]>
-<book xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
-
-<bookinfo>
-<title>DVD-o-matic</title>
-<author><firstname>Carl</firstname><surname>Hetherington</surname></author>
-</bookinfo>
-
-<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
-<title>Introduction</title>
-
-<para>
-Hello, and welcome to DVD-o-matic!
-</para>
-
-<section>
-<title>What is DVD-o-matic?</title>
-
-<para>
-DVD-o-matic is a program to generate <ulink
-url="http://en.wikipedia.org/wiki/Digital_Cinema_Package">Digital
-Cinema Packages</ulink> (DCPs) from DVDs, Blu-Rays, video files such as MP4
-and AVI, or still images.  The resulting DCPs will play on modern digital
-cinema projectors.
-</para>
-
-<para>
-You might find it useful to make DVDs easier to present, to encode
-independently-shot feature films, or to generate local advertising for
-your cinema.
-</para>
-
-</section>
-
-<section>
-<title>Licence</title>
-
-<para>
-DVD-o-matic is licensed under the <ulink url="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU GPL</ulink>.
-</para>
-
-</section>
-
-</chapter>
-
-<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
-<title>Installation</title>
-
-<section>
-<title>Windows</title>
-
-<para>
-To install DVD-o-matic on Windows, simply download the installer from
-<ulink url="http://carlh.net/software/dvdomatic">http://carlh.net</ulink>
-and double-click it.  Click through the installer wizard, and
-DVD-o-matic will be installed onto your machine.
-</para>
-
-<para>
-If you are using a 32-bit version of Windows, you will need the 32-bit
-installer.  For 64-bit Windows, either installer will work, but I
-suggest you used the 64-bit version as it will allow DVD-o-matic to
-use more memory.  You may find that DVD-o-matic crashes if you run
-many parallel encoding threads (more than 4) on the 32-bit
-version.
-</para>
-
-</section>
-
-<section>
-<title>Ubuntu Linux</title>
-
-<para>
-You can install DVD-o-matic on Ubuntu 12.04 (&lsquo;Precise
-Pangolin&rsquo;) or 12.10 (&lsquo;Quantal Quetzal&rsquo;) using
-<code>.deb</code> packages: download the appropriate package from
-<ulink
-url="http://carlh.net/software/dvdomatic">http://carlh.net</ulink> and
-double-click it.  Ubuntu will install the necessary bits and pieces
-and set DVD-o-matic up for you.
-</para>
-
-</section>
-
-<section>
-<title>Other Linux distributions</title>
-
-<para>
-Installation on non-Ubuntu Linux is currently a little involved, as
-there are no packages available (yet); you will have to compile it
-from source.  If you are using a non-Ubuntu distribution, do let me
-know via the <ulink url="mailto:dvdomatic@carlh.net">mailing
-list</ulink> and I will see about building some packages.
-</para>
-
-<para>
-The following dependencies are required:
-<itemizedlist>
-<listitem><ulink url="http://ffmpeg.org/">FFmpeg</ulink></listitem>
-<listitem><ulink url="http://www.mega-nerd.com/libsndfile/">libsndfile</ulink></listitem>
-<listitem><ulink url="http://www.openssl.org/">OpenSSL</ulink></listitem>
-<listitem><ulink url="http://www.openjpeg.org/">libopenjpeg</ulink></listitem>
-<listitem><ulink url="http://www.imagemagick.org/script/index.php">ImageMagick</ulink></listitem>
-<listitem><ulink url="http://www.boost.org/">Boost</ulink></listitem>
-<listitem><ulink url="http://www.libssh.org/">libssh</ulink></listitem>
-<listitem><ulink url="http://www.gtk.org/">GTK</ulink></listitem>
-<listitem><ulink url="http://www.wxwidgets.org/">wxWidgets</ulink></listitem>
-<listitem><ulink url="http://carlh.net/software/libdcp/">libdcp</ulink></listitem>
-</itemizedlist>
-</para>
-
-<para>
-Once you have installed the development packages for the dependencies,
-download the source code from <ulink
-url="http://carlh.net/software/dvdomatic">http://carlh.net</ulink>,
-unpack it and run the following commands from inside the source
-directory:
-</para>
-
-<programlisting>
-./waf configure
-./waf build
-sudo ./waf install
-</programlisting>
-
-<para>
-With any luck, this will build and install DVD-o-matic on your system.  To run it, enter:
-</para>
-
-<programlisting>
-dvdomatic
-</programlisting>
-
-<para>
-in a shell.
-</para>
-
-</section>
-</chapter>
-
-<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
-<title>Creating a video DCP</title>
-
-<para>
-In this chapter we will see how to create a video DCP using
-DVD-o-matic.  We will gloss over some of the finer details, which are
-explained in later chapters.
-</para>
-
-<section>
-<title>Creating a new film</title>
-
-<para>
-Let's make a very simple DCP to see how DVD-o-matic works.  First, we
-need some content.  Download the low-resolution trailer for the open
-movie <ulink url="http://sintel.org/">Sintel</ulink> from <ulink
-url="http://ftp.nluug.nl/ftp/graphics/blender/apricot/trailer/Sintel_Trailer1.480p.DivX_Plus_HD.mkv">their
-website</ulink>.  Generally, of course, one would want to use the
-highest-resolution material available, but for this test we will use
-the low-resolution version to save everyone's bandwidth bills.
-</para>
-
-<para>
-Now, start DVD-o-matic and its window will open.  First, we will
-create a new &lsquo;film&rsquo;.  A &lsquo;film&rsquo; is how DVD-o-matic refers to
-a piece of content, along with some settings, which we will make into
-a DCP.  DVD-o-matic stores its data in a folder on your disk while it
-creates the DCP.  You can create a new film by selecting
-<guilabel>New</guilabel> from the <guilabel>File</guilabel> menu, as
-shown in <xref linkend="fig-file-new"/>.
-</para>
-
-<figure id="fig-file-new"> 
-  <title>Creating a new film</title> 
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/file-new&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-This will open a dialogue box for the new film, as shown in <xref
-linkend="fig-video-new-film"/>.
-</para>
-
-<figure id="fig-video-new-film"> 
-  <title>Dialogue box for creating a new film</title> 
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/video-new-film&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-In this dialogue box you can choose a name for the film.  This will be
-used to name the folder to store its data in, and also as the initial
-name for the DCP itself.  You can also choose whereabouts you want to create
-the film.  In the example from the figure, DVD-o-matic will create a
-folder called &lsquo;DCP Test&rsquo; inside my home folder (carl) into which it
-will write its working files.
-</para>
-
-<para>
-If you always create your DCPs in a particular folder, you can use
-DVD-o-matic's <guilabel>Preferences</guilabel> to make life a little
-easier by setting the default folder that DVD-o-matic will offer in this dialogue.
-See <xref linkend="ch-preferences"/>.
-</para>
-
-</section>
-
-<section>
-<title>Selecting content</title>
-
-<para>
-The next step is to set the content that you want to use.  Click the
-content selector, as shown in <xref
-linkend="fig-click-content-selector"/>, and a file chooser will
-open for you to select the content file to use, as shown in <xref
-linkend="fig-video-select-content-file"/>.
-</para>
-
-<figure id="fig-click-content-selector">
-  <title>Opening the content selector</title> 
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/click-content-selector&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<figure id="fig-video-select-content-file"> 
-  <title>Selecting a video content file</title> 
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/video-select-content-file&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-Select your content file and click <guilabel>Open</guilabel>.  In this
-case we are using the Sintel trailer that we downloaded earlier.
-</para>
-
-<para>
-When you do this, DVD-o-matic will take a look at your file.  After a
-short while (when the progress bar at the bottom right of the window
-has finished), you can look through your content using the slider to
-the right of the window, as shown in <xref linkend="fig-examine-thumbs"/>.
-</para>
-
-<figure id="fig-examine-thumbs"> 
-  <title>Examining the content</title>
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/examine-thumbs&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-Dragging the slider will move through your video.  You can also click
-the <guilabel>Play</guilabel> button to play the content back.  Note
-that there will be no sound, and playback might not be entirely
-accurate (it may be slightly slower or faster than it should be, for
-example).  This player is really only intended for brief inspection of
-content; if you need to check it more thoroughly, use another player
-such as <ulink url="http://projects.gnome.org/totem/index.html">Totem</ulink>, <ulink url="http://www.mplayerhq.hu/design7/news.html">mplayer</ulink> or <ulink url="http://www.videolan.org/vlc/index.html">VLC</ulink>.
-</para>
-
-</section>
-
-<section>
-<title>Setting up</title>
-
-<para>
-Now there are a few things to set up to describe how the DCP should be
-created.  The settings are divided into four tabs: film, video, audio and subtitles.
-</para>
-
-<section>
-<title>Film tab</title>
-
-<para>
-The &lsquo;film&rsquo; tab contains settings that pertain to the whole film, as shown in <xref linkend="fig-film-tab"/>.
-</para>
-
-<figure id="fig-film-tab"> 
-  <title>Film settings tab</title>
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/film-tab&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-The first thing here is the name.  This is generally set to the title
-of the film that is being encoded.  If <guilabel>Use DCI
-name</guilabel> is not ticked, the name that you specify will be used
-as-is for the name of the DCP.  If <guilabel>Use DCI name</guilabel>
-is ticked, the name that you enter will be used as part of a
-DCI-compliant name.
-</para>
-
-<para>
-Underneath the name field is a preview of the name that the DCP will
-get.  To use a DCI-compliant name, tick the <guilabel>Use DCI
-name</guilabel> checkbox.  The DCI name will be composed using details
-of your content's soundtrack, the current date and other things that
-can be specified in the DCI name details dialogue box, which you can
-open by clicking on the <guilabel>Details</guilabel> button.
-</para>
-
-<para>
-If the DCP name is long, it may not all be visible.  You can see the
-full name by hovering the mouse pointer over the partial name.
-</para>
-
-<para>
-The <guilabel>Trust content's header</guilabel> button starts off
-checked, and this means that DVD-o-matic will use the content's header
-information to determine its length.  If, for some reason, this header
-length is wrong, uncheck the <guilabel>Trust content's
-header</guilabel> button and DVD-o-matic will run through the content
-to find its exact length.  This may take a while for large pieces of content.
-</para>
-
-<para>
-Next up is the content type.  This can be
-&lsquo;feature&rsquo;, &lsquo;trailer&rsquo; or whatever; select the
-required type from the drop-down list.
-</para>
-
-<para>
-The <guilabel>trim frames</guilabel> settings allow you to trim frames
-from the beginning and end of the content; any trimmed frames will not
-be included in the DCP.
-</para>
-
-</section>
-
-<section>
-<title>Video tab</title>
-
-<para>
-This tab contains settings related to the picture in your DCP, as shown in <xref linkend="fig-video-tab"/>.
-</para>
-
-<figure id="fig-video-tab"> 
-  <title>Video settings tab</title>
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/video-tab&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-The first option on this tab is the format.  This will govern the
-shape that DVD-o-matic will make your image into.  Select the aspect
-ratio that your content should be presented in.  The &lsquo;4:3 within
-Flat&rsquo; and &lsquo;16:9 within Flat&rsquo; settings will put the
-image at the specified ratio within a Flat (1.85:1) frame, so that you
-can project the DCP using your projector's Flat preset.
-</para>
-
-<para>
-The remaining options can often be left alone, but may sometimes be
-useful.  The &lsquo;crop&rsquo; settings can be used to crop your
-content, which can be used to remove black borders from round the
-edges of DVD images, for example.  The specified number of pixels will
-be trimmed from each edge, and the content image in the right of the
-window will be updated to show the effect of the crop.
-</para>
-
-<para>
-The &lsquo;filters&rsquo; settings allow you to apply various video
-filters to the image.  These may be useful to try to improve
-poor-quality sources like DVDs.  We will discuss filtering later in the manual.
-<!-- XXX: link -->
-</para>
-
-<para>
-The &lsquo;scaler&rsquo; is the method that will be used to scale up
-your content to the required size for the DCP, if required.  We will
-discuss the options in more detail later; Bicubic is a fine choice in
-most situations.
-<!-- XXX: link -->
-</para>
-
-<para>
-The &lsquo;colour look-up table&rsquo; specifies the colour space that
-your input content will be expected to be in.  If in doubt, leave it
-set to &lsquo;sRGB&rsquo;.
-</para>
-
-<para>
-Finally, the &lsquo;JPEG2000 bandwidth&rsquo; setting changes how big the final
-image files used within the DCP will be.  Larger numbers will give
-better quality, but correspondingly larger DCPs.  The bandwidth can be
-between 50 and 250 megabits per second (MBps).
-</para>
-
-</section>
-
-<section>
-<title>Audio tab</title>
-
-<para>
-This tab contains settings related to the sound in your DCP, as shown in <xref linkend="fig-audio-tab"/>.
-</para>
-
-<figure id="fig-audio-tab"> 
-  <title>Audio settings tab</title>
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/audio-tab&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-
-<para>
-&lsquo;Audio Gain&rsquo; is used to alter the volume of the
-soundtrack.  The specified gain (in dB) will be applied to each sound
-channel before it is written to the DCP.
-</para>
-
-<para>
-If you use a sound processor that DVD-o-matic knows about, it can help
-you calculate changes in gain that you should apply.  Say, for
-example, that you make a test DCP and find that you have to run it at
-volume 5 instead of volume 7 to get a good sound level in the screen.
-If this is the case, click the <guilabel>Calculate...</guilabel>
-button next to the audio gain entry, and the dialogue box in <xref
-linkend="fig-calculate-audio-gain"/> will open.
-</para>
-
-<figure id="fig-calculate-audio-gain"> 
-  <title>Calculating audio gain</title>
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/calculate-audio-gain&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-For our example, put 5 in the first box and 7 in the second and click
-<guilabel>OK</guilabel>.  DVD-o-matic will calculate the audio gain
-that it should apply to make this happen.  Then you can re-make the
-DCP (this will be reasonably fast, as the video data will already have
-been done) and it should play back at the correct volume with 7 on
-your sound-rack fader.
-</para>
-
-<para>
-Current versions of DVD-o-matic only know about the Dolby CP750.  If
-you use a different sound processor, and know the gain curve of its
-volume control, <ulink url="mailto:cth@carlh.net">get in
-touch</ulink>.
-</para>
-
-<para>
-&lsquo;Audio Delay&rsquo; is used to adjust the synchronisation
-between audio and video.  A positive delay will move the audio later
-with respect to the video, and a negative delay will move it earlier.
-</para>
-
-<para>
-By default the <guilabel>Use content&lsquo;s audio</guilabel> button
-will be selected.  This means that the DCP will use one of the
-soundtracks from your content file; you can select the soundtrack that
-you wish to use from the drop-down box.
-</para>
-
-<para>
-Note that if your content's audio is mono, DVD-o-matic will place it
-in the centre channel in the DCP.
-</para>
-
-<para>
-Alternatively, you can supply different sound files by clicking the
-<guilabel>Use external audio</guilabel> button and choosing a WAV file
-for any channels that you want to appear in the DCP.  These files can
-be any bit depth and sampling rate, and will be re-sampled and
-bit-depth converted if required.
-</para>
-
-</section>
-<section>
-<title>Subtitles tab</title>
-
-<para>
-This tab contains settings related to subtitles in your DCP, as shown in <xref linkend="fig-subtitles-tab"/>.
-</para>
-
-<figure id="fig-subtitles-tab"> 
-  <title>Subtitle settings tab</title>
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/subtitles-tab&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-DVD-o-matic will extract subtitles from the content, if present, and
-they can be &lsquo;burnt into&rsquo; the DCP (that is, they are
-included in the image and not overlaid by the projector).  Note that
-DVD and Blu-Ray subtitles are stored as bitmaps, so it is not possible
-(automatically) to use non-burnt-in subtitles with these sources.
-Select the <guilabel>With Subtitles</guilabel> checkbox to enable
-subtitles.  The <guilabel>offset</guilabel> control moves the
-subtitles up and down the image, and the <guilabel>scale</guilabel>
-control changes their size.
-</para>
-
-<para>
-Future versions of DVD-o-matic will hopefully include the option to
-use text subtitles (as is the norm with most professionally-mastered
-DCPs).
-</para>
-
-</section>
-</section>
-
-<section>
-<title>Making the DCP</title>
-
-<para>
-Now that we have set everything up, choose <guilabel>Make
-DCP</guilabel> from the <guilabel>Jobs</guilabel> menu.  DVD-o-matic
-will encode your DCP.  This may take some time (many hours in some
-cases).  While the job is in progress, DVD-o-matic will update you on
-how it is getting on with the progress bar in the bottom of its window, as shown in <xref linkend="fig-making-dcp"/>.
-</para>
-
-<figure id="fig-making-dcp">
-  <title>Making the DCP</title>
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/making-dcp&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-When it has finished, the DCP will end up on your disk inside the
-film's directory.  You can then copy this to a projector via a USB
-stick, hard-drive or network connection.
-</para>
-
-<para>
-Alternatively, if you have a projector or TMS that is accessible via
-SCP across your network, you can upload the content directly from
-DVD-o-matic.  See <xref linkend="sec-tms-upload"/>.
-</para>
-
-</section>
-</chapter>
-
-
-<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
-<title>Creating a still-image DCP</title>
-
-<para>
-DVD-o-matic can also be used to create DCPs of a still image, perhaps
-for an advertisement or an on-screen announcement.  This chapter shows you
-how to do it.
-</para>
-
-<para>
-As with video DCPs, the first step is to create a new
-&lsquo;Film&rsquo;; select <guilabel>New</guilabel> from the
-<guilabel>File</guilabel> menu and the new film dialogue will open as
-shown in <xref linkend="fig-still-new-film"/>.
-</para>
-
-<figure id="fig-still-new-film"> 
-  <title>Dialogue box for creating a new film</title> 
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/still-new-film&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-Enter a name and click <guilabel>OK</guilabel>.  Then we set up the
-content; click the content selector as before, and this time we will
-choose an image file, as shown in <xref
-linkend="fig-still-select-content-file"/>.
-</para>
-
-<figure id="fig-still-select-content-file"> 
-  <title>Selecting a still content file</title> 
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/still-select-content-file&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-Setting up for a still image DCP is somewhat simpler than for a video;
-the tabs are all the same, but many options are removed and a few are added.
-</para>
-
-<para>
-As with video, you can select a content type and the format (ratio)
-that your image should be presented in.  It will be scaled and padded
-to fit the selected ratio, but in such a way that the pixel aspect
-ratio is preserved.  In other words, the image will not be stretched,
-merely scaled; if you want to stretch your image, you will need to do
-so in a separate program before importing it into DVD-o-matic.  You
-can also crop your image, if you so choose, and then set a duration
-(in seconds) that the image should appear on screen.
-</para>
-
-<para>
-Still-image DCPs can include sound; this can be added from the
-<guilabel>Audio</guilabel> tab.  If your specified duration is shorter
-than the audio, the audio will be cut off at the duration; if it is
-longer, silence will be added after your audio.
-</para>
-
-<para>
-Finally, as with video, you can choose <guilabel>Make DCP</guilabel>
-from the <guilabel>Jobs</guilabel> menu to create your DCP.  This will
-be much quicker than creating a video DCP, as DVD-o-matic only needs
-to encode a single frame which it can then repeat.
-</para>
-
-</chapter>
-
-
-<chapter xml:id="ch-preferences" xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
-<title>Preferences</title>
-
-<para>
-DVD-o-matic provides a few preferences which can be used to modify its
-behaviour.  This chapter explains those options.
-</para>
-
-<section>
-<title>The preferences dialogue</title>
-
-<para>
-The preferences dialogue is opened by choosing
-<guilabel>Preferences...</guilabel> from the <guilabel>Edit</guilabel>
-menu.  The dialogue is shown in <xref linkend="fig-prefs"/>.
-</para>
-
-<figure id="fig-prefs"> 
-  <title>Preferences</title> 
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/prefs&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<section>
-<title>TMS setup</title>
-
-<para>
-The first part of the dialogue gives some options for specifying
-details about your TMS.  If you do this, and your TMS accepts SSH
-connections, you can upload DCPs directly from DVD-o-matic to the TMS.
-This is discussed in <xref linkend="sec-tms-upload"/>.
-</para>
-
-<para>
-<guilabel>TMS IP address</guilabel> should be set to the IP address of
-your TMS, <guilabel>TMS target path</guilabel> to the place that DCPs
-should be uploaded to (which will be relative to the home directory of
-the SSH user).  Finally, the user name and password are the
-credentials required to log into the TMS via SSH.
-</para>
-</section>
-
-<section>
-<title>Threads</title>
-
-<para>
-When DVD-o-matic is encoding DCPs it can use multiple parallel threads
-to speed things up.  Set this value to the number of threads
-DVD-o-matic should use.  This would typically be set to the number of
-processors (or processor cores) in your machine.
-</para>
-
-</section>
-
-<section>
-<title>Default directory for new films</title>
-
-<para>
-This is the directory which DVD-o-matic will suggest initially as a place to put new films.
-</para>
-
-</section>
-
-<section>
-<title>A/B options</title>
-
-<para>
-These options are for DVD-o-matic's special mode of making A/B
-comparison DCPs for checking the performance of video filters.  Their
-use is described in <xref linkend="sec-ab"/>.
-</para>
-
-</section>
-
-<section>
-<title>Encoding servers</title>
-
-<para>
-If you have spare machines sitting around on your network not doing
-much, they can be pressed into service to speed up DCP encodes.  This
-is done by running a small server program on the machine, which will
-encode video sent to it by the &lsquo;master&rsquo; DVD-o-matic.  This
-option is described in more detail in <xref linkend="sec-servers"/>.
-Use these preferences to specify the encoding servers that should be
-used.
-</para>
-
-</section>
-
-</section>
-</chapter>
-
-<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
-<title>Advanced topics</title>
-
-<para>This chapter describes some parts of DVD-o-matic that are
-probably not essential, but which you might find useful in some
-circumstances.
-</para>
-
-<section>
-<title>Filtering</title>
-
-<para>
-DVD-o-matic offers a variety of filters that can be applied to your
-video content.  You can set up the filters by clicking the
-<guilabel>Edit</guilabel> button next to the filters entry in the
-setup area of the DVD-o-matic window; this opens the filters selector
-as shown in <xref linkend="fig-filters"/>.
-</para>
-
-<figure id="fig-filters"> 
-  <title>Filters selector</title> 
-  <mediaobject>
-    <imageobject> 
-      <imagedata fileref="screenshots/filters&scs;"/>
-    </imageobject> 
-  </mediaobject>
-</figure>
-
-<para>
-After changing the filters setup, you will need to regenerate the DCP
-to see the effect on the cinema screen.  The preview in DVD-o-matic
-will update itself whenever filters are changed, though of course this
-image is much smaller and of lower resolution than a projected image!
-</para>
-
-</section>
-
-<section>
-<title>Scaling</title>
-
-<para>
-If your source material is not of the DCI-specified size, or if it
-uses non-square pixels, DVD-o-matic will need to scale it.  The
-algorithm used to scale is set up by the <guilabel>Scaler</guilabel>
-entry in the film setup area.  We think &lsquo;Bicubic&rsquo; is the
-best all-round option, but tests are ongoing.
-</para>
-
-</section>
-
-<section xml:id="sec-tms-upload">
-<title>TMS upload</title>
-
-<para>
-If you have configured details of a TMS in the preferences dialogue
-(<xref linkend="ch-preferences"/>) you can upload a completed DCP
-straight to your TMS buy choosing <guilabel>Send DCP to TMS</guilabel>
-from the <guilabel>Jobs</guilabel> menu.
-</para>
-
-</section>
-
-
-<section xml:id="sec-ab">
-<title>A/B comparison</title>
-
-<para>
-When evaluating the effects of different filters or scalers on the
-image quality, A/B mode might be useful.  In this mode, DVD-o-matic
-will generate a DCP where the left half of the image uses some
-&lsquo;reference&rsquo; filtering and scaling, and the right half of
-the image uses a different set of filters and a different scaler.
-This DCP can then be played back on a projector and the image quality
-evaluated.
-</para>
-
-<para>
-To enable A/B mode, click the A/B checkbox in the setup area of the
-DVD-o-matic window.  When you generate your DCP, the left half of the
-screen will use the filters and scaler specified in the <xref
-linkend="ch-preferences">preferences</xref> dialogue, and the right
-half will use the filters and scaler specified in the film setup.
-</para>
-
-</section>
-
-<section xml:id="sec-servers">
-<title>Encoding servers</title>
-
-<para>
-One way to increase the speed of DCP encoding is to use more
-than one machine at the same time.  An instance of DVD-o-matic can
-offload some of the time-consuming JPEG2000 encoding to any number of
-other machines on a network.  To do this, one &lsquo;master&rsquo;
-machine runs DVD-o-matic, and the &lsquo;server&rsquo; machines run
-a small program called &lsquo;servomatic&rsquo;.
-</para>
-
-<section>
-<title>Running the servers</title>
-
-<para>
-There are two options for the encoding server;
-<code>servomatic_cli</code>, which runs on the command line, and
-<code>servomatic_gui</code>, which has a simple GUI.  The command line
-version is well-suited to headless servers, especially on Linux, and
-the GUI version works best on Windows where it will put an icon in the
-system tray.
-</para>
-
-<para>
-To run the command line version, simply enter:
-</para>
-
-<programlisting>
-servomatic_cli
-</programlisting>
-
-<para>
-at a command prompt.  If you are running the program on a machine with
-a multi-core processor, you can run multiple parallel encoding threads
-by doing something like:
-</para>
-
-<programlisting>
-servomatic_cli -t 4
-</programlisting>
-
-<para>
-to run 4 threads in parallel.
-</para>
-
-<para>
-To run the GUI version on windows, run the &lsquo;DVD-o-matic encode
-server&rsquo; from the start menu.  An icon will appear in the system
-tray; right-click it to open a menu from whence you can quit the
-server or open a window to show its status.
-</para>
-
-</section>
-<section>
-<title>Setting up DVD-o-matic</title>
-
-<para>
-Once your servers are running, you need to tell your master
-DVD-o-matic instance about them.  Start DVD-o-matic and open the
-<guilabel>Preferences</guilabel> dialog from the
-<guilabel>Edit</guilabel> menu.  At the bottom of this dialog is a
-section where you can add, edit and remove encoding servers.  For each
-encoding server you need only specify its IP address and the number of
-threads that it is running, so that DVD-o-matic knows how many
-parallel encode jobs to send to the server.
-</para>
-
-<para>
-Once this is done, any encodes that you start will split the workload
-up between the master machine and the servers.
-</para>
-
-</section>
-<section>
-<title>Some notes about encode servers</title>
-
-<para>
-DVD-o-matic does not mind if servers come and go; if a server
-disappears, DVD-o-matic will stop sending work to it, and will check
-it every minute or so in case it has come back online.
-</para>
-
-<para>
-You will probably find that using a 1Gb/s or faster network will
-provide a significant speed-up compared to a 100Mb/s network.
-</para>
-
-<para>
-Making changes to the server configuration in the master DVD-o-matic
-will have no effect while an encode is running; the changes will only
-be noticed when a new encode is started.
-</para>
-
-</section>
-</section>
-
-</chapter>
-
-
-</book>
diff --git a/dvdomatic.desktop.in b/dvdomatic.desktop.in
deleted file mode 100644
index 65067eb3b..000000000
--- a/dvdomatic.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=@PREFIX@/bin/dvdomatic
-Name=DVD-o-matic
-Icon=dvdomatic
-Comment=DCP generator
-Categories=AudioVideo;Video
diff --git a/hacks/python-playback/config.py b/hacks/python-playback/config.py
deleted file mode 100644
index fecf261f5..000000000
--- a/hacks/python-playback/config.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-LEFT_SCREEN_WIDTH = 1366
diff --git a/hacks/python-playback/dvdomatic b/hacks/python-playback/dvdomatic
deleted file mode 100755
index ce405f37e..000000000
--- a/hacks/python-playback/dvdomatic
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/usr/bin/python
-
-import os
-import operator
-import traceback
-import pygtk
-pygtk.require('2.0')
-import gtk
-import glib
-import gobject
-import film
-import film_view
-import player
-import screens
-import thumbs
-import ratio
-import util
-
-FILM_DIRECTORY = '/home/carl/DVD'
-
-current_player = None
-films = []
-inhibit_selection_update = False
-
-def find_films():
-    global films
-    films = []
-    for root, dirs, files in os.walk(FILM_DIRECTORY):
-        for name in files:
-            if os.path.basename(name) == 'info':
-                films.append(film.Film(os.path.join(root, os.path.dirname(name))))
-
-    films.sort(key = operator.attrgetter('name'))
-
-def update_film_store():
-    global film_store
-    global films
-    global inhibit_selection_update
-    inhibit_selection_update = True
-    film_store.clear()
-    for f in films:
-        film_store.append([f.name])
-    inhibit_selection_update = False
-
-def update_screen_store(screen_store, screens):
-    screen_store.clear()
-    for s in screens.screens:
-        screen_store.append([s.name])
-
-def create_film_tree_view(film_store):
-    view = gtk.TreeView(film_store)
-    column = gtk.TreeViewColumn()
-    view.append_column(column)
-    cell = gtk.CellRendererText()
-    column.pack_start(cell)
-    column.add_attribute(cell, 'text', 0)
-    view.get_selection().set_mode(gtk.SELECTION_SINGLE)
-    return view
-
-def create_screen_view(screen_store):
-    view = gtk.TreeView(screen_store)
-    column = gtk.TreeViewColumn()
-    view.append_column(column)
-    cell = gtk.CellRendererText()
-    column.pack_start(cell)
-    column.add_attribute(cell, 'text', 0)
-    view.get_selection().set_mode(gtk.SELECTION_SINGLE)
-    return view
-
-def get_selected_film():
-    (model, iter) = film_tree_view.get_selection().get_selected()
-
-    for f in films:
-        if f.name == model.get(iter, 0)[0]:
-            return f
-
-    return None
-
-# @return Selected screen name
-def get_selected_screen():
-    (model, iter) = screen_view.get_selection().get_selected()
-    return model.get(iter, 0)[0]
-
-def film_selected(selection):
-    if inhibit_selection_update:
-        return
-
-    film_view.set(get_selected_film())
-    check_for_playability()
-
-def screen_selected(selection):
-    check_for_playability()
-
-def check_for_playability():
-    f = get_selected_film()
-    if screens.get_format(get_selected_screen(), f.ratio) is not None:
-        play_button.set_label("Play")
-        play_button.set_sensitive(True)
-    else:
-        play_button.set_label("Cannot play: no setting for %s on screen %s" % (ratio.find(f.ratio).name(), get_selected_screen()))
-        play_button.set_sensitive(False)
-
-def update_status(s):
-    global current_player
-    if current_player is None:
-        s.set_text("Not playing")
-        return True
-
-    position = current_player.time_pos
-    if position is None:
-        return True
-    position_hms = util.s_to_hms(position)
-
-    length = current_player.length
-    if length is None:
-        return True
-
-    remaining = length - position
-    remaining_hms = util.s_to_hms(remaining)
-    s.set_text("Playing: %d:%02d:%02d, %d:%02d:%02d remaining" % (position_hms[0], position_hms[1], position_hms[2], remaining_hms[0], remaining_hms[1], remaining_hms[2]))
-    return True
-
-def play_clicked(b):
-    global current_player
-    f = get_selected_film()
-    current_player = player.get_player(f, screens.get_format(get_selected_screen(), f.ratio))
-    print current_player.args
-
-def stop_clicked(b):
-    global current_player
-    if current_player is not None:
-        current_player.stop()
-        current_player = None
-
-def add_film_clicked(b):
-    global films
-    c = gtk.FileChooserDialog("New Film", main_window, gtk.FILE_CHOOSER_ACTION_CREATE_FOLDER, (("Add", gtk.RESPONSE_OK)))
-    c.set_current_folder(FILM_DIRECTORY)
-    if c.run() == gtk.RESPONSE_OK:
-        f = film.Film()
-        f.data = c.get_filename()
-        f.name = os.path.basename(c.get_filename())
-        f.write()
-        find_films()
-        update_film_store()
-        c.hide()
-
-        for i in range(0, len(films)):
-            if films[i].name == f.name:
-                film_tree_view.get_selection().select_path((i, ))
-
-main_window = gtk.Window(gtk.WINDOW_TOPLEVEL)
-main_window.set_title("DVD-o-matic")
-main_window.maximize()
-
-main_hbox = gtk.HBox()
-main_hbox.set_spacing(12)
-main_hbox.set_border_width(12)
-main_window.add(main_hbox)
-
-find_films()
-film_view = film_view.FilmView(main_window)
-screens = screens.Screens("screens")
-
-left_vbox = gtk.VBox()
-left_vbox.set_spacing(12)
-main_hbox.pack_start(left_vbox, False, False)
-right_vbox = gtk.VBox()
-right_vbox.set_spacing(12)
-main_hbox.pack_start(right_vbox)
-
-film_store = gtk.ListStore(gobject.TYPE_STRING)
-update_film_store()
-
-film_tree_view = create_film_tree_view(film_store)
-left_vbox.pack_start(film_tree_view, True, True)
-film_tree_view.get_selection().select_path((0, ))
-film_tree_view.get_selection().connect("changed", film_selected)
-
-add_film_button = gtk.Button(stock = gtk.STOCK_ADD)
-left_vbox.pack_start(add_film_button, False, False)
-add_film_button.connect("clicked", add_film_clicked)
-
-screen_store = gtk.ListStore(gobject.TYPE_STRING)
-update_screen_store(screen_store, screens)
-
-screen_view = create_screen_view(screen_store)
-left_vbox.pack_start(screen_view, False, False)
-screen_view.get_selection().select_path((0, ))
-screen_view.get_selection().connect("changed", screen_selected)
-
-right_vbox.pack_start(film_view, False, False)
-film_view.set(films[0])
-
-play_button = gtk.Button("Play")
-right_vbox.pack_start(play_button)
-play_button.connect("clicked", play_clicked)
-
-stop_button = gtk.Button("Stop")
-right_vbox.pack_start(stop_button)
-stop_button.connect("clicked", stop_clicked)
-
-status = gtk.Label()
-right_vbox.pack_start(status, False, False)
-glib.timeout_add_seconds(1, update_status, status)
-
-check_for_playability()
-main_window.show_all()
-gtk.main()
diff --git a/hacks/python-playback/film.py b/hacks/python-playback/film.py
deleted file mode 100644
index 3ad128027..000000000
--- a/hacks/python-playback/film.py
+++ /dev/null
@@ -1,188 +0,0 @@
-import os
-import subprocess
-import shlex
-import shutil
-import player
-
-class Film:
-    def __init__(self, data = None):
-        # File or directory containing content
-        self.content = None
-        # True if content is in DVD format
-        self.dvd = False
-        # DVD title number
-        self.dvd_title = 1
-        # Directory containing metadata
-        self.data = None
-        # Film name
-        self.name = None
-        # Number of pixels by which to crop the content from each edge
-        self.left_crop = 0
-        self.top_crop = 0
-        self.right_crop = 0
-        self.bottom_crop = 0
-        # Use deinterlacing filter
-        self.deinterlace = False
-        # Target ratio
-        self.ratio = 1.85
-        # Audio stream ID to play
-        self.aid = None
-
-        self.width = None
-        self.height = None
-        self.fps = None
-        self.length = None
-
-        if data is not None:
-            self.data = data
-            f = open(os.path.join(self.data, 'info'), 'r')
-            while 1:
-                l = f.readline()
-                if l == '':
-                    break
-
-                d = l.strip()
-            
-                s = d.find(' ')
-                if s != -1:
-                    key = d[:s]
-                    value = d[s+1:]
-                
-                    if key == 'name':
-                        self.name = value
-                    elif key == 'content':
-                        self.content = value
-                    elif key == 'dvd':
-                        self.dvd = int(value) == 1
-                    elif key == 'dvd_title':
-                        self.dvd_title = int(value)
-                    elif key == 'left_crop':
-                        self.left_crop = int(value)
-                    elif key == 'top_crop':
-                        self.top_crop = int(value)
-                    elif key == 'right_crop':
-                        self.right_crop = int(value)
-                    elif key == 'bottom_crop':
-                        self.bottom_crop = int(value)
-                    elif key == 'deinterlace':
-                        self.deinterlace = int(value) == 1
-                    elif key == 'ratio':
-                        self.ratio = float(value)
-                    elif key == 'aid':
-                        self.aid = int(value)
-                    elif key == 'width':
-                        self.width = int(value)
-                    elif key == 'height':
-                        self.height = int(value)
-                    elif key == 'fps':
-                        self.fps = float(value)
-                    elif key == 'length':
-                        self.length = float(value)
-
-        if self.width is None or self.height is None or self.fps is None or self.length is None:
-            self.update_content_metadata()
-
-    def write(self):
-        try:
-            os.mkdir(self.data)
-        except OSError:
-            pass
-
-        f = open(os.path.join(self.data, 'info'), 'w')
-        self.write_datum(f, 'name', self.name)
-        self.write_datum(f, 'content', self.content)
-        self.write_datum(f, 'dvd', int(self.dvd))
-        self.write_datum(f, 'dvd_title', self.dvd_title)
-        self.write_datum(f, 'left_crop', self.left_crop)
-        self.write_datum(f, 'top_crop', self.top_crop)
-        self.write_datum(f, 'right_crop', self.right_crop)
-        self.write_datum(f, 'bottom_crop', self.bottom_crop)
-        self.write_datum(f, 'deinterlace', int(self.deinterlace))
-        self.write_datum(f, 'ratio', self.ratio)
-        self.write_datum(f, 'aid', self.aid)
-        self.write_datum(f, 'width', self.width)
-        self.write_datum(f, 'height', self.height)
-        self.write_datum(f, 'fps', self.fps)
-        self.write_datum(f, 'length', self.length)
-
-    def write_datum(self, f, key, value):
-        if value is not None:
-            print >>f,'%s %s' % (key, str(value))
-
-    def thumbs_dir(self):
-        t = os.path.join(self.data, 'thumbs')
-
-        try:
-            os.mkdir(t)
-        except OSError:
-            pass
-
-        return t
-
-    def thumb(self, n):
-        return os.path.join(self.thumbs_dir(), str('%08d.png' % (n + 1)))
-
-    def thumbs(self):
-        return len(os.listdir(self.thumbs_dir()))
-
-    def remove_thumbs(self):
-        shutil.rmtree(self.thumbs_dir())
-
-    def make_thumbs(self):
-        num_thumbs = 128
-        cl = self.player_command_line()
-        if self.length is not None:
-            sstep = self.length / num_thumbs
-        else:
-            sstep = 100
-        cl.extra = '-vo png -frames %d -sstep %d -nosound' % (num_thumbs, sstep)
-        os.chdir(self.thumbs_dir())
-        os.system(cl.get(True))
-
-    def set_dvd(self, d):
-        self.dvd = d
-        self.remove_thumbs()
-
-    def set_dvd_title(self, t):
-        self.dvd_title = t
-        self.remove_thumbs()
-
-    def set_content(self, c):
-        if c == self.content:
-            return
-
-        self.content = c
-        self.update_content_metadata()
-
-    def player_command_line(self):
-        cl = player.CommandLine()
-        cl.dvd = self.dvd
-        cl.dvd_title = self.dvd_title
-        cl.content = self.content
-        return cl
-    
-    def update_content_metadata(self):
-        if self.content is None:
-            return
-
-        self.width = None
-        self.height = None
-        self.fps = None
-        self.length = None
-
-        cl = self.player_command_line()
-        cl.extra = '-identify -vo null -ao null -frames 0'
-        text = subprocess.check_output(shlex.split(cl.get(True))).decode('utf-8')
-        lines = text.split('\n')
-        for l in lines:
-            s = l.strip()
-            b = s.split('=')
-            if len(b) == 2:
-                if b[0] == 'ID_VIDEO_WIDTH':
-                    self.width = int(b[1])
-                elif b[0] == 'ID_VIDEO_HEIGHT':
-                    self.height = int(b[1])
-                elif b[0] == 'ID_VIDEO_FPS':
-                    self.fps = float(b[1])
-                elif b[0] == 'ID_LENGTH':
-                    self.length = float(b[1])
diff --git a/hacks/python-playback/film_view.py b/hacks/python-playback/film_view.py
deleted file mode 100644
index c11b2e657..000000000
--- a/hacks/python-playback/film_view.py
+++ /dev/null
@@ -1,212 +0,0 @@
-import os
-import pygtk
-pygtk.require('2.0')
-import gtk
-import ratio
-import util
-import thumbs
-
-class FilmView(gtk.HBox):
-    def __init__(self, parent):
-        gtk.HBox.__init__(self)
-
-        self.parent_window = parent
-
-        self.inhibit_save = True
-        
-        self.table = gtk.Table()
-        self.pack_start(self.table, True, True)
-
-        self.table.set_row_spacings(4)
-        self.table.set_col_spacings(12)
-        self.film_name = gtk.Entry()
-        self.ratio = gtk.combo_box_new_text()
-        for r in ratio.ratios:
-            self.ratio.append_text(r.name())
-        self.content_file_radio = gtk.RadioButton()
-        self.content_file_radio.set_label("File")
-        self.content_file_chooser = gtk.FileChooserDialog("Content", self.parent_window, gtk.FILE_CHOOSER_ACTION_OPEN, (("Select", gtk.RESPONSE_OK)))
-        self.content_file_button = gtk.FileChooserButton(self.content_file_chooser)
-        self.content_folder_radio = gtk.RadioButton()
-        self.content_folder_radio.set_label("Folder")
-        self.content_folder_radio.set_group(self.content_file_radio)
-        self.content_folder_chooser = gtk.FileChooserDialog("Content", self.parent_window, gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, (("Select", gtk.RESPONSE_OK)))
-        self.content_folder_button = gtk.FileChooserButton(self.content_folder_chooser)
-        self.dvd = gtk.CheckButton("DVD")
-        self.dvd_title = gtk.SpinButton()
-        self.dvd_title.set_range(0, 32)
-        self.dvd_title.set_increments(1, 4)
-        self.deinterlace = gtk.CheckButton("Deinterlace")
-        self.left_crop = self.crop_spinbutton()
-        self.right_crop = self.crop_spinbutton()
-        self.top_crop = self.crop_spinbutton()
-        self.bottom_crop = self.crop_spinbutton()
-        
-        # Information about the content (immutable)
-        self.source_size = self.label()
-        self.fps = self.label()
-        self.length = self.label()
-
-        # Buttons
-        self.thumbs_button = gtk.Button("Show Thumbnails")
-
-        self.film_name.connect("changed", self.changed, self)
-        self.ratio.connect("changed", self.changed, self)
-        self.deinterlace.connect("toggled", self.changed, self)
-        self.thumbs_button.connect("clicked", self.thumbs_clicked, self)
-        self.content_file_radio.connect("toggled", self.content_radio_toggled, self)
-        self.content_folder_radio.connect("toggled", self.content_radio_toggled, self)
-        self.content_file_button.connect("file-set", self.content_file_chooser_file_set, self)
-        self.content_folder_button.connect("file-set", self.content_folder_chooser_file_set, self)
-        self.dvd.connect("toggled", self.changed, self)
-        self.dvd_title.connect("value-changed", self.changed, self)
-
-        n = 0
-        self.table.attach(self.label("Film"), 0, 1, n, n + 1)
-        self.table.attach(self.film_name, 1, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.label("Ratio"), 0, 1, n, n + 1)
-        self.table.attach(self.ratio, 1, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.label("Content"), 0, 1, n, n + 1)
-        b = gtk.HBox()
-        b.set_spacing(4)
-        b.pack_start(self.content_file_radio, False, False)
-        b.pack_start(self.content_file_button, True, True)
-        b.pack_start(self.content_folder_radio, False, False)
-        b.pack_start(self.content_folder_button, True, True)
-        self.table.attach(b, 1, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.dvd, 0, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.label("DVD title"), 0, 1, n, n + 1)
-        self.table.attach(self.dvd_title, 1, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.deinterlace, 0, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.label("Left Crop"), 0, 1, n, n + 1)
-        self.table.attach(self.left_crop, 1, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.label("Right Crop"), 0, 1, n, n + 1)
-        self.table.attach(self.right_crop, 1, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.label("Top Crop"), 0, 1, n, n + 1)
-        self.table.attach(self.top_crop, 1, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.label("Bottom Crop"), 0, 1, n, n + 1)
-        self.table.attach(self.bottom_crop, 1, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.label("Source size"), 0, 1, n, n + 1)
-        self.table.attach(self.source_size, 1, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.label("Frames per second"), 0, 1, n, n + 1)
-        self.table.attach(self.fps, 1, 2, n, n + 1)
-        n += 1
-        self.table.attach(self.label("Length"), 0, 1, n, n + 1)
-        self.table.attach(self.length, 1, 2, n, n + 1)
-
-        self.right_vbox = gtk.VBox()
-        self.pack_start(self.right_vbox, False, False)
-
-        self.right_vbox.pack_start(self.thumbs_button, False, False)
-
-        self.inhibit_save = False
-
-    def set(self, film):
-        self.inhibit_save = True
-
-        self.film = film
-        self.film_name.set_text(film.name)
-        self.ratio.set_active(ratio.ratio_to_index(film.ratio))
-        if film.content is not None:
-            if os.path.isfile(film.content):
-                self.set_content_is_file(True)
-                self.content_file_button.set_filename(film.content)
-            else:
-                self.set_content_is_file(False)
-                self.content_folder_button.set_filename(film.content)
-        self.dvd.set_active(film.dvd)
-        self.dvd_title.set_value(film.dvd_title)
-        self.dvd_title.set_sensitive(film.dvd)
-        self.deinterlace.set_active(film.deinterlace)
-        self.left_crop.set_value(film.left_crop)
-        self.right_crop.set_value(film.right_crop)
-        self.top_crop.set_value(film.top_crop)
-        self.bottom_crop.set_value(film.bottom_crop)
-
-        # Content information
-        if film.width is not None and film.height is not None:
-            self.source_size.set_text("%dx%d" % (film.width, film.height))
-        else:
-            self.source_size.set_text("Unknown")
-        if film.fps is not None:
-            self.fps.set_text(str(film.fps))
-        if film.length is not None:
-            self.length.set_text("%d:%02d:%02d" % util.s_to_hms(film.length))
-
-        self.inhibit_save = False
-
-    def set_content_is_file(self, f):
-        self.content_file_button.set_sensitive(f)
-        self.content_folder_button.set_sensitive(not f)
-        self.content_file_radio.set_active(f)
-        self.content_folder_radio.set_active(not f)
-    
-    def label(self, text = ""):
-        l = gtk.Label(text)
-        l.set_alignment(0, 0.5)
-        return l
-
-    def changed(self, a, b):
-        self.dvd_title.set_sensitive(self.dvd.get_active())
-        self.save_film()
-
-    def crop_spinbutton(self):
-        s = gtk.SpinButton()
-        s.set_range(0, 1024)
-        s.set_increments(1, 16)
-        s.connect("value-changed", self.changed, self)
-        return s
-
-    def save_film(self):
-        if self.inhibit_save:
-            return
-
-        self.film.name = self.film_name.get_text()
-        self.film.ratio = ratio.index_to_ratio(self.ratio.get_active()).ratio
-
-        if self.content_file_radio.get_active():
-            self.film.set_content(self.content_file_button.get_filename())
-        else:
-            self.film.set_content(self.content_folder_button.get_filename())
-        self.film.set_dvd(self.dvd.get_active())
-        self.film.set_dvd_title(self.dvd_title.get_value_as_int())
-        self.film.deinterlace = self.deinterlace.get_active()
-        self.film.left_crop = self.left_crop.get_value_as_int()
-        self.film.right_crop = self.right_crop.get_value_as_int()
-        self.film.top_crop = self.top_crop.get_value_as_int()
-        self.film.bottom_crop = self.bottom_crop.get_value_as_int()
-        self.film.write()
-
-    def thumbs_clicked(self, a, b):
-        if self.film.thumbs() == 0:
-            self.film.make_thumbs()
-
-        t = thumbs.Thumbs(self.film)
-        t.run()
-        t.hide()
-        self.left_crop.set_value(t.left_crop())
-        self.right_crop.set_value(t.right_crop())
-        self.top_crop.set_value(t.top_crop())
-        self.bottom_crop.set_value(t.bottom_crop())
-
-    def content_file_chooser_file_set(self, a, b):
-        self.changed(a, b)
-
-    def content_folder_chooser_file_set(self, a, b):
-        self.changed(a, b)
-
-    def content_radio_toggled(self, a, b):
-        self.set_content_is_file(self.content_file_radio.get_active())
-        self.changed(a, b)
-
diff --git a/hacks/python-playback/player.py b/hacks/python-playback/player.py
deleted file mode 100644
index 5cc8da711..000000000
--- a/hacks/python-playback/player.py
+++ /dev/null
@@ -1,112 +0,0 @@
-import os
-import threading
-import subprocess
-import shlex
-import select
-import film
-import config
-import mplayer
-
-class CommandLine:
-    def __init__(self):
-        self.position_x = 0
-        self.position_y = 0
-        self.output_width = None
-        self.output_height = None
-        self.mov = False
-        self.delay = None
-        self.dvd = False
-        self.dvd_title = 1
-        self.content = None
-        self.extra = ''
-        self.crop_x = None
-        self.crop_y = None
-        self.crop_w = None
-        self.crop_h = None
-        self.deinterlace = False
-        self.aid = None
-        
-    def get(self, with_binary):
-        # hqdn3d?
-        # nr, unsharp?
-        # -vo x11 appears to be necessary to prevent unwanted hardware scaling
-        # -noaspect stops mplayer rescaling to the movie's specified aspect ratio
-        args = '-vo x11 -noaspect -ao pulse -noborder -noautosub -nosub -sws 10 '
-        args += '-geometry %d:%d ' % (self.position_x, self.position_y)
-
-        # Video filters (passed to -vf)
-
-        filters = []
-
-        if self.crop_x is not None or self.crop_y is not None or self.crop_w is not None or self.crop_h is not None:
-            crop = 'crop='
-            if self.crop_w is not None and self.crop_h is not None:
-                crop += '%d:%d' % (self.crop_w, self.crop_h)
-                if self.crop_x is not None and self.crop_x is not None:
-                    crop += ':%d:%d' % (self.crop_x, self.crop_y)
-                filters.append(crop)
-
-        if self.output_width is not None or self.output_height is not None:
-            filters.append('scale=%d:%d' % (self.output_width, self.output_height))
-
-        # Post processing
-        pp = []
-        if self.deinterlace:
-            pp.append('lb')
-
-        # Deringing filter
-        pp.append('dr')
-
-        if len(pp) > 0:
-            pp_string = 'pp='
-            for i in range(0, len(pp)):
-                pp_string += pp[i]
-                if i < len(pp) - 1:
-                    pp += ','
-
-            filters.append(pp_string)
-
-        if len(filters) > 0:
-            args += '-vf '
-            for i in range(0, len(filters)):
-                args += filters[i]
-                if i < len(filters) - 1:
-                    args += ','
-            args += ' '
-
-        if self.mov:
-            args += '-demuxer mov '
-        if self.delay is not None:
-            args += '-delay %f ' % float(args.delay)
-        if self.aid is not None:
-            args += '-aid %s ' % self.aid
-
-        args += self.extra
-        
-        if self.dvd:
-            data_specifier = 'dvd://%d -dvd-device \"%s\"' % (self.dvd_title, self.content)
-        else:
-            data_specifier = '\"%s\"' % self.content
-
-        if with_binary:
-            return 'mplayer %s %s' % (args, data_specifier)
-        
-        return '%s %s' % (args, data_specifier)
-  
-def get_player(film, format):
-    cl = CommandLine()
-    cl.dvd = film.dvd
-    cl.dvd_title = film.dvd_title
-    cl.content = film.content
-    cl.crop_w = film.width - film.left_crop - film.right_crop
-    cl.crop_h = film.height - film.top_crop - film.bottom_crop
-    cl.position_x = format.x
-    if format.external:
-        cl.position_x = format.x + config.LEFT_SCREEN_WIDTH
-        cl.position_y = format.y
-    cl.output_width = format.width
-    cl.output_height = format.height
-    cl.deinterlace = film.deinterlace
-    cl.aid = film.aid
-    return mplayer.Player(cl.get(False))
-
diff --git a/hacks/python-playback/ratio.py b/hacks/python-playback/ratio.py
deleted file mode 100644
index 62320dc8a..000000000
--- a/hacks/python-playback/ratio.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Class to describe a Ratio, and a collection of common
-# (and not-so-common) film ratios collected from Wikipedia.
-
-class Ratio:
-    def __init__(self, ratio, nickname = None):
-        self.nickname = nickname
-        self.ratio = ratio
-
-    # @return presentation name of this ratio
-    def name(self):
-        if self.nickname is not None:
-            return "%.2f (%s)" % (self.ratio, self.nickname)
-        
-        return "%.2f" % self.ratio
-
-ratios = []
-ratios.append(Ratio(1.33, '4:3'))
-ratios.append(Ratio(1.37, 'Academy'))
-ratios.append(Ratio(1.78, '16:9'))
-ratios.append(Ratio(1.85, 'Flat / widescreen'))
-ratios.append(Ratio(2.39, 'CinemaScope / Panavision'))
-ratios.append(Ratio(1.15, 'Movietone'))
-ratios.append(Ratio(1.43, 'IMAX'))
-ratios.append(Ratio(1.5))
-ratios.append(Ratio(1.56, '14:9'))
-ratios.append(Ratio(1.6, '16:10'))
-ratios.append(Ratio(1.67))
-ratios.append(Ratio(2, 'SuperScope'))
-ratios.append(Ratio(2.2, 'Todd-AO'))
-ratios.append(Ratio(2.35, 'Early CinemaScope / Panavision'))
-ratios.append(Ratio(2.37, '21:9'))
-ratios.append(Ratio(2.55, 'CinemaScope 55'))
-ratios.append(Ratio(2.59, 'Cinerama'))
-ratios.append(Ratio(2.76, 'Ultra Panavision'))
-ratios.append(Ratio(2.93, 'MGM Camera 65'))
-ratios.append(Ratio(4, 'Polyvision'))
-
-# Find a Ratio object from a fractional ratio
-def find(ratio):
-    for r in ratios:
-        if r.ratio == ratio:
-            return r
-
-    return None
-
-# @return the ith ratio
-def index_to_ratio(i):
-    return ratios[i]
-
-# @return the index within the ratios list of a given fractional ratio
-def ratio_to_index(r):
-    for i in range(0, len(ratios)):
-        if ratios[i].ratio == r:
-            return i
-
-    return None
diff --git a/hacks/python-playback/screens b/hacks/python-playback/screens
deleted file mode 100644
index f389cb1c4..000000000
--- a/hacks/python-playback/screens
+++ /dev/null
@@ -1,62 +0,0 @@
-# Screen 1 (untested)
-screen 1
-ratio 1.85
-x 175
-y 100
-width 1550
-height 950
-external 1
-ratio 2.39
-x 0
-y 200
-width 2000
-height 860
-external 1
-
-# Screen 2
-screen 2
-ratio 1.85
-x 175
-y 100
-width 1550
-height 950
-external 1
-ratio 2.39
-x 0
-y 200
-width 2000
-height 860
-external 1
-
-# Screen 3 (untested)
-screen 3
-ratio 1.85
-x 175
-y 100
-width 1550
-height 950
-external 1
-ratio 2.39
-x 0
-y 200
-width 2000
-height 860
-external 1
-
-# Carl's Laptop
-screen laptop
-ratio 1.85
-x 0
-y 0
-width 1366
-height 738
-ratio 2.39
-x 0
-y 0
-width 1366
-height 572
-ratio 1.78
-x 0
-y 0 
-width 1366
-height 767
diff --git a/hacks/python-playback/screens.py b/hacks/python-playback/screens.py
deleted file mode 100644
index 4230a4cf8..000000000
--- a/hacks/python-playback/screens.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/python
-
-class Screen:
-    def __init__(self):
-        self.name = None
-        self.formats = []
-
-class Format:
-    def __init__(self):
-        self.ratio = None
-        self.x = None
-        self.y = None
-        self.width = None
-        self.height = None
-        self.external = False
-
-class Screens:
-    def __init__(self, file):
-
-        self.screens = []
-
-        f = open(file, 'r')
-        current_screen = None
-        current_format = None
-        while 1:
-            l = f.readline()
-            if l == '':
-                break
-            if len(l) > 0 and l[0] == '#':
-                continue
-
-            s = l.strip()
-
-            if len(s) == 0:
-                continue
-
-            b = s.split()
-
-            if len(b) != 2:
-                print "WARNING: ignored line `%s' in screens file" % (s)
-                continue
-
-            if b[0] == 'screen':
-                if current_format is not None:
-                    current_screen.formats.append(current_format)
-                    current_format = None
-
-                if current_screen is not None:
-                    self.screens.append(current_screen)
-                    current_screen = None
-                
-                current_screen = Screen()
-                current_screen.name = b[1]
-            elif b[0] == 'ratio':
-                if current_format is not None:
-                    current_screen.formats.append(current_format)
-                    current_format = None
-                    
-                current_format = Format()
-                current_format.ratio = float(b[1])
-            elif b[0] == 'x':
-                current_format.x = int(b[1])
-            elif b[0] == 'y':
-                current_format.y = int(b[1])
-            elif b[0] == 'width':
-                current_format.width = int(b[1])
-            elif b[0] == 'height':
-                current_format.height = int(b[1])
-            elif b[0] == 'external':
-                current_format.external = int(b[1]) == 1
-
-        if current_format is not None:
-            current_screen.formats.append(current_format)
-
-        if current_screen is not None:
-            self.screens.append(current_screen)
-
-    def get_format(self, screen, ratio):
-        for s in self.screens:
-            if s.name == screen:
-                for f in s.formats:
-                    if f.ratio == ratio:
-                        return f
-
-        return None
diff --git a/hacks/python-playback/thumbs.py b/hacks/python-playback/thumbs.py
deleted file mode 100644
index 921f82f5d..000000000
--- a/hacks/python-playback/thumbs.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# GUI to display thumbnails and allow cropping
-# to be set up
-
-import os
-import sys
-import pygtk
-pygtk.require('2.0')
-import gtk
-import film
-import player
-
-class Thumbs(gtk.Dialog):
-    def __init__(self, film):
-        gtk.Dialog.__init__(self)
-        self.film = film
-        self.controls = gtk.Table()
-        self.controls.set_col_spacings(4)
-        self.thumb_adj = gtk.Adjustment(0, 0, self.film.thumbs() - 1, 1, 10)
-        self.add_control("Thumbnail", self.thumb_adj, 0)
-        self.left_crop_adj = gtk.Adjustment(self.film.left_crop, 0, 1024, 1, 128)
-        self.add_control("Left crop", self.left_crop_adj, 1)
-        self.right_crop_adj = gtk.Adjustment(self.film.right_crop, 0, 1024, 1, 128)
-        self.add_control("Right crop", self.right_crop_adj, 2)
-        self.top_crop_adj = gtk.Adjustment(self.film.top_crop, 0, 1024, 1, 128)
-        self.add_control("Top crop", self.top_crop_adj, 3)
-        self.bottom_crop_adj = gtk.Adjustment(self.film.bottom_crop, 0, 1024, 1, 128)
-        self.add_control("Bottom crop", self.bottom_crop_adj, 4)
-        self.display_image = gtk.Image()
-        self.update_display()
-        window_box = gtk.HBox()
-        window_box.set_spacing(12)
-
-        controls_vbox = gtk.VBox()
-        controls_vbox.set_spacing(4)
-        controls_vbox.pack_start(self.controls, False, False)
-        
-        window_box.pack_start(controls_vbox, True, True)
-        window_box.pack_start(self.display_image)
-        
-        self.set_title("%s Thumbnails" % film.name)
-        self.get_content_area().add(window_box)
-        self.add_button("Close", gtk.RESPONSE_ACCEPT)
-        self.show_all()
-
-        for a in [self.thumb_adj, self.left_crop_adj, self.right_crop_adj, self.top_crop_adj, self.bottom_crop_adj]:
-            a.connect('value-changed', self.update_display, self)
-
-    def add_control(self, name, adj, n):
-        l = gtk.Label(name)
-        l.set_alignment(1, 0.5)
-        self.controls.attach(l, 0, 1, n, n + 1)
-        s = gtk.SpinButton(adj)
-        self.controls.attach(s, 1, 2, n, n + 1)
-
-    def update_display(self, a = None, b = None):
-        thumb_pixbuf = gtk.gdk.pixbuf_new_from_file(self.film.thumb(self.thumb_adj.get_value()))
-        self.width = thumb_pixbuf.get_width()
-        self.height = thumb_pixbuf.get_height()
-        left = self.left_crop()
-        right = self.right_crop()
-        top = self.top_crop()
-        bottom = self.bottom_crop()
-        pixbuf = thumb_pixbuf.subpixbuf(left, top, self.width - left - right, self.height - top - bottom)
-        self.display_image.set_from_pixbuf(pixbuf)
-
-    def top_crop(self):
-        return int(self.top_crop_adj.get_value())
-
-    def bottom_crop(self):
-        return int(self.bottom_crop_adj.get_value())
-
-    def left_crop(self):
-        return int(self.left_crop_adj.get_value())
-    
-    def right_crop(self):
-        return int(self.right_crop_adj.get_value())
diff --git a/hacks/python-playback/util.py b/hacks/python-playback/util.py
deleted file mode 100644
index d78abdd00..000000000
--- a/hacks/python-playback/util.py
+++ /dev/null
@@ -1,7 +0,0 @@
-
-def s_to_hms(s):
-    m = int(s / 60)
-    s -= (m * 60)
-    h = int(m / 60)
-    m -= (h * 60)
-    return (h, m, s)
diff --git a/hacks/python-playback/xrandr-notes b/hacks/python-playback/xrandr-notes
deleted file mode 100644
index eeabf1423..000000000
--- a/hacks/python-playback/xrandr-notes
+++ /dev/null
@@ -1,17 +0,0 @@
-Recommended 1680 x 1050, 60 fps
-xrandr --output HDMI1 --mode 0xbc
-
-List modes
-xrandr --verbose -q
-
-2048 x 1024, 24 fps
-xrandr --output HDMI1 --mode 0xd1
-
-cvt <xres> <yres> <fps>
-to give modeline, then
-xrandr --newmode modeline
-then add
-xrandr --verbose --addmode HDMI1 modename
-then activate
-xrandr --output HDMI1 --mode foo
-
diff --git a/icons/128x128/dvdomatic.png b/icons/128x128/dvdomatic.png
deleted file mode 100644
index 9936b39af..000000000
Binary files a/icons/128x128/dvdomatic.png and /dev/null differ
diff --git a/icons/16x16/dvdomatic.png b/icons/16x16/dvdomatic.png
deleted file mode 100644
index 3c5a10f2d..000000000
Binary files a/icons/16x16/dvdomatic.png and /dev/null differ
diff --git a/icons/22x22/dvdomatic.png b/icons/22x22/dvdomatic.png
deleted file mode 100644
index dddb86298..000000000
Binary files a/icons/22x22/dvdomatic.png and /dev/null differ
diff --git a/icons/32x32/dvdomatic.png b/icons/32x32/dvdomatic.png
deleted file mode 100644
index 8cecf08f8..000000000
Binary files a/icons/32x32/dvdomatic.png and /dev/null differ
diff --git a/icons/48x48/dvdomatic.png b/icons/48x48/dvdomatic.png
deleted file mode 100644
index 07bf2d10b..000000000
Binary files a/icons/48x48/dvdomatic.png and /dev/null differ
diff --git a/icons/64x64/dvdomatic.png b/icons/64x64/dvdomatic.png
deleted file mode 100644
index 35564a8a2..000000000
Binary files a/icons/64x64/dvdomatic.png and /dev/null differ
diff --git a/run/dvdomatic b/run/dvdomatic
deleted file mode 100755
index dbc63d44a..000000000
--- a/run/dvdomatic
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
-if [ "$1" == "--debug" ]; then
-    shift
-    gdb --args build/src/tools/dvdomatic $*
-elif [ "$1" == "--valgrind" ]; then
-    shift
-    valgrind --tool="memcheck" build/src/tools/dvdomatic $*
-elif [ "$1" == "--i18n" ]; then
-    shift
-    LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 build/src/tools/dvdomatic "$*"
-else
-    build/src/tools/dvdomatic $*
-fi
diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 6e0e2b78a..ec6905105 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_ANALYSIS_H
-#define DVDOMATIC_AUDIO_ANALYSIS_H
+#ifndef DCPOMATIC_AUDIO_ANALYSIS_H
+#define DCPOMATIC_AUDIO_ANALYSIS_H
 
 #include <iostream>
 #include <vector>
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index dbd55943d..2362786d9 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_CONTENT_H
-#define DVDOMATIC_AUDIO_CONTENT_H
+#ifndef DCPOMATIC_AUDIO_CONTENT_H
+#define DCPOMATIC_AUDIO_CONTENT_H
 
 #include "content.h"
 #include "util.h"
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 24e2796ae..418fc6da2 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for audio decoders.
  */
 
-#ifndef DVDOMATIC_AUDIO_DECODER_H
-#define DVDOMATIC_AUDIO_DECODER_H
+#ifndef DCPOMATIC_AUDIO_DECODER_H
+#define DCPOMATIC_AUDIO_DECODER_H
 
 #include "audio_source.h"
 #include "decoder.h"
diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 4f2cdb7f8..248d2570e 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_MAPPING_H
-#define DVDOMATIC_AUDIO_MAPPING_H
+#ifndef DCPOMATIC_AUDIO_MAPPING_H
+#define DCPOMATIC_AUDIO_MAPPING_H
 
 #include <list>
 #include <string>
diff --git a/src/lib/audio_sink.h b/src/lib/audio_sink.h
index 11d578a60..085491657 100644
--- a/src/lib/audio_sink.h
+++ b/src/lib/audio_sink.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_SINK_H
-#define DVDOMATIC_AUDIO_SINK_H
+#ifndef DCPOMATIC_AUDIO_SINK_H
+#define DCPOMATIC_AUDIO_SINK_H
 
 class AudioSink
 {
diff --git a/src/lib/audio_source.h b/src/lib/audio_source.h
index 5a1510d3c..ee5c606dc 100644
--- a/src/lib/audio_source.h
+++ b/src/lib/audio_source.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which emit audio data.
  */
 
-#ifndef DVDOMATIC_AUDIO_SOURCE_H
-#define DVDOMATIC_AUDIO_SOURCE_H
+#ifndef DCPOMATIC_AUDIO_SOURCE_H
+#define DCPOMATIC_AUDIO_SOURCE_H
 
 #include <boost/signals2.hpp>
 
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 2defa0539..354940b1c 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -155,9 +155,9 @@ Config::file (bool old) const
 	boost::filesystem::path p;
 	p /= g_get_user_config_dir ();
 	if (old) {
-		p /= ".dvdomatic";
+		p /= ".dcpomatic";
 	} else {
-		p /= ".dvdomatic.xml";
+		p /= ".dcpomatic.xml";
 	}
 	return p.string ();
 }
diff --git a/src/lib/config.h b/src/lib/config.h
index 13d36d236..57f4fb8a9 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -21,8 +21,8 @@
  *  @brief Class holding configuration.
  */
 
-#ifndef DVDOMATIC_CONFIG_H
-#define DVDOMATIC_CONFIG_H
+#ifndef DCPOMATIC_CONFIG_H
+#define DCPOMATIC_CONFIG_H
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/content.h b/src/lib/content.h
index c8aa6b0e0..d39fc9e1a 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_CONTENT_H
-#define DVDOMATIC_CONTENT_H
+#ifndef DCPOMATIC_CONTENT_H
+#define DCPOMATIC_CONTENT_H
 
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 2c66ab53a..f232f1779 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -18,20 +18,20 @@
 */
 
 #include "cross.h"
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 #include <unistd.h>
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 #include "windows.h"
 #endif
 
 void
-dvdomatic_sleep (int s)
+dcpomatic_sleep (int s)
 {
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 	sleep (s);
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 	Sleep (s * 1000);
 #endif
 }
diff --git a/src/lib/cross.h b/src/lib/cross.h
index 110660b16..00457c968 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)
 #endif
 
-void dvdomatic_sleep (int);
+void dcpomatic_sleep (int);
diff --git a/src/lib/dci_metadata.h b/src/lib/dci_metadata.h
index f61dae5a8..b87609ed0 100644
--- a/src/lib/dci_metadata.h
+++ b/src/lib/dci_metadata.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_DCI_METADATA_H
-#define DVDOMATIC_DCI_METADATA_H
+#ifndef DCPOMATIC_DCI_METADATA_H
+#define DCPOMATIC_DCI_METADATA_H
 
 #include <string>
 #include <libxml++/libxml++.h>
diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index 960bb0129..14204bd72 100644
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_DCP_CONTENT_TYPE_H
-#define DVDOMATIC_DCP_CONTENT_TYPE_H
+#ifndef DCPOMATIC_DCP_CONTENT_TYPE_H
+#define DCPOMATIC_DCP_CONTENT_TYPE_H
 
 /** @file src/content_type.h
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index e9499871a..da51665d1 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -266,7 +266,7 @@ DCPVideoFrame::encode_locally ()
 	_parameters->tcp_numlayers++;
 	_parameters->cp_disto_alloc = 1;
 	_parameters->cp_rsiz = CINEMA2K;
-	_parameters->cp_comment = strdup (N_("DVD-o-matic"));
+	_parameters->cp_comment = strdup (N_("DCP-o-matic"));
 	_parameters->cp_cinema = CINEMA2K_24;
 
 	/* 3 components, so use MCT */
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 0fffef257..72b866ffe 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for decoders of content.
  */
 
-#ifndef DVDOMATIC_DECODER_H
-#define DVDOMATIC_DECODER_H
+#ifndef DCPOMATIC_DECODER_H
+#define DCPOMATIC_DECODER_H
 
 #include <vector>
 #include <string>
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index b897c8a31..a8e3547a1 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -423,7 +423,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		if (remote_backoff > 0) {
-			dvdomatic_sleep (remote_backoff);
+			dcpomatic_sleep (remote_backoff);
 		}
 
 		lock.lock ();
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 70e6eea9a..56007fd48 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_ENCODER_H
-#define DVDOMATIC_ENCODER_H
+#ifndef DCPOMATIC_ENCODER_H
+#define DCPOMATIC_ENCODER_H
 
 /** @file src/encoder.h
  *  @brief Encoder to J2K and WAV for DCP.
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 6920556e5..6bad7c924 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_EXCEPTIONS_H
-#define DVDOMATIC_EXCEPTIONS_H
+#ifndef DCPOMATIC_EXCEPTIONS_H
+#define DCPOMATIC_EXCEPTIONS_H
 
 /** @file  src/exceptions.h
  *  @brief Our exceptions.
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index b49e5790e..8bf4d42a5 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_FFMPEG_CONTENT_H
-#define DVDOMATIC_FFMPEG_CONTENT_H
+#ifndef DCPOMATIC_FFMPEG_CONTENT_H
+#define DCPOMATIC_FFMPEG_CONTENT_H
 
 #include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 6ab6551da..67605ffca 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -254,7 +254,7 @@ Film::make_dcp ()
 		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];
@@ -270,10 +270,10 @@ Film::make_dcp ()
 //	log()->log (String::compose ("Content at %1 fps, DCP at %2 fps", source_frame_rate(), dcp_frame_rate()));
 	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.");
+#ifdef DCPOMATIC_DEBUG
+	log()->log ("DCP-o-matic built in debug mode.");
 #else
-	log()->log ("DVD-o-matic built in optimised mode.");
+	log()->log ("DCP-o-matic built in optimised mode.");
 #endif
 #ifdef LIBDCP_DEBUG
 	log()->log ("libdcp built in debug mode.");
@@ -432,7 +432,7 @@ Film::read_metadata ()
 	boost::mutex::scoped_lock lm (_state_mutex);
 
 	if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) {
-		throw StringError (_("This film was created with an older version of DVD-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!"));
+		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");
diff --git a/src/lib/film.h b/src/lib/film.h
index 4d994996e..ffa5d0690 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -22,8 +22,8 @@
  *  how they should be presented in a DCP.
  */
 
-#ifndef DVDOMATIC_FILM_H
-#define DVDOMATIC_FILM_H
+#ifndef DCPOMATIC_FILM_H
+#define DCPOMATIC_FILM_H
 
 #include <string>
 #include <vector>
@@ -336,7 +336,7 @@ private:
 	/** Mutex for _directory */
 	mutable boost::mutex _directory_mutex;
 	
-	/** Name for DVD-o-matic */
+	/** Name for DCP-o-matic */
 	std::string _name;
 	/** True if a auto-generated DCI-compliant name should be used for our DCP */
 	bool _use_dci_name;
diff --git a/src/lib/filter.h b/src/lib/filter.h
index 205d92482..7587312c2 100644
--- a/src/lib/filter.h
+++ b/src/lib/filter.h
@@ -21,8 +21,8 @@
  *  @brief A class to describe one of FFmpeg's video or post-processing filters.
  */
 
-#ifndef DVDOMATIC_FILTER_H
-#define DVDOMATIC_FILTER_H
+#ifndef DCPOMATIC_FILTER_H
+#define DCPOMATIC_FILTER_H
 
 #include <string>
 #include <vector>
diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index db86a677d..1ff5527ab 100644
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -21,8 +21,8 @@
  *  @brief A graph of FFmpeg filters.
  */
 
-#ifndef DVDOMATIC_FILTER_GRAPH_H
-#define DVDOMATIC_FILTER_GRAPH_H
+#ifndef DCPOMATIC_FILTER_GRAPH_H
+#define DCPOMATIC_FILTER_GRAPH_H
 
 #include "util.h"
 #include "ffmpeg_compatibility.h"
diff --git a/src/lib/i18n.h b/src/lib/i18n.h
index 46bb1d565..890313bc6 100644
--- a/src/lib/i18n.h
+++ b/src/lib/i18n.h
@@ -19,5 +19,5 @@
 
 #include <libintl.h>
 
-#define _(x) dgettext ("libdvdomatic", x)
+#define _(x) dgettext ("libdcpomatic", x)
 #define N_(x) x
diff --git a/src/lib/image.h b/src/lib/image.h
index 6b9ade99e..1d7d75dfc 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -21,8 +21,8 @@
  *  @brief A set of classes to describe video images.
  */
 
-#ifndef DVDOMATIC_IMAGE_H
-#define DVDOMATIC_IMAGE_H
+#ifndef DCPOMATIC_IMAGE_H
+#define DCPOMATIC_IMAGE_H
 
 #include <string>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/job.cc b/src/lib/job.cc
index ff0332d6d..2a4986f0d 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -87,7 +87,7 @@ Job::run_wrapper ()
 		set_state (FINISHED_ERROR);
 		set_error (
 			e.what (),
-			_("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)")
 			);
 
 	} catch (...) {
@@ -96,7 +96,7 @@ Job::run_wrapper ()
 		set_state (FINISHED_ERROR);
 		set_error (
 			_("Unknown error"),
-			_("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)")
 			);
 
 	}
diff --git a/src/lib/job.h b/src/lib/job.h
index f5175c525..2119db2f3 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -21,8 +21,8 @@
  *  @brief A parent class to represent long-running tasks which are run in their own thread.
  */
 
-#ifndef DVDOMATIC_JOB_H
-#define DVDOMATIC_JOB_H
+#ifndef DCPOMATIC_JOB_H
+#define DCPOMATIC_JOB_H
 
 #include <string>
 #include <boost/thread/mutex.hpp>
diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 910597628..f96275467 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -126,7 +126,7 @@ JobManager::scheduler ()
 			}
 		}
 
-		dvdomatic_sleep (1);
+		dcpomatic_sleep (1);
 	}
 }
 
diff --git a/src/lib/log.h b/src/lib/log.h
index 3a2cfcbfd..3ad6516c1 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_LOG_H
-#define DVDOMATIC_LOG_H
+#ifndef DCPOMATIC_LOG_H
+#define DCPOMATIC_LOG_H
 
 /** @file src/log.h
  *  @brief A very simple logging class.
diff --git a/src/lib/player.h b/src/lib/player.h
index 8a82ab298..dbfde09a6 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_PLAYER_H
-#define DVDOMATIC_PLAYER_H
+#ifndef DCPOMATIC_PLAYER_H
+#define DCPOMATIC_PLAYER_H
 
 #include <list>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 17051bd98..5c8d642e3 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LIBDVDOMATIC\n"
+"Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-02 19:10-0500\n"
@@ -250,10 +250,10 @@ msgstr "Horizontal deblocking filter A"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
 "Error desconocido. La mejor idea es informar del problema a la lista de "
-"correo de DVD-O-matic (dvdomatic@carlh.net)"
+"correo de DCP-o-matic (dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index d9d945b52..af6890d97 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic FRENCH\n"
+"Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-20 00:39+0100\n"
@@ -248,10 +248,10 @@ msgstr "Filtre dé-bloc horizontal"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
-"Erreur indéterminée. Merci de rapporter le problème à la liste DVD-o-matic "
-"(dvdomatic@carlh.net)"
+"Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic "
+"(dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 992eda107..c1ca26ea3 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -248,10 +248,10 @@ msgstr "Filtro A sblocco orizzontale"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
 "Non sappiamo cosa ha causato questo errore. La cosa migliore è inviare un "
-"report del problema alla mailing list di DVD-o-matic (dvdomatic@carlh.net)"
+"report del problema alla mailing list di DCP-o-matic (dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index d574261c8..c8695ce4d 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic\n"
+"Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-09 10:13+0100\n"
@@ -249,10 +249,10 @@ msgstr "Filter för horisontal kantighetsutjämning A"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
 "Det är inte känt vad som orsakade detta fel. Bästa sättet att rapportera "
-"problemet är till DVD-o-matics mejl-lista (dvdomatic@carlh.net)"
+"problemet är till DCP-o-matics mejl-lista (dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/processor.h b/src/lib/processor.h
index 1ba396f2f..5dbafab7f 100644
--- a/src/lib/processor.h
+++ b/src/lib/processor.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which accept and then emit video or audio data.
  */
 
-#ifndef DVDOMATIC_PROCESSOR_H
-#define DVDOMATIC_PROCESSOR_H
+#ifndef DCPOMATIC_PROCESSOR_H
+#define DCPOMATIC_PROCESSOR_H
 
 #include "video_source.h"
 #include "video_sink.h"
diff --git a/src/lib/scaler.h b/src/lib/scaler.h
index c80f4b7db..a736e92de 100644
--- a/src/lib/scaler.h
+++ b/src/lib/scaler.h
@@ -21,8 +21,8 @@
  *  @brief A class to describe one of FFmpeg's software scalers.
  */
 
-#ifndef DVDOMATIC_SCALER_H
-#define DVDOMATIC_SCALER_H
+#ifndef DCPOMATIC_SCALER_H
+#define DCPOMATIC_SCALER_H
 
 #include <string>
 #include <vector>
diff --git a/src/lib/sound_processor.h b/src/lib/sound_processor.h
index 2edf38840..bdbe72ba2 100644
--- a/src/lib/sound_processor.h
+++ b/src/lib/sound_processor.h
@@ -21,8 +21,8 @@
  *  @brief A class to describe a sound processor.
  */
 
-#ifndef DVDOMATIC_SOUND_PROCESSOR_H
-#define DVDOMATIC_SOUND_PROCESSOR_H
+#ifndef DCPOMATIC_SOUND_PROCESSOR_H
+#define DCPOMATIC_SOUND_PROCESSOR_H
 
 #include <string>
 #include <vector>
diff --git a/src/lib/timer.h b/src/lib/timer.h
index f509a7492..173d0d961 100644
--- a/src/lib/timer.h
+++ b/src/lib/timer.h
@@ -22,8 +22,8 @@
  *  @brief Some timing classes for debugging and profiling.
  */
 
-#ifndef DVDOMATIC_TIMER_H
-#define DVDOMATIC_TIMER_H
+#ifndef DCPOMATIC_TIMER_H
+#define DCPOMATIC_TIMER_H
 
 #include <string>
 #include <map>
diff --git a/src/lib/types.h b/src/lib/types.h
index f821a74ac..c2bb9d853 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_TYPES_H
-#define DVDOMATIC_TYPES_H
+#ifndef DCPOMATIC_TYPES_H
+#define DCPOMATIC_TYPES_H
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/ui_signaller.h b/src/lib/ui_signaller.h
index 221bcbe95..428ab698f 100644
--- a/src/lib/ui_signaller.h
+++ b/src/lib/ui_signaller.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_UI_SIGNALLER_H
-#define DVDOMATIC_UI_SIGNALLER_H
+#ifndef DCPOMATIC_UI_SIGNALLER_H
+#define DCPOMATIC_UI_SIGNALLER_H
 
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 06da94294..ad08c6ab4 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <fstream>
 #include <climits>
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 #include <execinfo.h>
 #include <cxxabi.h>
 #endif
@@ -148,7 +148,7 @@ seconds_to_approximate_hms (int s)
 	return ap.str ();
 }
 
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 /** @param l Mangled C++ identifier.
  *  @return Demangled version.
  */
@@ -247,11 +247,11 @@ seconds (struct timeval t)
 	return t.tv_sec + (double (t.tv_usec) / 1e6);
 }
 
-/** Call the required functions to set up DVD-o-matic's static arrays, etc.
+/** Call the required functions to set up DCP-o-matic's static arrays, etc.
  *  Must be called from the UI thread, if there is one.
  */
 void
-dvdomatic_setup ()
+dcpomatic_setup ()
 {
 	avfilter_register_all ();
 	
@@ -264,7 +264,7 @@ dvdomatic_setup ()
 	ui_thread = boost::this_thread::get_id ();
 }
 
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 boost::filesystem::path
 mo_path ()
 {
@@ -279,9 +279,9 @@ mo_path ()
 #endif
 
 void
-dvdomatic_setup_i18n (string lang)
+dcpomatic_setup_i18n (string lang)
 {
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 	lang += ".UTF8";
 #endif
 
@@ -297,15 +297,15 @@ dvdomatic_setup_i18n (string lang)
 	}
 
 	setlocale (LC_ALL, "");
-	textdomain ("libdvdomatic");
+	textdomain ("libdcpomatic");
 
-#ifdef DVDOMATIC_WINDOWS
-	bindtextdomain ("libdvdomatic", mo_path().string().c_str());
-	bind_textdomain_codeset ("libdvdomatic", "UTF8");
+#ifdef DCPOMATIC_WINDOWS
+	bindtextdomain ("libdcpomatic", mo_path().string().c_str());
+	bind_textdomain_codeset ("libdcpomatic", "UTF8");
 #endif	
 
-#ifdef DVDOMATIC_POSIX
-	bindtextdomain ("libdvdomatic", POSIX_LOCALE_PREFIX);
+#ifdef DCPOMATIC_POSIX
+	bindtextdomain ("libdcpomatic", POSIX_LOCALE_PREFIX);
 #endif
 }
 
@@ -909,7 +909,7 @@ cpu_info ()
 	pair<string, int> info;
 	info.second = 0;
 	
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 	ifstream f (N_("/proc/cpuinfo"));
 	while (f.good ()) {
 		string l;
diff --git a/src/lib/util.h b/src/lib/util.h
index f4af7c22b..065801a88 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -22,8 +22,8 @@
  *  @brief Some utility functions and classes.
  */
 
-#ifndef DVDOMATIC_UTIL_H
-#define DVDOMATIC_UTIL_H
+#ifndef DCPOMATIC_UTIL_H
+#define DCPOMATIC_UTIL_H
 
 #include <string>
 #include <vector>
@@ -39,7 +39,7 @@ extern "C" {
 #include "compose.hpp"
 #include "types.h"
 
-#ifdef DVDOMATIC_DEBUG
+#ifdef DCPOMATIC_DEBUG
 #define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
 #else
 #define TIMING(...)
@@ -55,14 +55,14 @@ extern std::string seconds_to_approximate_hms (int);
 extern void stacktrace (std::ostream &, int);
 extern std::string dependency_version_summary ();
 extern double seconds (struct timeval);
-extern void dvdomatic_setup ();
-extern void dvdomatic_setup_i18n (std::string);
+extern void dcpomatic_setup ();
+extern void dcpomatic_setup_i18n (std::string);
 extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
 extern std::string md5_digest (boost::filesystem::path);
 extern std::string md5_digest (void const *, int);
 extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 extern boost::filesystem::path mo_path ();
 #endif
 
@@ -117,7 +117,7 @@ extern std::string get_optional_string (std::multimap<std::string, std::string>
 
 /** @class Socket
  *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
- *  that are useful for DVD-o-matic.
+ *  that are useful for DCP-o-matic.
  *
  *  This class wraps some things that I could not work out how to do with boost;
  *  most notably, sync read/write calls with timeouts.
diff --git a/src/lib/version.h b/src/lib/version.h
index 71639e3bc..518862fc4 100644
--- a/src/lib/version.h
+++ b/src/lib/version.h
@@ -1,3 +1,3 @@
 
-extern char const * dvdomatic_version;
-extern char const * dvdomatic_git_commit;
+extern char const * dcpomatic_version;
+extern char const * dcpomatic_git_commit;
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 3d2c4cab2..75e507d4d 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_CONTENT_H
-#define DVDOMATIC_VIDEO_CONTENT_H
+#ifndef DCPOMATIC_VIDEO_CONTENT_H
+#define DCPOMATIC_VIDEO_CONTENT_H
 
 #include "content.h"
 #include "util.h"
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 05cf99a96..23817c055 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
 #include "decoder.h"
diff --git a/src/lib/video_sink.h b/src/lib/video_sink.h
index 7c128cf73..c68651005 100644
--- a/src/lib/video_sink.h
+++ b/src/lib/video_sink.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_SINK_H
-#define DVDOMATIC_VIDEO_SINK_H
+#ifndef DCPOMATIC_VIDEO_SINK_H
+#define DCPOMATIC_VIDEO_SINK_H
 
 #include <boost/shared_ptr.hpp>
 #include "util.h"
diff --git a/src/lib/video_source.h b/src/lib/video_source.h
index e60e7dfd0..e7c9805ef 100644
--- a/src/lib/video_source.h
+++ b/src/lib/video_source.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which emit video data.
  */
 
-#ifndef DVDOMATIC_VIDEO_SOURCE_H
-#define DVDOMATIC_VIDEO_SOURCE_H
+#ifndef DCPOMATIC_VIDEO_SOURCE_H
+#define DCPOMATIC_VIDEO_SOURCE_H
 
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
diff --git a/src/lib/wscript b/src/lib/wscript
index 2a26c2bfe..fddebe8e6 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -66,7 +66,7 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libdvdomatic'
+    obj.name = 'libdcpomatic'
     obj.export_includes = ['.']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
@@ -78,12 +78,12 @@ def build(bld):
     if bld.env.STATIC:
         obj.uselib += ' XML++'
     obj.source = sources + " version.cc"
-    obj.target = 'dvdomatic'
+    obj.target = 'dcpomatic'
 
-    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdvdomatic', bld)
+    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'lib'), sources, 'libdvdomatic')
+    i18n.pot(os.path.join('src', 'lib'), sources, 'libdcpomatic')
 
 def pot_merge(bld):
-    i18n.pot_merge(os.path.join('src', 'lib'), 'libdvdomatic')
+    i18n.pot_merge(os.path.join('src', 'lib'), 'libdcpomatic')
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
deleted file mode 100644
index 768819abc..000000000
--- a/src/tools/dvdomatic.cc
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <iostream>
-#include <boost/filesystem.hpp>
-#ifdef __WXMSW__
-#include <shellapi.h>
-#endif
-#include <wx/aboutdlg.h>
-#include <wx/stdpaths.h>
-#include <wx/cmdline.h>
-#include "wx/film_viewer.h"
-#include "wx/film_editor.h"
-#include "wx/job_manager_view.h"
-#include "wx/config_dialog.h"
-#include "wx/job_wrapper.h"
-#include "wx/wx_util.h"
-#include "wx/new_film_dialog.h"
-#include "wx/properties_dialog.h"
-#include "wx/wx_ui_signaller.h"
-#include "lib/film.h"
-#include "lib/format.h"
-#include "lib/config.h"
-#include "lib/filter.h"
-#include "lib/util.h"
-#include "lib/scaler.h"
-#include "lib/exceptions.h"
-#include "lib/version.h"
-#include "lib/ui_signaller.h"
-#include "lib/log.h"
-
-using std::cout;
-using std::string;
-using std::wstring;
-using std::stringstream;
-using std::map;
-using std::make_pair;
-using std::exception;
-using boost::shared_ptr;
-
-static FilmEditor* film_editor = 0;
-static FilmViewer* film_viewer = 0;
-static shared_ptr<Film> film;
-static std::string log_level;
-static std::string film_to_load;
-static std::string film_to_create;
-static wxMenu* jobs_menu = 0;
-static wxLocale* locale = 0;
-
-static void set_menu_sensitivity ();
-
-class FilmChangedDialog
-{
-public:
-	FilmChangedDialog ()
-	{
-		_dialog = new wxMessageDialog (
-			0,
-			wxString::Format (_("Save changes to film \"%s\" before closing?"), std_to_wx (film->name ()).data()),
-			_("Film changed"),
-			wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
-			);
-	}
-
-	~FilmChangedDialog ()
-	{
-		_dialog->Destroy ();
-	}
-
-	int run ()
-	{
-		return _dialog->ShowModal ();
-	}
-
-private:	
-	wxMessageDialog* _dialog;
-};
-
-
-void
-maybe_save_then_delete_film ()
-{
-	if (!film) {
-		return;
-	}
-			
-	if (film->dirty ()) {
-		FilmChangedDialog d;
-		switch (d.run ()) {
-		case wxID_NO:
-			break;
-		case wxID_YES:
-			film->write_metadata ();
-			break;
-		}
-	}
-	
-	film.reset ();
-}
-
-enum Sensitivity {
-	ALWAYS,
-	NEEDS_FILM
-};
-
-map<wxMenuItem*, Sensitivity> menu_items;
-	
-void
-add_item (wxMenu* menu, wxString text, int id, Sensitivity sens)
-{
-	wxMenuItem* item = menu->Append (id, text);
-	menu_items.insert (make_pair (item, sens));
-}
-
-void
-set_menu_sensitivity ()
-{
-	for (map<wxMenuItem*, Sensitivity>::iterator i = menu_items.begin(); i != menu_items.end(); ++i) {
-		if (i->second == NEEDS_FILM) {
-			i->first->Enable (film != 0);
-		} else {
-			i->first->Enable (true);
-		}
-	}
-}
-
-enum {
-	ID_file_new = 1,
-	ID_file_open,
-	ID_file_save,
-	ID_file_properties,
-	ID_file_quit,
-	ID_edit_preferences,
-	ID_jobs_make_dcp,
-	ID_jobs_send_dcp_to_tms,
-	ID_jobs_show_dcp,
-	ID_jobs_analyse_audio,
-	ID_help_about
-};
-
-void
-setup_menu (wxMenuBar* m)
-{
-	wxMenu* file = new wxMenu;
-	add_item (file, _("New..."), ID_file_new, ALWAYS);
-	add_item (file, _("&Open..."), ID_file_open, ALWAYS);
-	file->AppendSeparator ();
-	add_item (file, _("&Save"), ID_file_save, NEEDS_FILM);
-	file->AppendSeparator ();
-	add_item (file, _("&Properties..."), ID_file_properties, NEEDS_FILM);
-	file->AppendSeparator ();
-	add_item (file, _("&Quit"), ID_file_quit, ALWAYS);
-
-	wxMenu* edit = new wxMenu;
-	add_item (edit, _("&Preferences..."), ID_edit_preferences, ALWAYS);
-
-	jobs_menu = new wxMenu;
-	add_item (jobs_menu, _("&Make DCP"), ID_jobs_make_dcp, NEEDS_FILM);
-	add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM);
-	add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM);
-	jobs_menu->AppendSeparator ();
-	add_item (jobs_menu, _("&Analyse audio"), ID_jobs_analyse_audio, NEEDS_FILM);
-
-	wxMenu* help = new wxMenu;
-	add_item (help, _("About"), ID_help_about, ALWAYS);
-
-	m->Append (file, _("&File"));
-	m->Append (edit, _("&Edit"));
-	m->Append (jobs_menu, _("&Jobs"));
-	m->Append (help, _("&Help"));
-}
-
-bool
-window_closed (wxCommandEvent &)
-{
-	maybe_save_then_delete_film ();
-	return false;
-}
-
-class Frame : public wxFrame
-{
-public:
-	Frame (wxString const & title)
-		: wxFrame (NULL, -1, title)
-	{
-		wxMenuBar* bar = new wxMenuBar;
-		setup_menu (bar);
-		SetMenuBar (bar);
-
-		Connect (ID_file_new, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_new));
-		Connect (ID_file_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_open));
-		Connect (ID_file_save, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_save));
-		Connect (ID_file_properties, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_properties));
-		Connect (ID_file_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_quit));
-		Connect (ID_edit_preferences, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::edit_preferences));
-		Connect (ID_jobs_make_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp));
-		Connect (ID_jobs_send_dcp_to_tms, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_send_dcp_to_tms));
-		Connect (ID_jobs_show_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_show_dcp));
-		Connect (ID_jobs_analyse_audio, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_analyse_audio));
-		Connect (ID_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about));
-
-		Connect (wxID_ANY, wxEVT_MENU_OPEN, wxMenuEventHandler (Frame::menu_opened));
-
-		wxPanel* panel = new wxPanel (this);
-		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		s->Add (panel, 1, wxEXPAND);
-		SetSizer (s);
-
-		film_editor = new FilmEditor (film, panel);
-		film_viewer = new FilmViewer (film, panel);
-		JobManagerView* job_manager_view = new JobManagerView (panel);
-
-		_top_sizer = new wxBoxSizer (wxHORIZONTAL);
-		_top_sizer->Add (film_editor, 0, wxALL, 6);
-		_top_sizer->Add (film_viewer, 1, wxEXPAND | wxALL, 6);
-
-		wxBoxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
-		main_sizer->Add (_top_sizer, 2, wxEXPAND | wxALL, 6);
-		main_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6);
-		panel->SetSizer (main_sizer);
-
-		set_menu_sensitivity ();
-
-		film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1));
-		if (film) {
-			file_changed (film->directory ());
-		} else {
-			file_changed ("");
-		}
-
-		set_film ();
-
-		film_editor->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (Frame::film_editor_sized), 0, this);
-	}
-
-private:
-
-	void film_editor_sized (wxSizeEvent &)
-	{
-		static bool in_layout = false;
-		if (!in_layout) {
-			in_layout = true;
-			_top_sizer->Layout ();
-			in_layout = false;
-		}
-	}
-
-	void menu_opened (wxMenuEvent& ev)
-	{
-		if (ev.GetMenu() != jobs_menu) {
-			return;
-		}
-
-		bool const have_dcp = film && film->have_dcp();
-		jobs_menu->Enable (ID_jobs_send_dcp_to_tms, have_dcp);
-		jobs_menu->Enable (ID_jobs_show_dcp, have_dcp);
-	}
-
-	void set_film ()
-	{
-		film_viewer->set_film (film);
-		film_editor->set_film (film);
-		set_menu_sensitivity ();
-	}
-
-	void file_changed (string f)
-	{
-		stringstream s;
-		s << wx_to_std (_("DVD-o-matic"));
-		if (!f.empty ()) {
-			s << " - " << f;
-		}
-		
-		SetTitle (std_to_wx (s.str()));
-	}
-	
-	void file_new (wxCommandEvent &)
-	{
-		NewFilmDialog* d = new NewFilmDialog (this);
-		int const r = d->ShowModal ();
-		
-		if (r == wxID_OK) {
-
-			if (boost::filesystem::exists (d->get_path())) {
-				error_dialog (this, std_to_wx (String::compose (wx_to_std (_("The directory %1 already exists.")), d->get_path().c_str())));
-				return;
-			}
-			
-			maybe_save_then_delete_film ();
-			film.reset (new Film (d->get_path (), false));
-			film->log()->set_level (log_level);
-			film->set_name (boost::filesystem::path (d->get_path()).filename().generic_string());
-			set_film ();
-		}
-		
-		d->Destroy ();
-	}
-
-	void file_open (wxCommandEvent &)
-	{
-		wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
-		int r;
-		while (1) {
-			r = c->ShowModal ();
-			if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) {
-				error_dialog (this, _("You did not select a folder.  Make sure that you select a folder before clicking Open."));
-			} else {
-				break;
-			}
-		}
-			
-		if (r == wxID_OK) {
-			maybe_save_then_delete_film ();
-			try {
-				film.reset (new Film (wx_to_std (c->GetPath ())));
-				film->log()->set_level (log_level);
-				set_film ();
-			} catch (std::exception& e) {
-				wxString p = c->GetPath ();
-				wxCharBuffer b = p.ToUTF8 ();
-				error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data()));
-			}
-		}
-
-		c->Destroy ();
-	}
-
-	void file_save (wxCommandEvent &)
-	{
-		film->write_metadata ();
-	}
-
-	void file_properties (wxCommandEvent &)
-	{
-		PropertiesDialog* d = new PropertiesDialog (this, film);
-		d->ShowModal ();
-		d->Destroy ();
-	}
-	
-	void file_quit (wxCommandEvent &)
-	{
-		maybe_save_then_delete_film ();
-		Close (true);
-	}
-
-	void edit_preferences (wxCommandEvent &)
-	{
-		ConfigDialog* d = new ConfigDialog (this);
-		d->ShowModal ();
-		d->Destroy ();
-		Config::instance()->write ();
-	}
-
-	void jobs_make_dcp (wxCommandEvent &)
-	{
-		JobWrapper::make_dcp (this, film);
-	}
-	
-	void jobs_send_dcp_to_tms (wxCommandEvent &)
-	{
-		film->send_dcp_to_tms ();
-	}
-
-	void jobs_show_dcp (wxCommandEvent &)
-	{
-#ifdef __WXMSW__
-		string d = film->directory();
-		wstring w;
-		w.assign (d.begin(), d.end());
-		ShellExecute (0, L"open", w.c_str(), 0, 0, SW_SHOWDEFAULT);
-#else
-		int r = system ("which nautilus");
-		if (WEXITSTATUS (r) == 0) {
-			system (string ("nautilus " + film->directory()).c_str ());
-		} else {
-			int r = system ("which konqueror");
-			if (WEXITSTATUS (r) == 0) {
-				system (string ("konqueror " + film->directory()).c_str ());
-			}
-		}
-#endif		
-	}
-
-	void jobs_analyse_audio (wxCommandEvent &)
-	{
-		film->analyse_audio ();
-	}
-	
-	void help_about (wxCommandEvent &)
-	{
-		wxAboutDialogInfo info;
-		info.SetName (_("DVD-o-matic"));
-		if (strcmp (dvdomatic_git_commit, "release") == 0) {
-			info.SetVersion (std_to_wx (String::compose ("version %1", dvdomatic_version)));
-		} else {
-			info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit)));
-		}
-		info.SetDescription (_("Free, open-source DCP generation from almost anything."));
-		info.SetCopyright (_("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"));
-
-		wxArrayString authors;
-		authors.Add (wxT ("Carl Hetherington"));
-		authors.Add (wxT ("Terrence Meiczinger"));
-		authors.Add (wxT ("Paul Davis"));
-		authors.Add (wxT ("Ole Laursen"));
-		info.SetDevelopers (authors);
-
-		wxArrayString translators;
-		translators.Add (wxT ("Olivier Perriere"));
-		translators.Add (wxT ("Lilian Lefranc"));
-		translators.Add (wxT ("Thierry Journet"));
-		translators.Add (wxT ("Massimiliano Broggi"));
-		translators.Add (wxT ("Manuel AC"));
-		translators.Add (wxT ("Adam Klotblixt"));
-		info.SetTranslators (translators);
-		
-		info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
-		wxAboutBox (info);
-	}
-
-	wxSizer* _top_sizer;
-};
-
-#if wxMINOR_VERSION == 9
-static const wxCmdLineEntryDesc command_line_description[] = {
-	{ wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-	{ wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-        { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
-	{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
-};
-#else
-static const wxCmdLineEntryDesc command_line_description[] = {
-	{ wxCMD_LINE_OPTION, wxT("l"), wxT("log"), wxT("set log level (silent, verbose or timing)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-	{ wxCMD_LINE_SWITCH, wxT("n"), wxT("new"), wxT("create new film"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-        { wxCMD_LINE_PARAM, 0, 0, wxT("film to load or create"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
-	{ wxCMD_LINE_NONE, wxT(""), wxT(""), wxT(""), wxCmdLineParamType (0), 0 }
-};
-#endif
-
-void
-setup_i18n ()
-{
-	int language = wxLANGUAGE_DEFAULT;
-
-	if (Config::instance()->language()) {
-		wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (Config::instance()->language().get()));
-		if (li) {
-			language = li->Language;
-		}
-	}
- 
-	if (wxLocale::IsAvailable (language)) {
-		locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT);
-
-#ifdef DVDOMATIC_WINDOWS
-		locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
-#endif		
-
-		locale->AddCatalog (wxT ("libdvdomatic-wx"));
-		locale->AddCatalog (wxT ("dvdomatic"));
-		
-		if (!locale->IsOk()) {
-			delete locale;
-			locale = new wxLocale (wxLANGUAGE_ENGLISH);
-			language = wxLANGUAGE_ENGLISH;
-		}
-	}
-
-	if (locale) {
-		dvdomatic_setup_i18n (wx_to_std (locale->GetCanonicalName ()));
-	}
-}
-
-class App : public wxApp
-{
-	bool OnInit ()
-	{
-		if (!wxApp::OnInit()) {
-			return false;
-		}
-		
-#ifdef DVDOMATIC_POSIX		
-		unsetenv ("UBUNTU_MENUPROXY");
-#endif		
-
-		wxInitAllImageHandlers ();
-
-		/* Enable i18n; this will create a Config object
-		   to look for a force-configured language.  This Config
-		   object will be wrong, however, because dvdomatic_setup
-		   hasn't yet been called and there aren't any scalers, filters etc.
-		   set up yet.
-		*/
-		setup_i18n ();
-
-		/* Set things up, including scalers / filters etc.
-		   which will now be internationalised correctly.
-		*/
-		dvdomatic_setup ();
-
-		/* Force the configuration to be re-loaded correctly next
-		   time it is needed.
-		*/
-		Config::drop ();
-
-		if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
-			try {
-				film.reset (new Film (film_to_load));
-				film->log()->set_level (log_level);
-			} catch (exception& e) {
-				error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load, e.what())));
-			}
-		}
-
-		if (!film_to_create.empty ()) {
-			film.reset (new Film (film_to_create, false));
-			film->log()->set_level (log_level);
-			film->set_name (boost::filesystem::path (film_to_create).filename().generic_string ());
-		}
-
-		Frame* f = new Frame (_("DVD-o-matic"));
-		SetTopWindow (f);
-		f->Maximize ();
-		f->Show ();
-
-		ui_signaller = new wxUISignaller (this);
-		this->Connect (-1, wxEVT_IDLE, wxIdleEventHandler (App::idle));
-
-		return true;
-	}
-
-	void OnInitCmdLine (wxCmdLineParser& parser)
-	{
-		parser.SetDesc (command_line_description);
-		parser.SetSwitchChars (wxT ("-"));
-	}
-
-	bool OnCmdLineParsed (wxCmdLineParser& parser)
-	{
-		if (parser.GetParamCount() > 0) {
-			if (parser.Found (wxT ("new"))) {
-				film_to_create = wx_to_std (parser.GetParam (0));
-			} else {
-				film_to_load = wx_to_std (parser.GetParam(0));
-			}
-		}
-
-		wxString log;
-		if (parser.Found (wxT ("log"), &log)) {
-			log_level = wx_to_std (log);
-		}
-
-		return true;
-	}
-
-	void idle (wxIdleEvent &)
-	{
-		ui_signaller->ui_idle ();
-	}
-};
-
-IMPLEMENT_APP (App)
diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 85134b3c5..e2e1874c4 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -47,9 +47,9 @@ static void
 help (string n)
 {
 	cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
-	     << "  -v, --version      show DVD-o-matic version\n"
+	     << "  -v, --version      show DCP-o-matic version\n"
 	     << "  -h, --help         show this help\n"
-	     << "  -d, --deps         list DVD-o-matic dependency details and quit\n"
+	     << "  -d, --deps         list DCP-o-matic dependency details and quit\n"
 	     << "  -t, --test         run in test mode (repeatable UUID generation, timestamps etc.)\n"
 	     << "  -n, --no-progress  do not print progress to stdout\n"
 	     << "  -r, --no-remote    do not use any remote servers\n"
@@ -87,7 +87,7 @@ main (int argc, char* argv[])
 
 		switch (c) {
 		case 'v':
-			cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
+			cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
 			exit (EXIT_SUCCESS);
 		case 'h':
 			help (argv[0]);
@@ -117,13 +117,13 @@ main (int argc, char* argv[])
 
 	film_dir = argv[optind];
 			
-	dvdomatic_setup ();
+	dcpomatic_setup ();
 
 	if (no_remote) {
 		Config::instance()->set_servers (vector<ServerDescription*> ());
 	}
 
-	cout << "DVD-o-matic " << dvdomatic_version << " git " << dvdomatic_git_commit;
+	cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
 	char buf[256];
 	if (gethostname (buf, 256) == 0) {
 		cout << " on " << buf;
@@ -162,7 +162,7 @@ main (int argc, char* argv[])
 	bool error = false;
 	while (!should_stop) {
 
-		dvdomatic_sleep (5);
+		dcpomatic_sleep (5);
 
 		list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
 
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index abfbfef6d..d35f104c6 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVDOMATIC\n"
+"Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-23 21:08-0500\n"
@@ -17,111 +17,111 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dcpomatic.cc:177
 msgid "&Analyse audio"
 msgstr "&Analizar audio"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dcpomatic.cc:183
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:182
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dcpomatic.cc:185
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dcpomatic.cc:184
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dvdomatic.cc:173
+#: src/tools/dcpomatic.cc:173
 msgid "&Make DCP"
 msgstr "&Crear DCP"
 
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:161
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:170
 msgid "&Preferences..."
 msgstr "&Preferencias..."
 
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dcpomatic.cc:165
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dcpomatic.cc:167
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dcpomatic.cc:163
 msgid "&Save"
 msgstr "&Guardar"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dcpomatic.cc:174
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dvdomatic.cc:417
+#: src/tools/dcpomatic.cc:417
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:180
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dvdomatic.cc:527
+#: src/tools/dcpomatic.cc:527
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dvdomatic.cc:339
+#: src/tools/dcpomatic.cc:339
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "No se pudo cargar la película en %s (%s)"
 
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
-#: src/tools/dvdomatic.cc:531
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:531
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dcpomatic.cc:75
 msgid "Film changed"
 msgstr "Película cambiada"
 
-#: src/tools/dvdomatic.cc:416
+#: src/tools/dcpomatic.cc:416
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 "Generación de DCP a partir de casi cualquier fuente, libre y de código "
 "abierto."
 
-#: src/tools/dvdomatic.cc:160
+#: src/tools/dcpomatic.cc:160
 msgid "New..."
 msgstr "Nuevo..."
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dcpomatic.cc:175
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dvdomatic.cc:74
+#: src/tools/dcpomatic.cc:74
 msgid "Save changes to film \"%s\" before closing?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:319
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dvdomatic.cc:303
+#: src/tools/dcpomatic.cc:303
 #, fuzzy
 msgid "The directory %1 already exists."
 msgstr "La carpeta %s ya existe."
 
-#: src/tools/dvdomatic.cc:324
+#: src/tools/dcpomatic.cc:324
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index b40c86877..ef2246992 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic FRENCH\n"
+"Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-13 22:33+0100\n"
@@ -16,109 +16,109 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dcpomatic.cc:177
 msgid "&Analyse audio"
 msgstr "&Analyser le son"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dcpomatic.cc:183
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:182
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dcpomatic.cc:185
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dcpomatic.cc:184
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dvdomatic.cc:173
+#: src/tools/dcpomatic.cc:173
 msgid "&Make DCP"
 msgstr "&Créer le DCP"
 
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:161
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:170
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dcpomatic.cc:165
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dcpomatic.cc:167
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dcpomatic.cc:163
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dcpomatic.cc:174
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP dans le TMS"
 
-#: src/tools/dvdomatic.cc:417
+#: src/tools/dcpomatic.cc:417
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:180
 msgid "About"
 msgstr "A Propos"
 
-#: src/tools/dvdomatic.cc:527
+#: src/tools/dcpomatic.cc:527
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %s (%s)"
 
-#: src/tools/dvdomatic.cc:339
+#: src/tools/dcpomatic.cc:339
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
-#: src/tools/dvdomatic.cc:531
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:531
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dcpomatic.cc:75
 msgid "Film changed"
 msgstr "Film changé"
 
-#: src/tools/dvdomatic.cc:416
+#: src/tools/dcpomatic.cc:416
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Création de DCP libre et open-source à partir de presque tout."
 
-#: src/tools/dvdomatic.cc:160
+#: src/tools/dcpomatic.cc:160
 msgid "New..."
 msgstr "Nouveau..."
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dcpomatic.cc:175
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dvdomatic.cc:74
+#: src/tools/dcpomatic.cc:74
 msgid "Save changes to film \"%s\" before closing?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:319
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dvdomatic.cc:303
+#: src/tools/dcpomatic.cc:303
 #, fuzzy
 msgid "The directory %1 already exists."
 msgstr "Le dossier %s existe déjà."
 
-#: src/tools/dvdomatic.cc:324
+#: src/tools/dcpomatic.cc:324
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 38cbec157..998f70059 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -17,107 +17,107 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dcpomatic.cc:177
 msgid "&Analyse audio"
 msgstr "&Analizza audio"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dcpomatic.cc:183
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:182
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dcpomatic.cc:185
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dcpomatic.cc:184
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dvdomatic.cc:173
+#: src/tools/dcpomatic.cc:173
 msgid "&Make DCP"
 msgstr "&Crea DCP"
 
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:161
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:170
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dcpomatic.cc:165
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dcpomatic.cc:167
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dcpomatic.cc:163
 msgid "&Save"
 msgstr "&Salva"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dcpomatic.cc:174
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dvdomatic.cc:417
+#: src/tools/dcpomatic.cc:417
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:180
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dvdomatic.cc:527
+#: src/tools/dcpomatic.cc:527
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dvdomatic.cc:339
+#: src/tools/dcpomatic.cc:339
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
-#: src/tools/dvdomatic.cc:531
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:531
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dcpomatic.cc:75
 msgid "Film changed"
 msgstr "Film modificato"
 
-#: src/tools/dvdomatic.cc:416
+#: src/tools/dcpomatic.cc:416
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Genera DCP da quasi tutto, free e open-source."
 
-#: src/tools/dvdomatic.cc:160
+#: src/tools/dcpomatic.cc:160
 msgid "New..."
 msgstr "Nuovo"
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dcpomatic.cc:175
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dvdomatic.cc:74
+#: src/tools/dcpomatic.cc:74
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:319
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dvdomatic.cc:303
+#: src/tools/dcpomatic.cc:303
 msgid "The directory %1 already exists."
 msgstr "La directory %s esiste gia'."
 
-#: src/tools/dvdomatic.cc:324
+#: src/tools/dcpomatic.cc:324
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 57254770c..4765c2d98 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic\n"
+"Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-09 10:12+0100\n"
@@ -17,108 +17,108 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dcpomatic.cc:177
 msgid "&Analyse audio"
 msgstr "&Analysera audio"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dcpomatic.cc:183
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:182
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dcpomatic.cc:185
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dcpomatic.cc:184
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dvdomatic.cc:173
+#: src/tools/dcpomatic.cc:173
 msgid "&Make DCP"
 msgstr "&Skapa DCP"
 
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:161
 msgid "&Open..."
 msgstr "&Öppna"
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:170
 msgid "&Preferences..."
 msgstr "&Inställningar"
 
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dcpomatic.cc:165
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dcpomatic.cc:167
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dcpomatic.cc:163
 msgid "&Save"
 msgstr "&Spara"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dcpomatic.cc:174
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dvdomatic.cc:417
+#: src/tools/dcpomatic.cc:417
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:180
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dvdomatic.cc:527
+#: src/tools/dcpomatic.cc:527
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dvdomatic.cc:339
+#: src/tools/dcpomatic.cc:339
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
-#: src/tools/dvdomatic.cc:531
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:531
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dcpomatic.cc:75
 msgid "Film changed"
 msgstr "Film ändrad"
 
-#: src/tools/dvdomatic.cc:416
+#: src/tools/dcpomatic.cc:416
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 "Fri, öppen-källkodsprogramvara för DCP-generering från nästan vad som helst."
 
-#: src/tools/dvdomatic.cc:160
+#: src/tools/dcpomatic.cc:160
 msgid "New..."
 msgstr "Ny..."
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dcpomatic.cc:175
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dvdomatic.cc:74
+#: src/tools/dcpomatic.cc:74
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:319
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dvdomatic.cc:303
+#: src/tools/dcpomatic.cc:303
 msgid "The directory %1 already exists."
 msgstr "Katalogen %1 finns redan."
 
-#: src/tools/dvdomatic.cc:324
+#: src/tools/dcpomatic.cc:324
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/servomatic_cli.cc b/src/tools/servomatic_cli.cc
index 6626d45b9..76d085034 100644
--- a/src/tools/servomatic_cli.cc
+++ b/src/tools/servomatic_cli.cc
@@ -51,7 +51,7 @@ static void
 help (string n)
 {
 	cerr << "Syntax: " << n << " [OPTION]\n"
-	     << "  -v, --version      show DVD-o-matic version\n"
+	     << "  -v, --version      show DCP-o-matic version\n"
 	     << "  -h, --help         show this help\n"
 	     << "  -t, --threads      number of parallel encoding threads to use\n";
 }
@@ -78,7 +78,7 @@ main (int argc, char* argv[])
 
 		switch (c) {
 		case 'v':
-			cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
+			cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
 			exit (EXIT_SUCCESS);
 		case 'h':
 			help (argv[0]);
diff --git a/src/tools/servomatic_gui.cc b/src/tools/servomatic_gui.cc
index 5e36660eb..152e063c1 100644
--- a/src/tools/servomatic_gui.cc
+++ b/src/tools/servomatic_gui.cc
@@ -61,7 +61,7 @@ class StatusDialog : public wxDialog
 {
 public:
 	StatusDialog ()
-		: wxDialog (0, wxID_ANY, _("DVD-o-matic encode server"), wxDefaultPosition, wxSize (600, 80), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+		: wxDialog (0, wxID_ANY, _("DCP-o-matic encode server"), wxDefaultPosition, wxSize (600, 80), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 		, _timer (this, ID_timer)
 	{
 		_sizer = new wxFlexGridSizer (1, 6, 6);
@@ -103,7 +103,7 @@ public:
 		wxIcon icon;
 		icon.CopyFromBitmap (bitmap);
 #endif		
-		SetIcon (icon, std_to_wx ("DVD-o-matic encode server"));
+		SetIcon (icon, std_to_wx ("DCP-o-matic encode server"));
 
 		Connect (ID_status, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::status));
 		Connect (ID_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::quit));
@@ -147,7 +147,7 @@ private:
 			return false;
 		}
 		
-		dvdomatic_setup ();
+		dcpomatic_setup ();
 
 		_icon = new TaskBarIcon;
 		_thread = new thread (bind (&App::main_thread, this));
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index d3222faa3..42cc76871 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -145,7 +145,7 @@ main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 
-	dvdomatic_setup ();
+	dcpomatic_setup ();
 
 	server = new ServerDescription (server_host, 1);
 	shared_ptr<Film> film (new Film (film_dir, true));
diff --git a/src/tools/wscript b/src/tools/wscript
index 9cc7e9d1b..f0ffb8e89 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -8,25 +8,25 @@ def build(bld):
         obj = bld(features = 'cxx cxxprogram')
         obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
         obj.includes = ['..']
-        obj.use    = ['libdvdomatic']
+        obj.use    = ['libdcpomatic']
         obj.source = '%s.cc' % t
         obj.target = t
 
     if not bld.env.DISABLE_GUI:
-        for t in ['dvdomatic', 'servomatic_gui']:
+        for t in ['dcpomatic', 'servomatic_gui']:
             obj = bld(features = 'cxx cxxprogram')
             obj.uselib = 'DCP CXML OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
             obj.includes = ['..']
-            obj.use    = ['libdvdomatic', 'libdvdomatic-wx']
+            obj.use    = ['libdcpomatic', 'libdcpomatic-wx']
             obj.source = '%s.cc' % t
             if bld.env.TARGET_WINDOWS:
-                obj.source += ' ../../windows/dvdomatic.rc'
+                obj.source += ' ../../windows/dcpomatic.rc'
             obj.target = t
 
-        i18n.po_to_mo(os.path.join('src', 'tools'), 'dvdomatic', bld)
+        i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'tools'), 'dvdomatic.cc', 'dvdomatic')
+    i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc', 'dcpomatic')
 
 def pot_merge(bld):
-    i18n.pot_merge(os.path.join('src', 'tools'), 'dvdomatic')
+    i18n.pot_merge(os.path.join('src', 'tools'), 'dcpomatic')
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index bed7aac6d..15d746839 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -100,7 +100,7 @@ AudioDialog::set_film (shared_ptr<Film> f)
 	_film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
 	_film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this));
 
-	SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data()));
+	SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_film->name()).data()));
 }
 
 
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 1d025f3fa..4ae8f1eb4 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -18,7 +18,7 @@
 */
 
 /** @file src/config_dialog.cc
- *  @brief A dialogue to edit DVD-o-matic configuration.
+ *  @brief A dialogue to edit DCP-o-matic configuration.
  */
 
 #include <iostream>
@@ -41,7 +41,7 @@ using namespace std;
 using boost::bind;
 
 ConfigDialog::ConfigDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("DVD-o-matic Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+	: wxDialog (parent, wxID_ANY, _("DCP-o-matic Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
 	wxFlexGridSizer* table = new wxFlexGridSizer (3, 6, 6);
 	table->AddGrowableCol (1, 1);
@@ -58,7 +58,7 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	table->AddSpacer (0);
 
 	table->AddSpacer (0);
-	wxStaticText* restart = add_label_to_sizer (table, this, _("(restart DVD-o-matic to see language changes)"));
+	wxStaticText* restart = add_label_to_sizer (table, this, _("(restart DCP-o-matic to see language changes)"));
 	wxFont font = restart->GetFont();
 	font.SetStyle (wxFONTSTYLE_ITALIC);
 	font.SetPointSize (font.GetPointSize() - 1);
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index f6f3b3707..a2fc1f4b1 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -18,7 +18,7 @@
 */
 
 /** @file src/config_dialog.h
- *  @brief A dialogue to edit DVD-o-matic configuration.
+ *  @brief A dialogue to edit DCP-o-matic configuration.
  */
 
 #include <wx/wx.h>
@@ -31,7 +31,7 @@ class DirPickerCtrl;
 class ServerDescription;
 
 /** @class ConfigDialog
- *  @brief A dialogue to edit DVD-o-matic configuration.
+ *  @brief A dialogue to edit DCP-o-matic configuration.
  */
 class ConfigDialog : public wxDialog
 {
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 207708589..abb6b780f 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libdvdomatic-wx\n"
+"Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-02 19:08-0500\n"
@@ -22,7 +22,7 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/config_dialog.cc:61
-msgid "(restart DVD-o-matic to see language changes)"
+msgid "(restart DCP-o-matic to see language changes)"
 msgstr ""
 
 #: src/wx/film_editor.cc:1269
@@ -141,17 +141,17 @@ msgid "DCP Name"
 msgstr "Nombre DCP"
 
 #: src/wx/wx_util.cc:61
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
 #: src/wx/config_dialog.cc:44
-msgid "DVD-o-matic Preferences"
-msgstr "Preferencias DVD-o-matic"
+msgid "DCP-o-matic Preferences"
+msgstr "Preferencias DCP-o-matic"
 
 #: src/wx/audio_dialog.cc:101
 #, fuzzy, c-format
-msgid "DVD-o-matic audio - %s"
-msgstr "Audio DVD-o-matic - %1"
+msgid "DCP-o-matic audio - %s"
+msgstr "Audio DCP-o-matic - %1"
 
 #: src/wx/config_dialog.cc:102
 msgid "Default DCI name details"
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 80ee5dbfd..2aac7114c 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic FRENCH\n"
+"Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-20 00:34+0100\n"
@@ -21,7 +21,7 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/config_dialog.cc:61
-msgid "(restart DVD-o-matic to see language changes)"
+msgid "(restart DCP-o-matic to see language changes)"
 msgstr ""
 
 #: src/wx/film_editor.cc:1269
@@ -140,17 +140,17 @@ msgid "DCP Name"
 msgstr "Nom du DCP"
 
 #: src/wx/wx_util.cc:61
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
 #: src/wx/config_dialog.cc:44
-msgid "DVD-o-matic Preferences"
-msgstr "Préférences DVD-o-matic"
+msgid "DCP-o-matic Preferences"
+msgstr "Préférences DCP-o-matic"
 
 #: src/wx/audio_dialog.cc:101
 #, c-format
-msgid "DVD-o-matic audio - %s"
-msgstr "Son DVD-o-matic  - %s"
+msgid "DCP-o-matic audio - %s"
+msgstr "Son DCP-o-matic  - %s"
 
 #: src/wx/config_dialog.cc:102
 msgid "Default DCI name details"
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 78fd0dee9..7b06495e8 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -22,8 +22,8 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/config_dialog.cc:61
-msgid "(restart DVD-o-matic to see language changes)"
-msgstr "(riavviare DVD-o-matic per vedere i cambiamenti di lingua)"
+msgid "(restart DCP-o-matic to see language changes)"
+msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 
 #: src/wx/film_editor.cc:1269
 msgid "1 channel"
@@ -141,17 +141,17 @@ msgid "DCP Name"
 msgstr "Nome del DCP"
 
 #: src/wx/wx_util.cc:61
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
 #: src/wx/config_dialog.cc:44
-msgid "DVD-o-matic Preferences"
-msgstr "Preferenze DVD-o-matic"
+msgid "DCP-o-matic Preferences"
+msgstr "Preferenze DCP-o-matic"
 
 #: src/wx/audio_dialog.cc:101
 #, c-format
-msgid "DVD-o-matic audio - %s"
-msgstr "Audio DVD-o-matic - %s"
+msgid "DCP-o-matic audio - %s"
+msgstr "Audio DCP-o-matic - %s"
 
 #: src/wx/config_dialog.cc:102
 msgid "Default DCI name details"
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index e52589ff0..96fafadeb 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic\n"
+"Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-09 10:13+0100\n"
@@ -22,8 +22,8 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/config_dialog.cc:61
-msgid "(restart DVD-o-matic to see language changes)"
-msgstr "(starta om DVD-o-matic för att se språkändringar)"
+msgid "(restart DCP-o-matic to see language changes)"
+msgstr "(starta om DCP-o-matic för att se språkändringar)"
 
 #: src/wx/film_editor.cc:1269
 msgid "1 channel"
@@ -141,17 +141,17 @@ msgid "DCP Name"
 msgstr "DCP Namn"
 
 #: src/wx/wx_util.cc:61
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
 #: src/wx/config_dialog.cc:44
-msgid "DVD-o-matic Preferences"
-msgstr "DVD-o-matic Inställningar"
+msgid "DCP-o-matic Preferences"
+msgstr "DCP-o-matic Inställningar"
 
 #: src/wx/audio_dialog.cc:101
 #, c-format
-msgid "DVD-o-matic audio - %s"
-msgstr "DVD-o-matic audio - %s"
+msgid "DCP-o-matic audio - %s"
+msgstr "DCP-o-matic audio - %s"
 
 #: src/wx/config_dialog.cc:102
 msgid "Default DCI name details"
diff --git a/src/wx/wscript b/src/wx/wscript
index 7f9cde9ac..09bf40393 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -34,18 +34,18 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name   = 'libdvdomatic-wx'
+    obj.name   = 'libdcpomatic-wx'
     obj.includes = [ '..' ]
     obj.export_includes = ['.']
     obj.uselib = 'WXWIDGETS'
-    obj.use = 'libdvdomatic'
+    obj.use = 'libdcpomatic'
     obj.source = sources
-    obj.target = 'dvdomatic-wx'
+    obj.target = 'dcpomatic-wx'
 
-    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdvdomatic-wx', bld)
+    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'wx'), sources, 'libdvdomatic-wx')
+    i18n.pot(os.path.join('src', 'wx'), sources, 'libdcpomatic-wx')
 
 def pot_merge(bld):
-    i18n.pot_merge(os.path.join('src', 'wx'), 'libdvdomatic-wx')
+    i18n.pot_merge(os.path.join('src', 'wx'), 'libdcpomatic-wx')
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 720a058cb..3dad6e7fd 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -58,7 +58,7 @@ add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, wxGBPos
 void
 error_dialog (wxWindow* parent, wxString m)
 {
-	wxMessageDialog* d = new wxMessageDialog (parent, m, _("DVD-o-matic"), wxOK);
+	wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK);
 	d->ShowModal ();
 	d->Destroy ();
 }
diff --git a/test/test.cc b/test/test.cc
index 592bad836..39a921d36 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -42,7 +42,7 @@
 #include "sndfile_decoder.h"
 #include "dcp_content_type.h"
 #define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE dvdomatic_test
+#define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
 
 using std::string;
@@ -90,7 +90,7 @@ new_test_film (string name)
 BOOST_AUTO_TEST_CASE (make_black_test)
 {
 	/* This needs to happen in the first test */
-	dvdomatic_setup ();
+	dcpomatic_setup ();
 
 	libdcp::Size in_size (512, 512);
 	libdcp::Size out_size (1024, 1024);
@@ -392,7 +392,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 	new thread (boost::bind (&Server::run, server, 2));
 
 	/* Let the server get itself ready */
-	dvdomatic_sleep (1);
+	dcpomatic_sleep (1);
 
 	ServerDescription description ("localhost", 2);
 
@@ -421,7 +421,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_test)
 	film->write_metadata ();
 
 	while (JobManager::instance()->work_to_do ()) {
-		dvdomatic_sleep (1);
+		dcpomatic_sleep (1);
 	}
 	
 	BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
@@ -452,7 +452,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
 	film->make_dcp ();
 
 	while (JobManager::instance()->work_to_do() && !JobManager::instance()->errors()) {
-		dvdomatic_sleep (1);
+		dcpomatic_sleep (1);
 	}
 
 	BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
@@ -689,10 +689,10 @@ BOOST_AUTO_TEST_CASE (job_manager_test)
 	shared_ptr<TestJob> a (new TestJob (f));
 
 	JobManager::instance()->add (a);
-	dvdomatic_sleep (1);
+	dcpomatic_sleep (1);
 	BOOST_CHECK_EQUAL (a->running (), true);
 	a->set_finished_ok ();
-	dvdomatic_sleep (2);
+	dcpomatic_sleep (2);
 	BOOST_CHECK_EQUAL (a->finished_ok(), true);
 }
 
diff --git a/test/wscript b/test/wscript
index 493270903..61c391663 100644
--- a/test/wscript
+++ b/test/wscript
@@ -9,7 +9,7 @@ def build(bld):
     obj = bld(features = 'cxx cxxprogram')
     obj.name   = 'unit-tests'
     obj.uselib = 'BOOST_TEST CXML DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
-    obj.use    = 'libdvdomatic'
+    obj.use    = 'libdcpomatic'
     obj.source = 'test.cc'
     obj.target = 'unit-tests'
     obj.install_path = ''
diff --git a/windows/dvdomatic.bmp b/windows/dvdomatic.bmp
deleted file mode 100644
index 0a196f7a0..000000000
Binary files a/windows/dvdomatic.bmp and /dev/null differ
diff --git a/windows/dvdomatic.ico b/windows/dvdomatic.ico
deleted file mode 100644
index 225008cfe..000000000
Binary files a/windows/dvdomatic.ico and /dev/null differ
diff --git a/windows/dvdomatic.rc b/windows/dvdomatic.rc
deleted file mode 100644
index 17790cf0d..000000000
--- a/windows/dvdomatic.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-id ICON "dvdomatic.ico"
-taskbar_icon ICON "dvdomatic_taskbar.ico"
-#include "wx-2.9/wx/msw/wx.rc"
diff --git a/windows/dvdomatic_taskbar.ico b/windows/dvdomatic_taskbar.ico
deleted file mode 100644
index f4489fa14..000000000
Binary files a/windows/dvdomatic_taskbar.ico and /dev/null differ
diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in
index 553a94d2b..15a0a1886 100644
--- a/windows/installer.nsi.32.in
+++ b/windows/installer.nsi.32.in
@@ -1,14 +1,14 @@
 !include "MUI2.nsh"
-Name "DVD-o-matic"
+Name "DCP-o-matic"
 
 RequestExecutionLevel admin
 
-outFile "DVD-o-matic @version@ 32-bit Installer.exe"
-!define MUI_ICON "%resources%/dvdomatic.ico"
-!define MUI_UNICON "%resources%/dvdomatic.ico"
-!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp"
+outFile "DCP-o-matic @version@ 32-bit Installer.exe"
+!define MUI_ICON "%resources%/dcpomatic.ico"
+!define MUI_UNICON "%resources%/dcpomatic.ico"
+!define MUI_SPECIALBITMAP "%resources%/dcpomatic.bmp"
 
-InstallDir "$PROGRAMFILES\DVD-o-matic"
+InstallDir "$PROGRAMFILES\DCP-o-matic"
 
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "../../COPYING"
@@ -81,9 +81,9 @@ File "%deps%/bin/libexpat-1.dll"
 File "%deps%/bin/libbz2.dll"
 File "%deps%/bin/cxml.dll"
 
-File "%binaries%/src/wx/dvdomatic-wx.dll"
-File "%binaries%/src/lib/dvdomatic.dll"
-File "%binaries%/src/tools/dvdomatic.exe"
+File "%binaries%/src/wx/dcpomatic-wx.dll"
+File "%binaries%/src/lib/dcpomatic.dll"
+File "%binaries%/src/tools/dcpomatic.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.exe"
 
@@ -95,32 +95,32 @@ SetOutPath "$PROFILE\.magick"
 File "%deps%/etc/ImageMagick/delegates.xml"
 
 SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES"
-File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo"
-File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo"
-File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo"
+File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/fr_FR/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/fr_FR/dcpomatic.mo"
 SetOutPath "$INSTDIR\locale\it\LC_MESSAGES"
-File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo"
-File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo"
-File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo"
+File "%binaries%/src/lib/mo/it_IT/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/it_IT/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/it_IT/dcpomatic.mo"
 SetOutPath "$INSTDIR\locale\es\LC_MESSAGES"
-File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo"
-File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo"
-File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo"
+File "%binaries%/src/lib/mo/es_ES/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/es_ES/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/es_ES/dcpomatic.mo"
 SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES"
-File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo"
-File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo"
-File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo"
+File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo"
 
-CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
-CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
+CreateShortCut "$DESKTOP\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" ""
+CreateShortCut "$DESKTOP\DCP-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
  
-CreateDirectory "$SMPROGRAMS\DVD-o-matic"
-CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
-CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
-CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0
+CreateDirectory "$SMPROGRAMS\DCP-o-matic"
+CreateShortCut "$SMPROGRAMS\DCP-o-matic\Uninstall DCP-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" "" "$INSTDIR\bin\dcpomatic.exe" 0
+CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0
  
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe"
  
 WriteUninstaller "$INSTDIR\Uninstall.exe"
  
@@ -131,11 +131,11 @@ Section "Uninstall"
  
 RMDir /r "$INSTDIR\*.*"    
 RMDir "$INSTDIR"
-Delete "$DESKTOP\DVD-o-matic.lnk"
-Delete "$DESKTOP\DVD-o-matic encode server.lnk"
-Delete "$SMPROGRAMS\DVD-o-matic\*.*"
-RmDir  "$SMPROGRAMS\DVD-o-matic"
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic"
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic"
+Delete "$DESKTOP\DCP-o-matic.lnk"
+Delete "$DESKTOP\DCP-o-matic encode server.lnk"
+Delete "$SMPROGRAMS\DCP-o-matic\*.*"
+RmDir  "$SMPROGRAMS\DCP-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DCP-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic"
  
 SectionEnd
diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index bb5456936..566907e39 100644
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -1,16 +1,16 @@
 !include "MUI2.nsh"
 !include "x64.nsh"
 
-Name "DVD-o-matic"
+Name "DCP-o-matic"
 
 RequestExecutionLevel admin
 
-outFile "DVD-o-matic @version@ 64-bit Installer.exe"
-!define MUI_ICON "%resources%/dvdomatic.ico"
-!define MUI_UNICON "%resources%/dvdomatic.ico"
-!define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp"
+outFile "DCP-o-matic @version@ 64-bit Installer.exe"
+!define MUI_ICON "%resources%/dcpomatic.ico"
+!define MUI_UNICON "%resources%/dcpomatic.ico"
+!define MUI_SPECIALBITMAP "%resources%/dcpomatic.bmp"
 
-InstallDir "$PROGRAMFILES\DVD-o-matic"
+InstallDir "$PROGRAMFILES\DCP-o-matic"
 
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "../../COPYING"
@@ -32,7 +32,7 @@ ${If} ${RunningX64}
    ; disable registry redirection (enable access to 64-bit portion of registry)
    SetRegView 64
    ; change install dir
-   StrCpy $INSTDIR "$PROGRAMFILES64\DVD-o-matic"
+   StrCpy $INSTDIR "$PROGRAMFILES64\DCP-o-matic"
 ${EndIf}
 
 SetOutPath "$INSTDIR\bin"
@@ -91,9 +91,9 @@ File "%deps%/bin/libexpat-1.dll"
 File "%deps%/bin/libbz2.dll"
 File "%deps%/bin/cxml.dll"
 
-File "%binaries%/src/wx/dvdomatic-wx.dll"
-File "%binaries%/src/lib/dvdomatic.dll"
-File "%binaries%/src/tools/dvdomatic.exe"
+File "%binaries%/src/wx/dcpomatic-wx.dll"
+File "%binaries%/src/lib/dcpomatic.dll"
+File "%binaries%/src/tools/dcpomatic.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.exe"
 
@@ -105,32 +105,32 @@ SetOutPath "$PROFILE\.magick"
 File "%deps%/etc/ImageMagick/delegates.xml"
 
 SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES"
-File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo"
-File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo"
-File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo"
+File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/fr_FR/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/fr_FR/dcpomatic.mo"
 SetOutPath "$INSTDIR\locale\it\LC_MESSAGES"
-File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo"
-File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo"
-File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo"
+File "%binaries%/src/lib/mo/it_IT/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/it_IT/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/it_IT/dcpomatic.mo"
 SetOutPath "$INSTDIR\locale\es\LC_MESSAGES"
-File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo"
-File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo"
-File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo"
+File "%binaries%/src/lib/mo/es_ES/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/es_ES/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/es_ES/dcpomatic.mo"
 SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES"
-File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo"
-File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo"
-File "%binaries%/src/tools/mo/sv_SE/dvdomatic.mo"
+File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo"
 
-CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
-CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
+CreateShortCut "$DESKTOP\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" ""
+CreateShortCut "$DESKTOP\DCP-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
  
-CreateDirectory "$SMPROGRAMS\DVD-o-matic"
-CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
-CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
-CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0
+CreateDirectory "$SMPROGRAMS\DCP-o-matic"
+CreateShortCut "$SMPROGRAMS\DCP-o-matic\Uninstall DCP-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic.lnk" "$INSTDIR\bin\dcpomatic.exe" "" "$INSTDIR\bin\dcpomatic.exe" 0
+CreateShortCut "$SMPROGRAMS\DCP-o-matic\DCP-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0
  
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "DisplayName" "DVD-o-matic (remove only)"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic" "UninstallString" "$INSTDIR\Uninstall.exe"
  
 WriteUninstaller "$INSTDIR\Uninstall.exe"
  
@@ -141,11 +141,11 @@ Section "Uninstall"
  
 RMDir /r "$INSTDIR\*.*"    
 RMDir "$INSTDIR"
-Delete "$DESKTOP\DVD-o-matic.lnk"
-Delete "$DESKTOP\DVD-o-matic encode server.lnk"
-Delete "$SMPROGRAMS\DVD-o-matic\*.*"
-RmDir  "$SMPROGRAMS\DVD-o-matic"
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic"
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic"
+Delete "$DESKTOP\DCP-o-matic.lnk"
+Delete "$DESKTOP\DCP-o-matic encode server.lnk"
+Delete "$SMPROGRAMS\DCP-o-matic\*.*"
+RmDir  "$SMPROGRAMS\DCP-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DCP-o-matic"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DCP-o-matic"
  
 SectionEnd
diff --git a/wscript b/wscript
index 502f27fd1..f784d760d 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,7 @@ import subprocess
 import os
 import sys
 
-APPNAME = 'dvdomatic'
+APPNAME = 'dcpomatic'
 VERSION = '0.84pre'
 
 def options(opt):
@@ -25,7 +25,7 @@ def configure(conf):
                                        '-Wall', '-Wno-attributes', '-Wextra'])
 
     if conf.options.target_windows:
-        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
+        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
         wxrc = os.popen('wx-config --rescomp').read().split()[1:]
         conf.env.append_value('WINRCFLAGS', wxrc)
         if conf.options.enable_debug:
@@ -35,9 +35,9 @@ def configure(conf):
         boost_lib_suffix = '-mt'
         boost_thread = 'boost_thread_win32-mt'
     else:
-        conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX')
+        conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX')
         conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX'])
-        conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dvdomatic"' % conf.env['PREFIX'])
+        conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['PREFIX'])
         boost_lib_suffix = ''
         boost_thread = 'boost_thread'
         conf.env.append_value('LINKFLAGS', '-pthread')
@@ -50,7 +50,7 @@ def configure(conf):
     conf.env.VERSION = VERSION
 
     if conf.options.enable_debug:
-        conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG'])
+        conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG'])
     else:
         conf.env.append_value('CXXFLAGS', '-O2')
 
@@ -228,16 +228,16 @@ def build(bld):
     d = { 'PREFIX' : '${PREFIX' }
 
     obj = bld(features = 'subst')
-    obj.source = 'dvdomatic.desktop.in'
-    obj.target = 'dvdomatic.desktop'
+    obj.source = 'dcpomatic.desktop.in'
+    obj.target = 'dcpomatic.desktop'
     obj.dict = d
 
-    bld.install_files('${PREFIX}/share/applications', 'dvdomatic.desktop')
+    bld.install_files('${PREFIX}/share/applications', 'dcpomatic.desktop')
     for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
-        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)
+        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic.png' % r)
 
     if not bld.env.TARGET_WINDOWS:
-        bld.install_files('${PREFIX}/share/dvdomatic', 'icons/taskbar_icon.png')
+        bld.install_files('${PREFIX}/share/dcpomatic', 'icons/taskbar_icon.png')
 
     bld.add_post_fun(post)
 
@@ -259,8 +259,8 @@ def create_version_cc(version):
 
     try:
         text =  '#include "version.h"\n'
-        text += 'char const * dvdomatic_git_commit = \"%s\";\n' % commit
-        text += 'char const * dvdomatic_version = \"%s\";\n' % version
+        text += 'char const * dcpomatic_git_commit = \"%s\";\n' % commit
+        text += 'char const * dcpomatic_version = \"%s\";\n' % version
         print('Writing version information to src/lib/version.cc')
         o = open('src/lib/version.cc', 'w')
         o.write(text)
-- 
cgit v1.2.3


From 7fb622a18582f18fcc6cfe140a262fd6cc8cad88 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 14 Apr 2013 00:48:27 +0100
Subject: Fix mapping of audio in DCP.

---
 src/lib/audio_mapping.cc |  2 +-
 src/lib/encoder.cc       |  6 +++---
 src/lib/player.cc        | 31 ++++++++++++++++---------------
 src/lib/player.h         |  2 +-
 4 files changed, 21 insertions(+), 20 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index b85ea7314..2e8077565 100644
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -41,7 +41,7 @@ int
 AudioMapping::dcp_channels () const
 {
 	for (list<pair<Channel, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
-		if (((int) i->second) > 2) {
+		if (((int) i->second) >= 2) {
 			return 6;
 		}
 	}
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index b897c8a31..d6a57ae6b 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -135,9 +135,9 @@ void
 Encoder::process_end ()
 {
 #if HAVE_SWRESAMPLE	
-	if (_film->has_audio() && _film->audio_channels() && _swr_context) {
+	if (_film->has_audio() && _swr_context) {
 
-		shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_channels(), 256));
+		shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_mapping().dcp_channels(), 256));
 			
 		while (1) {
 			int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0);
@@ -312,7 +312,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 		/* Compute the resampled frames count and add 32 for luck */
 		int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _film->audio_frame_rate()) + 32;
 
-		shared_ptr<AudioBuffers> resampled (new AudioBuffers (_film->audio_channels(), max_resampled_frames));
+		shared_ptr<AudioBuffers> resampled (new AudioBuffers (_film->audio_mapping().dcp_channels(), max_resampled_frames));
 
 		/* Resample audio */
 		int const resampled_frames = swr_convert (
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 92c2929ac..c77059b0a 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -92,8 +92,8 @@ Player::pass ()
 			}
 		}
 
-		Audio (_sndfile_buffers);
-		_sndfile_buffers.reset ();
+		Audio (_audio_buffers);
+		_audio_buffers.reset ();
 	}
 
 	return done;
@@ -126,22 +126,23 @@ Player::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
 void
 Player::process_audio (weak_ptr<const AudioContent> c, shared_ptr<AudioBuffers> b)
 {
-	if (_playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
-		AudioMapping mapping = _film->audio_mapping ();
-		if (!_sndfile_buffers) {
-			_sndfile_buffers.reset (new AudioBuffers (mapping.dcp_channels(), b->frames ()));
-			_sndfile_buffers->make_silent ();
-		}
+	AudioMapping mapping = _film->audio_mapping ();
+	if (!_audio_buffers) {
+		_audio_buffers.reset (new AudioBuffers (mapping.dcp_channels(), b->frames ()));
+		_audio_buffers->make_silent ();
+	}
 
-		for (int i = 0; i < b->channels(); ++i) {
-			list<libdcp::Channel> dcp = mapping.content_to_dcp (AudioMapping::Channel (c, i));
-			for (list<libdcp::Channel>::iterator j = dcp.begin(); j != dcp.end(); ++j) {
-				_sndfile_buffers->accumulate (b, i, static_cast<int> (*j));
-			}
+	for (int i = 0; i < b->channels(); ++i) {
+		list<libdcp::Channel> dcp = mapping.content_to_dcp (AudioMapping::Channel (c, i));
+		for (list<libdcp::Channel>::iterator j = dcp.begin(); j != dcp.end(); ++j) {
+			_audio_buffers->accumulate (b, i, static_cast<int> (*j));
 		}
+	}
 
-	} else {
-		Audio (b);
+	if (_playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
+		/* We can just emit this audio now as it will all be here */
+		Audio (_audio_buffers);
+		_audio_buffers.reset ();
 	}
 }
 
diff --git a/src/lib/player.h b/src/lib/player.h
index 8a82ab298..7a99d6561 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -70,7 +70,7 @@ private:
 	std::list<boost::shared_ptr<VideoDecoder> >::iterator _video_decoder;
 	std::list<boost::shared_ptr<SndfileDecoder> > _sndfile_decoders;
 
-	boost::shared_ptr<AudioBuffers> _sndfile_buffers;
+	boost::shared_ptr<AudioBuffers> _audio_buffers;
 
 	bool _video_sync;
 };
-- 
cgit v1.2.3


From a4a30d3a84998801fd6132da2d9ce789351c5a8e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 16 Apr 2013 12:28:15 +0100
Subject: Fix setup of resampler channel counts.

---
 src/lib/encoder.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 3201e6ecb..f56440dd7 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -93,13 +93,13 @@ Encoder::process_begin ()
 		   decide if rematrixing is needed.  It won't be, since
 		   input and output layouts are the same.
 		*/
-		   
+
 		_swr_context = swr_alloc_set_opts (
 			0,
-			av_get_default_channel_layout (_film->audio_channels ()),
+			av_get_default_channel_layout (_film->audio_mapping().dcp_channels ()),
 			AV_SAMPLE_FMT_FLTP,
 			_film->target_audio_sample_rate(),
-			av_get_default_channel_layout (_film->audio_channels ()),
+			av_get_default_channel_layout (_film->audio_mapping().dcp_channels ()),
 			AV_SAMPLE_FMT_FLTP,
 			_film->audio_frame_rate(),
 			0, 0
-- 
cgit v1.2.3


From 8dd9ea3086b4934f2719648ffa6333c0d106ff36 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 24 Apr 2013 01:02:25 +0100
Subject: Some const correctness.

---
 src/lib/analyse_audio_job.cc |  2 +-
 src/lib/analyse_audio_job.h  |  2 +-
 src/lib/audio_sink.h         |  4 +-
 src/lib/audio_source.h       |  4 +-
 src/lib/combiner.cc          |  6 +--
 src/lib/combiner.h           |  4 +-
 src/lib/delay_line.cc        |  4 +-
 src/lib/delay_line.h         |  4 +-
 src/lib/encoder.cc           |  4 +-
 src/lib/encoder.h            |  4 +-
 src/lib/gain.cc              |  2 +-
 src/lib/gain.h               |  2 +-
 src/lib/image.cc             |  6 +++
 src/lib/image.h              |  6 +++
 src/lib/matcher.cc           |  9 +++--
 src/lib/matcher.h            | 10 ++---
 src/lib/trimmer.cc           | 10 +++--
 src/lib/trimmer.h            |  4 +-
 src/lib/util.cc              | 90 +++++++++++++++++++++++++++++---------------
 src/lib/util.h               |  1 +
 src/lib/video_sink.h         |  4 +-
 src/lib/video_source.h       |  4 +-
 src/tools/servomatictest.cc  |  2 +-
 src/wx/film_viewer.cc        |  4 +-
 src/wx/film_viewer.h         |  6 +--
 test/test.cc                 |  8 ++--
 26 files changed, 125 insertions(+), 81 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 43eecbcbd..88cd65fee 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -84,7 +84,7 @@ AnalyseAudioJob::run ()
 }
 
 void
-AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
+AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b)
 {
 	for (int i = 0; i < b->frames(); ++i) {
 		for (int j = 0; j < b->channels(); ++j) {
diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index dc1e073ee..5435e0a7c 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -31,7 +31,7 @@ public:
 	void run ();
 
 private:
-	void audio (boost::shared_ptr<AudioBuffers>);
+	void audio (boost::shared_ptr<const AudioBuffers>);
 
 	int64_t _done;
 	int64_t _samples_per_point;
diff --git a/src/lib/audio_sink.h b/src/lib/audio_sink.h
index f34b24f88..69b3a4b75 100644
--- a/src/lib/audio_sink.h
+++ b/src/lib/audio_sink.h
@@ -24,14 +24,14 @@ class AudioSink
 {
 public:
 	/** Call with some audio data */
-	virtual void process_audio (boost::shared_ptr<AudioBuffers>) = 0;
+	virtual void process_audio (boost::shared_ptr<const AudioBuffers>) = 0;
 };
 
 class TimedAudioSink
 {
 public:
         /** Call with some audio data */
-        virtual void process_audio (boost::shared_ptr<AudioBuffers>, double t) = 0;
+        virtual void process_audio (boost::shared_ptr<const AudioBuffers>, double t) = 0;
 };
 
 #endif
diff --git a/src/lib/audio_source.h b/src/lib/audio_source.h
index e255d566d..c13f1636b 100644
--- a/src/lib/audio_source.h
+++ b/src/lib/audio_source.h
@@ -35,7 +35,7 @@ class AudioSource
 {
 public:
 	/** Emitted when some audio data is ready */
-	boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>)> Audio;
+	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>)> Audio;
 
 	void connect_audio (boost::shared_ptr<AudioSink>);
 };
@@ -46,7 +46,7 @@ class TimedAudioSource
 {
 public:
 	/** Emitted when some audio data is ready */
-	boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, double)> Audio;
+	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, double)> Audio;
 
 	void connect_audio (boost::shared_ptr<AudioSink>);
 	void connect_audio (boost::shared_ptr<TimedAudioSink>);
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index 0a9eaf6b6..250528aeb 100644
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -33,9 +33,9 @@ Combiner::Combiner (shared_ptr<Log> log)
  *  @param image Frame image.
  */
 void
-Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, double)
+Combiner::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle>, double)
 {
-	_image = image;
+	_image = image->clone ();
 }
 
 /** Process video for the right half of the frame.
@@ -43,7 +43,7 @@ Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, do
  *  @param sub Subtitle (which will be put onto the whole frame)
  */
 void
-Combiner::process_video_b (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub, double t)
+Combiner::process_video_b (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub, double t)
 {
 	/* Copy the right half of this image into our _image */
 	/* XXX: this should probably be in the Image class */
diff --git a/src/lib/combiner.h b/src/lib/combiner.h
index a8f1fa804..7ed316e26 100644
--- a/src/lib/combiner.h
+++ b/src/lib/combiner.h
@@ -33,8 +33,8 @@ class Combiner : public TimedVideoProcessor
 public:
 	Combiner (boost::shared_ptr<Log> log);
 
-	void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s, double);
-	void process_video_b (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s, double);
+	void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
+	void process_video_b (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
 
 private:
 	/** The image that we are currently working on */
diff --git a/src/lib/delay_line.cc b/src/lib/delay_line.cc
index 9e6baeba8..b0180800a 100644
--- a/src/lib/delay_line.cc
+++ b/src/lib/delay_line.cc
@@ -37,7 +37,7 @@ DelayLine::DelayLine (shared_ptr<Log> log, double seconds)
 }
 
 void
-DelayLine::process_audio (shared_ptr<AudioBuffers> data, double t)
+DelayLine::process_audio (shared_ptr<const AudioBuffers> data, double t)
 {
 	if (_seconds > 0) {
 		t += _seconds;
@@ -47,7 +47,7 @@ DelayLine::process_audio (shared_ptr<AudioBuffers> data, double t)
 }
 
 void
-DelayLine::process_video (boost::shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub, double t)
+DelayLine::process_video (shared_ptr<const Image> image, bool same, boost::shared_ptr<Subtitle> sub, double t)
 {
 	if (_seconds < 0) {
 		t += _seconds;
diff --git a/src/lib/delay_line.h b/src/lib/delay_line.h
index 90f1dcfa7..781dce88a 100644
--- a/src/lib/delay_line.h
+++ b/src/lib/delay_line.h
@@ -26,8 +26,8 @@ class DelayLine : public TimedAudioVideoProcessor
 public:
 	DelayLine (boost::shared_ptr<Log> log, double);
 	
-	void process_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
-	void process_audio (boost::shared_ptr<AudioBuffers>, double);
+	void process_video (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, double);
+	void process_audio (boost::shared_ptr<const AudioBuffers>, double);
 
 private:
 	double _seconds;
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 7b338407e..7a1eea069 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -231,7 +231,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub)
+Encoder::process_video (shared_ptr<const Image> image, bool same, boost::shared_ptr<Subtitle> sub)
 {
 	FrameRateConversion frc (_film->source_frame_rate(), _film->dcp_frame_rate());
 	
@@ -294,7 +294,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 }
 
 void
-Encoder::process_audio (shared_ptr<AudioBuffers> data)
+Encoder::process_audio (shared_ptr<const AudioBuffers> data)
 {
 #if HAVE_SWRESAMPLE
 	/* Maybe sample-rate convert */
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 86880bc34..70e81a7e0 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -73,10 +73,10 @@ public:
 	 *  @param same true if i is the same as the last time we were called.
 	 *  @param s A subtitle that should be on this frame, or 0.
 	 */
-	void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s);
+	void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s);
 
 	/** Call with some audio data */
-	void process_audio (boost::shared_ptr<AudioBuffers>);
+	void process_audio (boost::shared_ptr<const AudioBuffers>);
 
 	/** Called when a processing run has finished */
 	virtual void process_end ();
diff --git a/src/lib/gain.cc b/src/lib/gain.cc
index df7011d2e..ccd779d71 100644
--- a/src/lib/gain.cc
+++ b/src/lib/gain.cc
@@ -30,7 +30,7 @@ Gain::Gain (shared_ptr<Log> log, float gain)
 }
 
 void
-Gain::process_audio (shared_ptr<AudioBuffers> b)
+Gain::process_audio (shared_ptr<const AudioBuffers> b)
 {
 	if (_gain != 0) {
 		float const linear_gain = pow (10, _gain / 20);
diff --git a/src/lib/gain.h b/src/lib/gain.h
index d462e5aee..61fef5e85 100644
--- a/src/lib/gain.h
+++ b/src/lib/gain.h
@@ -24,7 +24,7 @@ class Gain : public AudioProcessor
 public:
 	Gain (boost::shared_ptr<Log> log, float gain);
 
-	void process_audio (boost::shared_ptr<AudioBuffers>);
+	void process_audio (boost::shared_ptr<const AudioBuffers>);
 
 private:
 	float _gain;
diff --git a/src/lib/image.cc b/src/lib/image.cc
index 2355d22e5..9bcbb87ab 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -583,6 +583,12 @@ SimpleImage::aligned () const
 	return _aligned;
 }
 
+shared_ptr<Image>
+SimpleImage::clone () const
+{
+	return shared_ptr<Image> (new SimpleImage (*this));
+}
+
 FilterBufferImage::FilterBufferImage (AVPixelFormat p, AVFilterBufferRef* b)
 	: Image (p)
 	, _buffer (b)
diff --git a/src/lib/image.h b/src/lib/image.h
index 6b9ade99e..31035d272 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -70,6 +70,8 @@ public:
 
 	virtual bool aligned () const = 0;
 
+	virtual boost::shared_ptr<Image> clone () const = 0;
+
 	int components () const;
 	int lines (int) const;
 
@@ -118,6 +120,9 @@ private:
 	/* Not allowed */
 	FilterBufferImage (FilterBufferImage const &);
 	FilterBufferImage& operator= (FilterBufferImage const &);
+	boost::shared_ptr<Image> clone () const {
+		assert (false);
+	}
 	
 	AVFilterBufferRef* _buffer;
 	int* _line_size;
@@ -139,6 +144,7 @@ public:
 	int * stride () const;
 	libdcp::Size size () const;
 	bool aligned () const;
+	boost::shared_ptr<Image> clone () const;
 
 protected:
 	void allocate ();
diff --git a/src/lib/matcher.cc b/src/lib/matcher.cc
index dd0312f67..9924c003a 100644
--- a/src/lib/matcher.cc
+++ b/src/lib/matcher.cc
@@ -41,7 +41,7 @@ Matcher::Matcher (shared_ptr<Log> log, int sample_rate, float frames_per_second)
 }
 
 void
-Matcher::process_video (boost::shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub, double t)
+Matcher::process_video (boost::shared_ptr<const Image> image, bool same, boost::shared_ptr<Subtitle> sub, double t)
 {
 	_pixel_format = image->pixel_format ();
 	_size = image->size ();
@@ -90,7 +90,7 @@ Matcher::process_video (boost::shared_ptr<Image> image, bool same, boost::shared
 }
 
 void
-Matcher::process_audio (boost::shared_ptr<AudioBuffers> b, double t)
+Matcher::process_audio (boost::shared_ptr<const AudioBuffers> b, double t)
 {
 	_channels = b->channels ();
 
@@ -202,8 +202,9 @@ void
 Matcher::repeat_last_video ()
 {
 	if (!_last_image) {
-		_last_image.reset (new SimpleImage (_pixel_format.get(), _size.get(), true));
-		_last_image->make_black ();
+		shared_ptr<Image> im (new SimpleImage (_pixel_format.get(), _size.get(), true));
+		im->make_black ();
+		_last_image = im;
 	}
 
 	Video (_last_image, true, _last_subtitle);
diff --git a/src/lib/matcher.h b/src/lib/matcher.h
index f54aa4b6a..41aa373a4 100644
--- a/src/lib/matcher.h
+++ b/src/lib/matcher.h
@@ -25,8 +25,8 @@ class Matcher : public Processor, public TimedAudioSink, public TimedVideoSink,
 {
 public:
 	Matcher (boost::shared_ptr<Log> log, int sample_rate, float frames_per_second);
-	void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s, double);
-	void process_audio (boost::shared_ptr<AudioBuffers>, double);
+	void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
+	void process_audio (boost::shared_ptr<const AudioBuffers>, double);
 	void process_end ();
 
 private:
@@ -43,19 +43,19 @@ private:
 	boost::optional<int> _channels;
 
 	struct AudioRecord {
-		AudioRecord (boost::shared_ptr<AudioBuffers> a, double t)
+		AudioRecord (boost::shared_ptr<const AudioBuffers> a, double t)
 			: audio (a)
 			, time (t)
 		{}
 		
-		boost::shared_ptr<AudioBuffers> audio;
+		boost::shared_ptr<const AudioBuffers> audio;
 		double time;
 	};
 
 	std::list<AudioRecord> _pending_audio;
 
 	boost::optional<double> _first_input;
-	boost::shared_ptr<Image> _last_image;
+	boost::shared_ptr<const Image> _last_image;
 	boost::shared_ptr<Subtitle> _last_subtitle;
 
 	bool _had_first_video;
diff --git a/src/lib/trimmer.cc b/src/lib/trimmer.cc
index 68364e50a..39ec44fcb 100644
--- a/src/lib/trimmer.cc
+++ b/src/lib/trimmer.cc
@@ -56,7 +56,7 @@ Trimmer::Trimmer (
 }
 
 void
-Trimmer::process_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
+Trimmer::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub)
 {
 	if (_video_in >= _video_start && _video_in <= _video_end) {
 		Video (image, same, sub);
@@ -66,7 +66,7 @@ Trimmer::process_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle>
 }
 
 void
-Trimmer::process_audio (shared_ptr<AudioBuffers> audio)
+Trimmer::process_audio (shared_ptr<const AudioBuffers> audio)
 {
 	int64_t offset = _audio_start - _audio_in;
 	if (offset > audio->frames()) {
@@ -91,8 +91,10 @@ Trimmer::process_audio (shared_ptr<AudioBuffers> audio)
 	_audio_in += audio->frames ();
 	
 	if (offset != 0 || length != audio->frames ()) {
-		audio->move (offset, 0, length);
-		audio->set_frames (length);
+		shared_ptr<AudioBuffers> copy (new AudioBuffers (audio));
+		copy->move (offset, 0, length);
+		copy->set_frames (length);
+		audio = copy;
 	}
 	
 	Audio (audio);
diff --git a/src/lib/trimmer.h b/src/lib/trimmer.h
index ff7e9514d..45b3f149a 100644
--- a/src/lib/trimmer.h
+++ b/src/lib/trimmer.h
@@ -24,8 +24,8 @@ class Trimmer : public AudioVideoProcessor
 public:
 	Trimmer (boost::shared_ptr<Log>, int, int, int, int, float, int);
 
-	void process_video (boost::shared_ptr<Image> i, bool, boost::shared_ptr<Subtitle> s);
-	void process_audio (boost::shared_ptr<AudioBuffers>);
+	void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s);
+	void process_audio (boost::shared_ptr<const AudioBuffers>);
 
 private:
 	friend class trimmer_test;
diff --git a/src/lib/util.cc b/src/lib/util.cc
index e43b598ab..859aa6de7 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -63,11 +63,24 @@ extern "C" {
 
 #include "i18n.h"
 
-using namespace std;
-using namespace boost;
+using std::cout;
+using std::string;
+using std::stringstream;
+using std::list;
+using std::ostream;
+using std::vector;
+using std::ifstream;
+using std::istream;
+using std::min;
+using std::max;
+using std::multimap;
+using std::pair;
+using boost::shared_ptr;
+using boost::lexical_cast;
+using boost::optional;
 using libdcp::Size;
 
-thread::id ui_thread;
+boost::thread::id ui_thread;
 
 /** Convert some number of seconds to a string representation
  *  in hours, minutes and seconds.
@@ -87,9 +100,9 @@ seconds_to_hms (int s)
 	stringstream hms;
 	hms << h << N_(":");
 	hms.width (2);
-	hms << setfill ('0') << m << N_(":");
+	hms << std::setfill ('0') << m << N_(":");
 	hms.width (2);
-	hms << setfill ('0') << s;
+	hms << std::setfill ('0') << s;
 
 	return hms.str ();
 }
@@ -185,7 +198,7 @@ stacktrace (ostream& out, int levels)
      
 	if (strings) {
 		for (i = 0; i < size && (levels == 0 || i < size_t(levels)); i++) {
-			out << N_("  ") << demangle (strings[i]) << endl;
+			out << N_("  ") << demangle (strings[i]) << "\n";
 		}
 		
 		free (strings);
@@ -243,7 +256,7 @@ dvdomatic_setup ()
 	Filter::setup_filters ();
 	SoundProcessor::setup_sound_processors ();
 
-	ui_thread = this_thread::get_id ();
+	ui_thread = boost::this_thread::get_id ();
 }
 
 #ifdef DVDOMATIC_WINDOWS
@@ -338,7 +351,7 @@ md5_digest (void const * data, int size)
 	
 	stringstream s;
 	for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) {
-		s << hex << setfill('0') << setw(2) << ((int) digest[i]);
+		s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]);
 	}
 
 	return s.str ();
@@ -350,14 +363,14 @@ md5_digest (void const * data, int size)
 string
 md5_digest (string file)
 {
-	ifstream f (file.c_str(), ios::binary);
+	ifstream f (file.c_str(), std::ios::binary);
 	if (!f.good ()) {
 		throw OpenFileError (file);
 	}
 	
-	f.seekg (0, ios::end);
+	f.seekg (0, std::ios::end);
 	int bytes = f.tellg ();
-	f.seekg (0, ios::beg);
+	f.seekg (0, std::ios::beg);
 
 	int const buffer_size = 64 * 1024;
 	char buffer[buffer_size];
@@ -376,7 +389,7 @@ md5_digest (string file)
 
 	stringstream s;
 	for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) {
-		s << hex << setfill('0') << setw(2) << ((int) digest[i]);
+		s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]);
 	}
 
 	return s.str ();
@@ -441,8 +454,8 @@ best_dcp_frame_rate (float source_fps)
 	}
 
 	/* Pick the best one, bailing early if we hit an exact match */
-	float error = numeric_limits<float>::max ();
-	boost::optional<FrameRateCandidate> best;
+	float error = std::numeric_limits<float>::max ();
+	optional<FrameRateCandidate> best;
 	list<FrameRateCandidate>::iterator i = candidates.begin();
 	while (i != candidates.end()) {
 		
@@ -509,16 +522,16 @@ Socket::Socket (int timeout)
 	, _socket (_io_service)
 	, _timeout (timeout)
 {
-	_deadline.expires_at (posix_time::pos_infin);
+	_deadline.expires_at (boost::posix_time::pos_infin);
 	check ();
 }
 
 void
 Socket::check ()
 {
-	if (_deadline.expires_at() <= asio::deadline_timer::traits_type::now ()) {
+	if (_deadline.expires_at() <= boost::asio::deadline_timer::traits_type::now ()) {
 		_socket.close ();
-		_deadline.expires_at (posix_time::pos_infin);
+		_deadline.expires_at (boost::posix_time::pos_infin);
 	}
 
 	_deadline.async_wait (boost::bind (&Socket::check, this));
@@ -528,14 +541,14 @@ Socket::check ()
  *  @param endpoint End-point to connect to.
  */
 void
-Socket::connect (asio::ip::basic_resolver_entry<asio::ip::tcp> const & endpoint)
+Socket::connect (boost::asio::ip::basic_resolver_entry<boost::asio::ip::tcp> const & endpoint)
 {
-	_deadline.expires_from_now (posix_time::seconds (_timeout));
-	system::error_code ec = asio::error::would_block;
-	_socket.async_connect (endpoint, lambda::var(ec) = lambda::_1);
+	_deadline.expires_from_now (boost::posix_time::seconds (_timeout));
+	boost::system::error_code ec = boost::asio::error::would_block;
+	_socket.async_connect (endpoint, boost::lambda::var(ec) = boost::lambda::_1);
 	do {
 		_io_service.run_one();
-	} while (ec == asio::error::would_block);
+	} while (ec == boost::asio::error::would_block);
 
 	if (ec || !_socket.is_open ()) {
 		throw NetworkError (_("connect timed out"));
@@ -549,14 +562,14 @@ Socket::connect (asio::ip::basic_resolver_entry<asio::ip::tcp> const & endpoint)
 void
 Socket::write (uint8_t const * data, int size)
 {
-	_deadline.expires_from_now (posix_time::seconds (_timeout));
-	system::error_code ec = asio::error::would_block;
+	_deadline.expires_from_now (boost::posix_time::seconds (_timeout));
+	boost::system::error_code ec = boost::asio::error::would_block;
 
-	asio::async_write (_socket, asio::buffer (data, size), lambda::var(ec) = lambda::_1);
+	boost::asio::async_write (_socket, boost::asio::buffer (data, size), boost::lambda::var(ec) = boost::lambda::_1);
 	
 	do {
 		_io_service.run_one ();
-	} while (ec == asio::error::would_block);
+	} while (ec == boost::asio::error::would_block);
 
 	if (ec) {
 		throw NetworkError (ec.message ());
@@ -577,14 +590,14 @@ Socket::write (uint32_t v)
 void
 Socket::read (uint8_t* data, int size)
 {
-	_deadline.expires_from_now (posix_time::seconds (_timeout));
-	system::error_code ec = asio::error::would_block;
+	_deadline.expires_from_now (boost::posix_time::seconds (_timeout));
+	boost::system::error_code ec = boost::asio::error::would_block;
 
-	asio::async_read (_socket, asio::buffer (data, size), lambda::var(ec) = lambda::_1);
+	boost::asio::async_read (_socket, boost::asio::buffer (data, size), boost::lambda::var(ec) = boost::lambda::_1);
 
 	do {
 		_io_service.run_one ();
-	} while (ec == asio::error::would_block);
+	} while (ec == boost::asio::error::would_block);
 	
 	if (ec) {
 		throw NetworkError (ec.message ());
@@ -761,6 +774,21 @@ AudioBuffers::AudioBuffers (AudioBuffers const & other)
 	}
 }
 
+/* XXX: it's a shame that this is a copy-and-paste of the above;
+   probably fixable with c++0x.
+*/
+AudioBuffers::AudioBuffers (boost::shared_ptr<const AudioBuffers> other)
+	: _channels (other->_channels)
+	, _frames (other->_frames)
+	, _allocated_frames (other->_frames)
+{
+	_data = new float*[_channels];
+	for (int i = 0; i < _channels; ++i) {
+		_data[i] = new float[_frames];
+		memcpy (_data[i], other->_data[i], _frames * sizeof (float));
+	}
+}
+
 /** AudioBuffers destructor */
 AudioBuffers::~AudioBuffers ()
 {
@@ -865,7 +893,7 @@ AudioBuffers::move (int from, int to, int frames)
 void
 ensure_ui_thread ()
 {
-	assert (this_thread::get_id() == ui_thread);
+	assert (boost::this_thread::get_id() == ui_thread);
 }
 
 /** @param v Source video frame.
diff --git a/src/lib/util.h b/src/lib/util.h
index 31d0fc967..99670110e 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -241,6 +241,7 @@ class AudioBuffers
 public:
 	AudioBuffers (int channels, int frames);
 	AudioBuffers (AudioBuffers const &);
+	AudioBuffers (boost::shared_ptr<const AudioBuffers>);
 	~AudioBuffers ();
 
 	float** data () const {
diff --git a/src/lib/video_sink.h b/src/lib/video_sink.h
index 32c7f3b38..0170c7350 100644
--- a/src/lib/video_sink.h
+++ b/src/lib/video_sink.h
@@ -34,7 +34,7 @@ public:
 	 *  @param same true if i is the same as last time we were called.
 	 *  @param s A subtitle that should be on this frame, or 0.
 	 */
-	virtual void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s) = 0;
+	virtual void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s) = 0;
 };
 
 class TimedVideoSink
@@ -46,7 +46,7 @@ public:
 	 *  @param s A subtitle that should be on this frame, or 0.
 	 *  @param t Source timestamp.
 	 */
-	virtual void process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s, double t) = 0;
+	virtual void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s, double t) = 0;
 };
 
 #endif
diff --git a/src/lib/video_source.h b/src/lib/video_source.h
index e4a8ab058..748cb6fe9 100644
--- a/src/lib/video_source.h
+++ b/src/lib/video_source.h
@@ -45,7 +45,7 @@ public:
 	 *  Second parameter is true if the image is the same as the last one that was emitted.
 	 *  Third parameter is either 0 or a subtitle that should be on this frame.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>)> Video;
 
 	void connect_video (boost::shared_ptr<VideoSink>);
 };
@@ -63,7 +63,7 @@ public:
 	 *  Third parameter is either 0 or a subtitle that should be on this frame.
 	 *  Fourth parameter is the source timestamp of this frame.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, double)> Video;
 
 	void connect_video (boost::shared_ptr<VideoSink>);
 	void connect_video (boost::shared_ptr<TimedVideoSink>);
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index f5756c693..5e1cf49b4 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -47,7 +47,7 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame = 0;
 
 void
-process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub)
+process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub)
 {
 	shared_ptr<DCPVideoFrame> local (
 		new DCPVideoFrame (
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 8508ec2a2..4f2985a06 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -308,7 +308,7 @@ FilmViewer::raw_to_display ()
 		return;
 	}
 
-	boost::shared_ptr<Image> input = _raw_frame;
+	boost::shared_ptr<const Image> input = _raw_frame;
 
 	pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
 	if (!s.second.empty ()) {
@@ -400,7 +400,7 @@ FilmViewer::check_play_state ()
 }
 
 void
-FilmViewer::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle> sub, double t)
+FilmViewer::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub, double t)
 {
 	_raw_frame = image;
 	_raw_sub = sub;
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index a78c772a4..ed5874fbc 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -48,7 +48,7 @@ private:
 	void slider_moved (wxScrollEvent &);
 	void play_clicked (wxCommandEvent &);
 	void timer (wxTimerEvent &);
-	void process_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
+	void process_video (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, double);
 	void calculate_sizes ();
 	void check_play_state ();
 	void update_from_raw ();
@@ -72,9 +72,9 @@ private:
 	wxTimer _timer;
 
 	Decoders _decoders;
-	boost::shared_ptr<Image> _raw_frame;
+	boost::shared_ptr<const Image> _raw_frame;
 	boost::shared_ptr<Subtitle> _raw_sub;
-	boost::shared_ptr<Image> _display_frame;
+	boost::shared_ptr<const Image> _display_frame;
 	/* The x offset at which we display the actual film content; this corresponds
 	   to the film's padding converted to our coordinates.
 	*/
diff --git a/test/test.cc b/test/test.cc
index 595d8fc93..496c91519 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -123,17 +123,17 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 	}
 }
 
-shared_ptr<Image> trimmer_test_last_video;
-shared_ptr<AudioBuffers> trimmer_test_last_audio;
+shared_ptr<const Image> trimmer_test_last_video;
+shared_ptr<const AudioBuffers> trimmer_test_last_audio;
 
 void
-trimmer_test_video_helper (shared_ptr<Image> image, bool, shared_ptr<Subtitle>)
+trimmer_test_video_helper (shared_ptr<const Image> image, bool, shared_ptr<Subtitle>)
 {
 	trimmer_test_last_video = image;
 }
 
 void
-trimmer_test_audio_helper (shared_ptr<AudioBuffers> audio)
+trimmer_test_audio_helper (shared_ptr<const AudioBuffers> audio)
 {
 	trimmer_test_last_audio = audio;
 }
-- 
cgit v1.2.3


From 7b2ec1dd69951649f2c912fcf90b22913b1f6c3a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 25 Apr 2013 13:44:02 +0100
Subject: Remove Image::clone in favour of a copy constructor for SimpleImage;
 clean up A/B transcoder slightly; fix combiner if image strides differ; try
 to fix problems when destroying Encoders; fix SimpleImage copy constructor to
 cope with aligned images; don't call encoder::process_end if the encode
 throws an exception.

---
 src/lib/ab_transcoder.cc | 14 +++++---------
 src/lib/combiner.cc      |  7 +++----
 src/lib/encoder.cc       |  4 +++-
 src/lib/image.cc         | 34 +++++++++++++++++++++++++++-------
 src/lib/image.h          |  7 +------
 src/lib/transcoder.cc    | 37 ++++++++++++++++---------------------
 6 files changed, 55 insertions(+), 48 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 26643b50e..d8f13dae4 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -122,25 +122,21 @@ ABTranscoder::go ()
 		} else {
 			done[2] = true;
 		}
-
+		
 		if (_job) {
 			_da.video->set_progress (_job);
 		}
-
+		
 		if (done[0] && done[1] && done[2]) {
 			break;
 		}
 	}
-
-	if (_delay_line) {
-		_delay_line->process_end ();
-	}
+		
+	_delay_line->process_end ();
 	if (_matcher) {
 		_matcher->process_end ();
 	}
-	if (_gain) {
-		_gain->process_end ();
-	}
+	_gain->process_end ();
 	_encoder->process_end ();
 }
 			    
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index 250528aeb..367cefa7f 100644
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -35,7 +35,7 @@ Combiner::Combiner (shared_ptr<Log> log)
 void
 Combiner::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle>, double)
 {
-	_image = image->clone ();
+	_image.reset (new SimpleImage (image));
 }
 
 /** Process video for the right half of the frame.
@@ -50,15 +50,14 @@ Combiner::process_video_b (shared_ptr<const Image> image, bool, shared_ptr<Subti
 	for (int i = 0; i < image->components(); ++i) {
 		int const line_size = image->line_size()[i];
 		int const half_line_size = line_size / 2;
-		int const stride = image->stride()[i];
 
 		uint8_t* p = _image->data()[i];
 		uint8_t* q = image->data()[i];
 			
 		for (int j = 0; j < image->lines (i); ++j) {
 			memcpy (p + half_line_size, q + half_line_size, half_line_size);
-			p += stride;
-			q += stride;
+			p += _image->stride()[i];
+			q += image->stride()[i];
 		}
 	}
 
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 7a1eea069..cff9899ac 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -333,7 +333,9 @@ Encoder::terminate_threads ()
 	lock.unlock ();
 
 	for (list<boost::thread *>::iterator i = _threads.begin(); i != _threads.end(); ++i) {
-		(*i)->join ();
+		if ((*i)->joinable ()) {
+			(*i)->join ();
+		}
 		delete *i;
 	}
 }
diff --git a/src/lib/image.cc b/src/lib/image.cc
index 9bcbb87ab..1be41fecf 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -509,7 +509,33 @@ SimpleImage::SimpleImage (SimpleImage const & other)
 	allocate ();
 
 	for (int i = 0; i < components(); ++i) {
-		memcpy (_data[i], other._data[i], _line_size[i] * lines(i));
+		uint8_t* p = _data[i];
+		uint8_t* q = other._data[i];
+		for (int j = 0; j < lines(i); ++j) {
+			memcpy (p, q, _line_size[i]);
+			p += stride()[i];
+			q += other.stride()[i];
+		}
+	}
+}
+
+SimpleImage::SimpleImage (shared_ptr<const Image> other)
+	: Image (*other.get())
+{
+	_size = other->size ();
+	_aligned = true;
+
+	allocate ();
+
+	for (int i = 0; i < components(); ++i) {
+		assert(line_size()[i] == other->line_size()[i]);
+		uint8_t* p = _data[i];
+		uint8_t* q = other->data()[i];
+		for (int j = 0; j < lines(i); ++j) {
+			memcpy (p, q, line_size()[i]);
+			p += stride()[i];
+			q += other->stride()[i];
+		}
 	}
 }
 
@@ -583,12 +609,6 @@ SimpleImage::aligned () const
 	return _aligned;
 }
 
-shared_ptr<Image>
-SimpleImage::clone () const
-{
-	return shared_ptr<Image> (new SimpleImage (*this));
-}
-
 FilterBufferImage::FilterBufferImage (AVPixelFormat p, AVFilterBufferRef* b)
 	: Image (p)
 	, _buffer (b)
diff --git a/src/lib/image.h b/src/lib/image.h
index 31035d272..62961a92e 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -70,8 +70,6 @@ public:
 
 	virtual bool aligned () const = 0;
 
-	virtual boost::shared_ptr<Image> clone () const = 0;
-
 	int components () const;
 	int lines (int) const;
 
@@ -120,9 +118,6 @@ private:
 	/* Not allowed */
 	FilterBufferImage (FilterBufferImage const &);
 	FilterBufferImage& operator= (FilterBufferImage const &);
-	boost::shared_ptr<Image> clone () const {
-		assert (false);
-	}
 	
 	AVFilterBufferRef* _buffer;
 	int* _line_size;
@@ -136,6 +131,7 @@ class SimpleImage : public Image
 public:
 	SimpleImage (AVPixelFormat, libdcp::Size, bool);
 	SimpleImage (SimpleImage const &);
+	SimpleImage (boost::shared_ptr<const Image>);
 	SimpleImage& operator= (SimpleImage const &);
 	~SimpleImage ();
 
@@ -144,7 +140,6 @@ public:
 	int * stride () const;
 	libdcp::Size size () const;
 	bool aligned () const;
-	boost::shared_ptr<Image> clone () const;
 
 protected:
 	void allocate ();
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 4d3f29e83..faafcaf8b 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -103,31 +103,26 @@ void
 Transcoder::go ()
 {
 	_encoder->process_begin ();
-	try {
-		bool done[2] = { false, false };
-		
-		while (1) {
-			if (!done[0]) {
-				done[0] = _decoders.video->pass ();
-				if (_job) {
-					_decoders.video->set_progress (_job);
-				}
-			}
-
-			if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {
-				done[1] = _decoders.audio->pass ();
-			} else {
-				done[1] = true;
-			}
 
-			if (done[0] && done[1]) {
-				break;
+	bool done[2] = { false, false };
+	
+	while (1) {
+		if (!done[0]) {
+			done[0] = _decoders.video->pass ();
+			if (_job) {
+				_decoders.video->set_progress (_job);
 			}
 		}
 		
-	} catch (...) {
-		_encoder->process_end ();
-		throw;
+		if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {
+			done[1] = _decoders.audio->pass ();
+		} else {
+			done[1] = true;
+		}
+		
+		if (done[0] && done[1]) {
+			break;
+		}
 	}
 	
 	_delay_line->process_end ();
-- 
cgit v1.2.3


From 83742c7e6edcf958e0820abc77c029f4ada4880f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 8 May 2013 16:58:19 +0100
Subject: Better fix for still (no sound) DCP crash.

---
 src/lib/encoder.cc         | 4 ++++
 src/lib/sndfile_decoder.cc | 6 ------
 src/lib/transcoder.cc      | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index cff9899ac..8549962ff 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -296,6 +296,10 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, boost::shared_
 void
 Encoder::process_audio (shared_ptr<const AudioBuffers> data)
 {
+	if (!data->frames ()) {
+		return;
+	}
+	
 #if HAVE_SWRESAMPLE
 	/* Maybe sample-rate convert */
 	if (_swr_context) {
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index d70478a1b..fdaf2eeaa 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -102,20 +102,14 @@ SndfileDecoder::pass ()
 	sf_count_t const block = _audio_stream->sample_rate() / 2;
 	shared_ptr<AudioBuffers> audio (new AudioBuffers (_audio_stream->channels(), block));
 	sf_count_t const this_time = min (block, _frames - _done);
-	bool have_sound = false;
 	for (size_t i = 0; i < _sndfiles.size(); ++i) {
 		if (!_sndfiles[i]) {
 			audio->make_silent (i);
 		} else {
 			sf_read_float (_sndfiles[i], audio->data(i), this_time);
-			have_sound = true;
 		}
 	}
 
-	if (!have_sound) {
-		return true;
-	}
-
 	audio->set_frames (this_time);
 	Audio (audio, double(_done) / _audio_stream->sample_rate());
 	_done += this_time;
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index faafcaf8b..48cf402d7 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -56,7 +56,7 @@ Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<
 	assert (_encoder);
 
 	shared_ptr<AudioStream> st = f->audio_stream();
-	if (st) {
+	if (st && st->sample_rate ()) {
 		_matcher.reset (new Matcher (f->log(), st->sample_rate(), f->source_frame_rate()));
 	}
 	_delay_line.reset (new DelayLine (f->log(), f->audio_delay() / 1000.0f));
-- 
cgit v1.2.3


From fd040c2bd27fde35424a384174ecb56c643764cd Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 8 May 2013 20:37:53 +0100
Subject: Some tidying up.  Do encode progress in the writer to improve
 progress bar movement with still-image DCPs (#130).

---
 src/lib/ab_transcoder.cc | 41 +++++++++++++----------------------------
 src/lib/ab_transcoder.h  |  2 --
 src/lib/encoder.cc       |  5 +++--
 src/lib/encoder.h        |  8 +++++---
 src/lib/player.cc        | 12 ------------
 src/lib/player.h         |  1 -
 src/lib/transcoder.cc    | 11 ++++-------
 src/lib/transcoder.h     |  4 +++-
 src/lib/writer.cc        |  8 +++++++-
 src/lib/writer.h         |  4 +++-
 10 files changed, 38 insertions(+), 58 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 2e0d41e7d..f75491dce 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -47,27 +47,25 @@ using boost::dynamic_pointer_cast;
  *  @param e Encoder to use.
  */
 
-ABTranscoder::ABTranscoder (shared_ptr<Film> a, shared_ptr<Film> b, shared_ptr<Job> j)
-	: _film_a (a)
-	, _film_b (b)
-	, _player_a (_film_a->player ())
-	, _player_b (_film_b->player ())
+ABTranscoder::ABTranscoder (shared_ptr<Film> film_a, shared_ptr<Film> film_b, shared_ptr<Job> j)
+	: _player_a (film_a->player ())
+	, _player_b (film_b->player ())
 	, _job (j)
-	, _encoder (new Encoder (_film_a))
-	, _combiner (new Combiner (a->log()))
+	, _encoder (new Encoder (film_a, j))
+	, _combiner (new Combiner (film_a->log()))
 {
-	_matcher.reset (new Matcher (_film_a->log(), _film_a->audio_frame_rate(), _film_a->video_frame_rate()));
-	_delay_line.reset (new DelayLine (_film_a->log(), _film_a->audio_delay() * _film_a->audio_frame_rate() / 1000));
-	_gain.reset (new Gain (_film_a->log(), _film_a->audio_gain()));
+	_matcher.reset (new Matcher (film_a->log(), film_a->audio_frame_rate(), film_a->video_frame_rate()));
+	_delay_line.reset (new DelayLine (film_a->log(), film_a->audio_delay() * film_a->audio_frame_rate() / 1000));
+	_gain.reset (new Gain (film_a->log(), film_a->audio_gain()));
 
 	_player_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3, _4));
 	_player_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3, _4));
 
-	int const trim_start = _film_a->trim_type() == Film::ENCODE ? _film_a->trim_start() : 0;
-	int const trim_end = _film_a->trim_type() == Film::ENCODE ? _film_a->trim_end() : 0;
+	int const trim_start = film_a->trim_type() == Film::ENCODE ? film_a->trim_start() : 0;
+	int const trim_end = film_a->trim_type() == Film::ENCODE ? film_a->trim_end() : 0;
 	_trimmer.reset (new Trimmer (
-				_film_a->log(), trim_start, trim_end, _film_a->content_length(),
-				_film_a->audio_frame_rate(), _film_a->video_frame_rate(), _film_a->dcp_frame_rate()
+				film_a->log(), trim_start, trim_end, film_a->content_length(),
+				film_a->audio_frame_rate(), film_a->video_frame_rate(), film_a->dcp_frame_rate()
 				));
 	
 
@@ -88,20 +86,7 @@ ABTranscoder::go ()
 {
 	_encoder->process_begin ();
 
-	bool done[2] = { false, false };
-	
-	while (1) {
-		done[0] = _player_a->pass ();
-		done[1] = _player_b->pass ();
-
-		if (_job) {
-			_player_a->set_progress (_job);
-		}
-
-		if (done[0] && done[1]) {
-			break;
-		}
-	}
+	while (!_player_a->pass () || !_player_b->pass ()) {}
 		
 	_delay_line->process_end ();
 	_matcher->process_end ();
diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
index 1fef66b88..134bce3e4 100644
--- a/src/lib/ab_transcoder.h
+++ b/src/lib/ab_transcoder.h
@@ -54,8 +54,6 @@ public:
 	void go ();
 
 private:
-	boost::shared_ptr<Film> _film_a;
-	boost::shared_ptr<Film> _film_b;
 	boost::shared_ptr<Player> _player_a;
 	boost::shared_ptr<Player> _player_b;
 	boost::shared_ptr<Job> _job;
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index c1d1041ae..d25e0d0f8 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -55,8 +55,9 @@ using boost::optional;
 int const Encoder::_history_size = 25;
 
 /** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<Film> f)
+Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Job> j)
 	: _film (f)
+	, _job (j)
 	, _video_frames_in (0)
 	, _video_frames_out (0)
 #ifdef HAVE_SWRESAMPLE	  
@@ -127,7 +128,7 @@ Encoder::process_begin ()
 		}
 	}
 
-	_writer.reset (new Writer (_film));
+	_writer.reset (new Writer (_film, _job));
 }
 
 
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index f95d42661..6cf5540c5 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -51,6 +51,7 @@ class ServerDescription;
 class DCPVideoFrame;
 class EncodedData;
 class Writer;
+class Job;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -62,11 +63,11 @@ class Writer;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-	Encoder (boost::shared_ptr<Film> f);
+	Encoder (boost::shared_ptr<Film> f, boost::shared_ptr<Job>);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
-	virtual void process_begin ();
+	void process_begin ();
 
 	/** Call with a frame of video.
 	 *  @param i Video frame image.
@@ -79,7 +80,7 @@ public:
 	void process_audio (boost::shared_ptr<const AudioBuffers>);
 
 	/** Called when a processing run has finished */
-	virtual void process_end ();
+	void process_end ();
 
 	float current_encoding_rate () const;
 	int video_frames_out () const;
@@ -93,6 +94,7 @@ private:
 
 	/** Film that we are encoding */
 	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<Job> _job;
 
 	/** Mutex for _time_history and _last_frame */
 	mutable boost::mutex _history_mutex;
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 68a962cdd..95036cfe0 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -121,18 +121,6 @@ Player::pass ()
 	return done;
 }
 
-void
-Player::set_progress (shared_ptr<Job> job)
-{
-	/* Assume progress can be divined from how far through the video we are */
-
-	if (_video_decoder >= _video_decoders.size() || !_playlist->video_length()) {
-		return;
-	}
-
-	job->set_progress ((_video_start[_video_decoder] + _video_decoders[_video_decoder]->video_frame()) / _playlist->video_length ());
-}
-
 void
 Player::process_video (shared_ptr<const Image> i, bool same, shared_ptr<Subtitle> s, double t)
 {
diff --git a/src/lib/player.h b/src/lib/player.h
index 20b83bfdb..b6fb41f6e 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -49,7 +49,6 @@ public:
 	void disable_subtitles ();
 
 	bool pass ();
-	void set_progress (boost::shared_ptr<Job>);
 	bool seek (double);
 	void seek_back ();
 	void seek_forward ();
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 2e33931bd..f8fe0c8d5 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -36,6 +36,7 @@
 #include "audio_decoder.h"
 #include "player.h"
 #include "trimmer.h"
+#include "job.h"
 
 using std::string;
 using boost::shared_ptr;
@@ -49,7 +50,7 @@ using boost::dynamic_pointer_cast;
 Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
 	: _job (j)
 	, _player (f->player ())
-	, _encoder (new Encoder (f))
+	, _encoder (new Encoder (f, j))
 {
 	_matcher.reset (new Matcher (f->log(), f->audio_frame_rate(), f->video_frame_rate()));
 	_delay_line.reset (new DelayLine (f->log(), f->audio_delay() * f->audio_frame_rate() / 1000));
@@ -82,13 +83,9 @@ void
 Transcoder::go ()
 {
 	_encoder->process_begin ();
-	while (1) {
-		if (_player->pass ()) {
-			break;
-		}
-		_player->set_progress (_job);
-	}
 
+	while (!_player->pass ()) {}
+	
 	_delay_line->process_end ();
 	if (_matcher) {
 		_matcher->process_end ();
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 97ecaabfc..48b453fe4 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -17,6 +17,8 @@
 
 */
 
+#include "types.h"
+
 /** @file  src/transcoder.h
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
@@ -51,7 +53,7 @@ public:
 	float current_encoding_rate () const;
 	int video_frames_out () const;
 
-protected:
+private:
 	/** A Job that is running this Transcoder, or 0 */
 	boost::shared_ptr<Job> _job;
 	boost::shared_ptr<Player> _player;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index b545848cb..c7d2cf8b4 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -34,6 +34,7 @@
 #include "player.h"
 #include "audio_mapping.h"
 #include "config.h"
+#include "job.h"
 
 #include "i18n.h"
 
@@ -47,8 +48,9 @@ using boost::shared_ptr;
 
 int const Writer::_maximum_frames_in_memory = 8;
 
-Writer::Writer (shared_ptr<Film> f)
+Writer::Writer (shared_ptr<Film> f, shared_ptr<Job> j)
 	: _film (f)
+	, _job (j)
 	, _first_nonexistant_frame (0)
 	, _thread (0)
 	, _finish (false)
@@ -202,6 +204,10 @@ try
 			}
 			}
 			lock.lock ();
+			
+			if (_film->video_length ()) {
+				_job->set_progress (float(_full_written + _fake_written + _repeat_written) / _film->video_length());
+			}
 
 			++_last_written_frame;
 		}
diff --git a/src/lib/writer.h b/src/lib/writer.h
index beb16c7b9..62714edf3 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -26,6 +26,7 @@
 class Film;
 class EncodedData;
 class AudioBuffers;
+class Job;
 
 namespace libdcp {
 	class MonoPictureAsset;
@@ -63,7 +64,7 @@ bool operator== (QueueItem const & a, QueueItem const & b);
 class Writer : public ExceptionStore
 {
 public:
-	Writer (boost::shared_ptr<Film>);
+	Writer (boost::shared_ptr<Film>, boost::shared_ptr<Job>);
 
 	bool can_fake_write (int) const;
 	
@@ -80,6 +81,7 @@ private:
 
 	/** our Film */
 	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<Job> _job;
 	/** the first frame index that does not already exist in our MXF */
 	int _first_nonexistant_frame;
 
-- 
cgit v1.2.3


From 76052960d07a611889967f5927e2adb0d867ea07 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 10 May 2013 21:55:06 +0100
Subject: Make libswresample mandatory.

---
 src/lib/encoder.cc    | 12 ------------
 src/lib/encoder.h     |  6 ------
 src/wx/film_editor.cc |  2 --
 wscript               | 10 +++-------
 4 files changed, 3 insertions(+), 27 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index d25e0d0f8..8e0d1cd91 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -60,9 +60,7 @@ Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Job> j)
 	, _job (j)
 	, _video_frames_in (0)
 	, _video_frames_out (0)
-#ifdef HAVE_SWRESAMPLE	  
 	, _swr_context (0)
-#endif
 	, _have_a_real_frame (false)
 	, _terminate (false)
 {
@@ -81,7 +79,6 @@ void
 Encoder::process_begin ()
 {
 	if (_film->has_audio() && _film->audio_frame_rate() != _film->target_audio_sample_rate()) {
-#ifdef HAVE_SWRESAMPLE
 
 		stringstream s;
 		s << String::compose (N_("Will resample audio from %1 to %2"), _film->audio_frame_rate(), _film->target_audio_sample_rate());
@@ -107,13 +104,8 @@ Encoder::process_begin ()
 			);
 		
 		swr_init (_swr_context);
-#else
-		throw EncodeError (_("Cannot resample audio as libswresample is not present"));
-#endif
 	} else {
-#ifdef HAVE_SWRESAMPLE
 		_swr_context = 0;
-#endif		
 	}
 
 	for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
@@ -135,7 +127,6 @@ Encoder::process_begin ()
 void
 Encoder::process_end ()
 {
-#if HAVE_SWRESAMPLE	
 	if (_film->has_audio() && _swr_context) {
 
 		shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_mapping().dcp_channels(), 256));
@@ -157,7 +148,6 @@ Encoder::process_end ()
 
 		swr_free (&_swr_context);
 	}
-#endif
 
 	boost::mutex::scoped_lock lock (_mutex);
 
@@ -306,7 +296,6 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Sub
 void
 Encoder::process_audio (shared_ptr<const AudioBuffers> data)
 {
-#if HAVE_SWRESAMPLE
 	/* Maybe sample-rate convert */
 	if (_swr_context) {
 
@@ -329,7 +318,6 @@ Encoder::process_audio (shared_ptr<const AudioBuffers> data)
 		/* And point our variables at the resampled audio */
 		data = resampled;
 	}
-#endif
 
 	_writer->write (data);
 }
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6cf5540c5..a3a484856 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -33,12 +33,8 @@
 #include <stdint.h>
 extern "C" {
 #include <libavutil/samplefmt.h>
-}
-#ifdef HAVE_SWRESAMPLE
-extern "C" {
 #include <libswresample/swresample.h>
 }
-#endif
 #include "util.h"
 #include "video_sink.h"
 #include "audio_sink.h"
@@ -110,9 +106,7 @@ private:
 	/** Number of video frames written for the DCP so far */
 	int _video_frames_out;
 
-#if HAVE_SWRESAMPLE	
 	SwrContext* _swr_context;
-#endif
 
 	bool _have_a_real_frame;
 	bool _terminate;
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index ca43ffb8a..528e3840f 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -810,7 +810,6 @@ FilmEditor::setup_frame_rate_description ()
 	if (_film->video_frame_rate()) {
 		d << std_to_wx (FrameRateConversion (_film->video_frame_rate(), _film->dcp_frame_rate()).description);
 		++lines;
-#ifdef HAVE_SWRESAMPLE
 		if (_film->audio_frame_rate() && _film->audio_frame_rate() != _film->target_audio_sample_rate ()) {
 			d << wxString::Format (
 				_("Audio will be resampled from %dHz to %dHz\n"),
@@ -819,7 +818,6 @@ FilmEditor::setup_frame_rate_description ()
 				);
 			++lines;
 		}
-#endif		
 	}
 
 	for (int i = lines; i < 2; ++i) {
diff --git a/wscript b/wscript
index 169e46257..50d6d9040 100644
--- a/wscript
+++ b/wscript
@@ -62,7 +62,7 @@ def configure(conf):
         conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
         conf.check_cfg(package = 'libavutil', args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = True)
         conf.check_cfg(package = 'libswscale', args = '--cflags --libs', uselib_store = 'SWSCALE', mandatory = True)
-        conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = False)
+        conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = True)
         conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True)
     else:
         # This is hackio grotesquio for static builds (ie for .deb packages).  We need to link some things
@@ -87,14 +87,10 @@ def configure(conf):
         conf.env.STLIB_AVUTIL = ['avutil']
         conf.env.HAVE_SWSCALE = 1
         conf.env.STLIB_SWSCALE = ['swscale']
-        conf.env.HAVE_SWRESAMPLE = 1
-        conf.env.STLIB_SWRESAMPLE = ['swresample']
         conf.env.HAVE_POSTPROC = 1
         conf.env.STLIB_POSTPROC = ['postproc']
-
-        # This doesn't seem to be set up, and we need it otherwise resampling support
-        # won't be included.  Hack upon a hack, obviously
-        conf.env.append_value('CXXFLAGS', ['-DHAVE_SWRESAMPLE=1'])
+        conf.env.HAVE_SWRESAMPLE = 1
+        conv.env.STLIB_SWRESAMPLE = ['swresample']
 
     conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
     conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True)
-- 
cgit v1.2.3


From d683883c4dc25cb612f6d5feb1e772016182e722 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 10 May 2013 23:06:17 +0100
Subject: Move SRC (badly) to AudioDecoder.

---
 src/lib/audio_decoder.cc   | 104 ++++++++++++++++++++++++++++++++++++++++++++-
 src/lib/audio_decoder.h    |  12 +++++-
 src/lib/encoder.cc         |  76 ---------------------------------
 src/lib/encoder.h          |   2 -
 src/lib/ffmpeg_decoder.cc  |   2 +-
 src/lib/sndfile_decoder.cc |   2 +-
 6 files changed, 116 insertions(+), 82 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index df13a984a..68554daf9 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -18,12 +18,114 @@
 */
 
 #include "audio_decoder.h"
+#include "exceptions.h"
+#include "log.h"
 
+#include "i18n.h"
+
+using std::stringstream;
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> f)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioContent> c)
 	: Decoder (f)
+	, _audio_content (c)
 {
+	if (_audio_content->audio_frame_rate() != _film->target_audio_sample_rate()) {
+
+		stringstream s;
+		s << String::compose ("Will resample audio from %1 to %2", _audio_content->audio_frame_rate(), _film->target_audio_sample_rate());
+		_film->log()->log (s.str ());
+
+		/* We will be using planar float data when we call the
+		   resampler.  As far as I can see, the audio channel
+		   layout is not necessary for our purposes; it seems
+		   only to be used get the number of channels and
+		   decide if rematrixing is needed.  It won't be, since
+		   input and output layouts are the same.
+		*/
 
+		_swr_context = swr_alloc_set_opts (
+			0,
+			av_get_default_channel_layout (MAX_AUDIO_CHANNELS),
+			AV_SAMPLE_FMT_FLTP,
+			_film->target_audio_sample_rate(),
+			av_get_default_channel_layout (MAX_AUDIO_CHANNELS),
+			AV_SAMPLE_FMT_FLTP,
+			_audio_content->audio_frame_rate(),
+			0, 0
+			);
+		
+		swr_init (_swr_context);
+	} else {
+		_swr_context = 0;
+	}
+}
+
+AudioDecoder::~AudioDecoder ()
+{
+	if (_swr_context) {
+		swr_free (&_swr_context);
+	}
 }
+	
+
+#if 0
+void
+AudioDecoder::process_end ()
+{
+	if (_film->has_audio() && _swr_context) {
+
+		shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_mapping().dcp_channels(), 256));
+			
+		while (1) {
+			int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0);
+
+			if (frames < 0) {
+				throw EncodeError (_("could not run sample-rate converter"));
+			}
+
+			if (frames == 0) {
+				break;
+			}
+
+			out->set_frames (frames);
+			_writer->write (out);
+		}
+
+	}
+}
+#endif
+
+void
+AudioDecoder::emit_audio (shared_ptr<const AudioBuffers> data, Time time)
+{
+	/* XXX: map audio to 5.1 */
+	
+	/* Maybe sample-rate convert */
+	if (_swr_context) {
+
+		/* Compute the resampled frames count and add 32 for luck */
+		int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _audio_content->audio_frame_rate()) + 32;
+
+		shared_ptr<AudioBuffers> resampled (new AudioBuffers (MAX_AUDIO_CHANNELS, max_resampled_frames));
+
+		/* Resample audio */
+		int const resampled_frames = swr_convert (
+			_swr_context, (uint8_t **) resampled->data(), max_resampled_frames, (uint8_t const **) data->data(), data->frames()
+			);
+		
+		if (resampled_frames < 0) {
+			throw EncodeError (_("could not run sample-rate converter"));
+		}
+
+		resampled->set_frames (resampled_frames);
+		
+		/* And point our variables at the resampled audio */
+		data = resampled;
+	}
+
+	Audio (data, time);
+}
+
+		
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index c393e95f1..8db16e369 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -26,6 +26,9 @@
 
 #include "audio_source.h"
 #include "decoder.h"
+extern "C" {
+#include <libswresample/swresample.h>
+}
 
 class AudioContent;
 
@@ -35,7 +38,14 @@ class AudioContent;
 class AudioDecoder : public TimedAudioSource, public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<const Film>);
+	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
+	~AudioDecoder ();
+
+	void emit_audio (boost::shared_ptr<const AudioBuffers>, Time);
+
+private:
+	boost::shared_ptr<const AudioContent> _audio_content;
+	SwrContext* _swr_context;
 };
 
 #endif
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 8e0d1cd91..f91a2c4e2 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -60,7 +60,6 @@ Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Job> j)
 	, _job (j)
 	, _video_frames_in (0)
 	, _video_frames_out (0)
-	, _swr_context (0)
 	, _have_a_real_frame (false)
 	, _terminate (false)
 {
@@ -78,36 +77,6 @@ Encoder::~Encoder ()
 void
 Encoder::process_begin ()
 {
-	if (_film->has_audio() && _film->audio_frame_rate() != _film->target_audio_sample_rate()) {
-
-		stringstream s;
-		s << String::compose (N_("Will resample audio from %1 to %2"), _film->audio_frame_rate(), _film->target_audio_sample_rate());
-		_film->log()->log (s.str ());
-
-		/* We will be using planar float data when we call the
-		   resampler.  As far as I can see, the audio channel
-		   layout is not necessary for our purposes; it seems
-		   only to be used get the number of channels and
-		   decide if rematrixing is needed.  It won't be, since
-		   input and output layouts are the same.
-		*/
-
-		_swr_context = swr_alloc_set_opts (
-			0,
-			av_get_default_channel_layout (_film->audio_mapping().dcp_channels ()),
-			AV_SAMPLE_FMT_FLTP,
-			_film->target_audio_sample_rate(),
-			av_get_default_channel_layout (_film->audio_mapping().dcp_channels ()),
-			AV_SAMPLE_FMT_FLTP,
-			_film->audio_frame_rate(),
-			0, 0
-			);
-		
-		swr_init (_swr_context);
-	} else {
-		_swr_context = 0;
-	}
-
 	for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
 		_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, (ServerDescription *) 0)));
 	}
@@ -127,28 +96,6 @@ Encoder::process_begin ()
 void
 Encoder::process_end ()
 {
-	if (_film->has_audio() && _swr_context) {
-
-		shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_mapping().dcp_channels(), 256));
-			
-		while (1) {
-			int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0);
-
-			if (frames < 0) {
-				throw EncodeError (_("could not run sample-rate converter"));
-			}
-
-			if (frames == 0) {
-				break;
-			}
-
-			out->set_frames (frames);
-			_writer->write (out);
-		}
-
-		swr_free (&_swr_context);
-	}
-
 	boost::mutex::scoped_lock lock (_mutex);
 
 	_film->log()->log (String::compose (N_("Clearing queue of %1"), _queue.size ()));
@@ -296,29 +243,6 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Sub
 void
 Encoder::process_audio (shared_ptr<const AudioBuffers> data)
 {
-	/* Maybe sample-rate convert */
-	if (_swr_context) {
-
-		/* Compute the resampled frames count and add 32 for luck */
-		int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _film->audio_frame_rate()) + 32;
-
-		shared_ptr<AudioBuffers> resampled (new AudioBuffers (_film->audio_mapping().dcp_channels(), max_resampled_frames));
-
-		/* Resample audio */
-		int const resampled_frames = swr_convert (
-			_swr_context, (uint8_t **) resampled->data(), max_resampled_frames, (uint8_t const **) data->data(), data->frames()
-			);
-		
-		if (resampled_frames < 0) {
-			throw EncodeError (_("could not run sample-rate converter"));
-		}
-
-		resampled->set_frames (resampled_frames);
-		
-		/* And point our variables at the resampled audio */
-		data = resampled;
-	}
-
 	_writer->write (data);
 }
 
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index a3a484856..cce26efc8 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -106,8 +106,6 @@ private:
 	/** Number of video frames written for the DCP so far */
 	int _video_frames_out;
 
-	SwrContext* _swr_context;
-
 	bool _have_a_real_frame;
 	bool _terminate;
 	std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index b857860bd..0e704bb14 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -66,7 +66,7 @@ boost::mutex FFmpegDecoder::_mutex;
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegContent> c, bool video, bool audio, bool subtitles)
 	: Decoder (f)
 	, VideoDecoder (f)
-	, AudioDecoder (f)
+	, AudioDecoder (f, c)
 	, _ffmpeg_content (c)
 	, _format_context (0)
 	, _video_stream (-1)
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index dd9e654c7..dc22475cd 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -34,7 +34,7 @@ using boost::shared_ptr;
 
 SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
 	: Decoder (f)
-	, AudioDecoder (f)
+	, AudioDecoder (f, c)
 	, _sndfile_content (c)
 	, _deinterleave_buffer (0)
 {
-- 
cgit v1.2.3


From 0db016f90ae722fc8b72d465e21d9f153f72b340 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 10 May 2013 23:31:25 +0100
Subject: Remove Timed*Sink and Timed*Source>

---
 src/lib/audio_decoder.h |  2 +-
 src/lib/audio_sink.h    |  9 +--------
 src/lib/audio_source.cc | 26 +++-----------------------
 src/lib/audio_source.h  | 16 ++--------------
 src/lib/combiner.cc     |  2 +-
 src/lib/combiner.h      |  6 +++---
 src/lib/encoder.cc      |  4 ++--
 src/lib/encoder.h       |  4 ++--
 src/lib/player.h        |  2 +-
 src/lib/processor.h     | 17 -----------------
 src/lib/video_decoder.h |  2 +-
 src/lib/video_sink.h    | 14 +-------------
 src/lib/video_source.cc | 26 +++-----------------------
 src/lib/video_source.h  | 22 +---------------------
 14 files changed, 22 insertions(+), 130 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 8db16e369..1c7287a55 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -35,7 +35,7 @@ class AudioContent;
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public TimedAudioSource, public virtual Decoder
+class AudioDecoder : public AudioSource, public virtual Decoder
 {
 public:
 	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
diff --git a/src/lib/audio_sink.h b/src/lib/audio_sink.h
index ee39f9ee7..2e3ead005 100644
--- a/src/lib/audio_sink.h
+++ b/src/lib/audio_sink.h
@@ -24,14 +24,7 @@ class AudioSink
 {
 public:
 	/** Call with some audio data */
-	virtual void process_audio (boost::shared_ptr<const AudioBuffers>) = 0;
-};
-
-class TimedAudioSink
-{
-public:
-        /** Call with some audio data */
-        virtual void process_audio (boost::shared_ptr<const AudioBuffers>, double t) = 0;
+	virtual void process_audio (boost::shared_ptr<const AudioBuffers>, Time) = 0;
 };
 
 #endif
diff --git a/src/lib/audio_source.cc b/src/lib/audio_source.cc
index 2867bcc24..e61721646 100644
--- a/src/lib/audio_source.cc
+++ b/src/lib/audio_source.cc
@@ -25,38 +25,18 @@ using boost::weak_ptr;
 using boost::bind;
 
 static void
-process_audio_proxy (weak_ptr<AudioSink> sink, shared_ptr<const AudioBuffers> audio)
+process_audio_proxy (weak_ptr<AudioSink> sink, shared_ptr<const AudioBuffers> audio, Time time)
 {
 	shared_ptr<AudioSink> p = sink.lock ();
 	if (p) {
-		p->process_audio (audio);
+		p->process_audio (audio, time);
 	}
 }
 
 void
 AudioSource::connect_audio (shared_ptr<AudioSink> s)
 {
-	Audio.connect (bind (process_audio_proxy, weak_ptr<AudioSink> (s), _1));
+	Audio.connect (bind (process_audio_proxy, weak_ptr<AudioSink> (s), _1, _2));
 }
 
-void
-TimedAudioSource::connect_audio (shared_ptr<AudioSink> s)
-{
-	Audio.connect (bind (process_audio_proxy, weak_ptr<AudioSink> (s), _1));
-}
-
-static void
-timed_process_audio_proxy (weak_ptr<TimedAudioSink> sink, shared_ptr<const AudioBuffers> audio, double t)
-{
-	shared_ptr<TimedAudioSink> p = sink.lock ();
-	if (p) {
-		p->process_audio (audio, t);
-	}
-}
-
-void
-TimedAudioSource::connect_audio (shared_ptr<TimedAudioSink> s)
-{
-	Audio.connect (bind (timed_process_audio_proxy, weak_ptr<TimedAudioSink> (s), _1, _2));
-}
 
diff --git a/src/lib/audio_source.h b/src/lib/audio_source.h
index c7f0a09ed..ef47e969b 100644
--- a/src/lib/audio_source.h
+++ b/src/lib/audio_source.h
@@ -25,31 +25,19 @@
 #define DCPOMATIC_AUDIO_SOURCE_H
 
 #include <boost/signals2.hpp>
+#include "types.h"
 
 class AudioBuffers;
 class AudioSink;
-class TimedAudioSink;
 
 /** A class that emits audio data */
 class AudioSource
 {
 public:
 	/** Emitted when some audio data is ready */
-	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>)> Audio;
+	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, Time)> Audio;
 
 	void connect_audio (boost::shared_ptr<AudioSink>);
 };
 
-
-/** A class that emits audio data with timestamps */
-class TimedAudioSource
-{
-public:
-	/** Emitted when some audio data is ready */
-	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, double)> Audio;
-
-	void connect_audio (boost::shared_ptr<AudioSink>);
-	void connect_audio (boost::shared_ptr<TimedAudioSink>);
-};
-
 #endif
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index 367cefa7f..9f9461ec2 100644
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -23,7 +23,7 @@
 using boost::shared_ptr;
 
 Combiner::Combiner (shared_ptr<Log> log)
-	: TimedVideoProcessor (log)
+	: VideoProcessor (log)
 {
 
 }
diff --git a/src/lib/combiner.h b/src/lib/combiner.h
index 7ed316e26..062297f0d 100644
--- a/src/lib/combiner.h
+++ b/src/lib/combiner.h
@@ -28,13 +28,13 @@
  *  one image used for the left half of the screen and the other for
  *  the right.
  */
-class Combiner : public TimedVideoProcessor
+class Combiner : public VideoProcessor
 {
 public:
 	Combiner (boost::shared_ptr<Log> log);
 
-	void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
-	void process_video_b (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
+	void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, Time);
+	void process_video_b (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, Time);
 
 private:
 	/** The image that we are currently working on */
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index f91a2c4e2..6cb384e20 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -178,7 +178,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub)
+Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time)
 {
 	FrameRateConversion frc (_film->video_frame_rate(), _film->dcp_frame_rate());
 	
@@ -241,7 +241,7 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Sub
 }
 
 void
-Encoder::process_audio (shared_ptr<const AudioBuffers> data)
+Encoder::process_audio (shared_ptr<const AudioBuffers> data, Time)
 {
 	_writer->write (data);
 }
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index cce26efc8..b6d3663fd 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -70,10 +70,10 @@ public:
 	 *  @param same true if i is the same as the last time we were called.
 	 *  @param s A subtitle that should be on this frame, or 0.
 	 */
-	void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s);
+	void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s, Time);
 
 	/** Call with some audio data */
-	void process_audio (boost::shared_ptr<const AudioBuffers>);
+	void process_audio (boost::shared_ptr<const AudioBuffers>, Time);
 
 	/** Called when a processing run has finished */
 	void process_end ();
diff --git a/src/lib/player.h b/src/lib/player.h
index b6fb41f6e..b1be2f456 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -39,7 +39,7 @@ class AudioContent;
  *  @brief A class which can `play' a Playlist; emitting its audio and video.
  */
  
-class Player : public TimedVideoSource, public TimedAudioSource, public TimedVideoSink, public boost::enable_shared_from_this<Player>
+class Player : public VideoSource, public AudioSource, public VideoSink, public boost::enable_shared_from_this<Player>
 {
 public:
 	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
diff --git a/src/lib/processor.h b/src/lib/processor.h
index 7b7735faa..5dbafab7f 100644
--- a/src/lib/processor.h
+++ b/src/lib/processor.h
@@ -67,15 +67,6 @@ public:
 	{}
 };
 
-class TimedAudioVideoProcessor : public Processor, public TimedVideoSource, public TimedVideoSink, public TimedAudioSource, public TimedAudioSink
-{
-public:
-	TimedAudioVideoProcessor (boost::shared_ptr<Log> log)
-		: Processor (log)
-	{}
-};
-				
-
 /** @class AudioProcessor
  *  @brief A processor which handles just audio data.
  */
@@ -104,12 +95,4 @@ public:
 	{}
 };
 
-class TimedVideoProcessor : public Processor, public TimedVideoSource, public TimedVideoSink
-{
-public:
-	TimedVideoProcessor (boost::shared_ptr<Log> log)
-		: Processor (log)
-	{}
-};	
-
 #endif
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 0b05b2f71..88730f518 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -25,7 +25,7 @@
 
 class VideoContent;
 
-class VideoDecoder : public TimedVideoSource, public virtual Decoder
+class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
 	VideoDecoder (boost::shared_ptr<const Film>);
diff --git a/src/lib/video_sink.h b/src/lib/video_sink.h
index 6239bc557..2da42528c 100644
--- a/src/lib/video_sink.h
+++ b/src/lib/video_sink.h
@@ -34,19 +34,7 @@ public:
 	 *  @param same true if i is the same as last time we were called.
 	 *  @param s A subtitle that should be on this frame, or 0.
 	 */
-	virtual void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s) = 0;
-};
-
-class TimedVideoSink
-{
-public:
-	/** Call with a frame of video.
-	 *  @param i Video frame image.
-	 *  @param same true if i is the same as last time we were called.
-	 *  @param s A subtitle that should be on this frame, or 0.
-	 *  @param t Source timestamp.
-	 */
-	virtual void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s, double t) = 0;
+	virtual void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s, Time) = 0;
 };
 
 #endif
diff --git a/src/lib/video_source.cc b/src/lib/video_source.cc
index 4d505f9fe..39043c860 100644
--- a/src/lib/video_source.cc
+++ b/src/lib/video_source.cc
@@ -25,11 +25,11 @@ using boost::weak_ptr;
 using boost::bind;
 
 static void
-process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<const Image> i, bool same, shared_ptr<Subtitle> s)
+process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time time)
 {
 	shared_ptr<VideoSink> p = sink.lock ();
 	if (p) {
-		p->process_video (i, same, s);
+		p->process_video (image, same, sub, time);
 	}
 }
 
@@ -39,26 +39,6 @@ VideoSource::connect_video (shared_ptr<VideoSink> s)
 	/* If we bind, say, a Player (as the VideoSink) to a Decoder (which is owned
 	   by the Player) we create a cycle.  Use a weak_ptr to break it.
 	*/
-	Video.connect (bind (process_video_proxy, weak_ptr<VideoSink> (s), _1, _2, _3));
+	Video.connect (bind (process_video_proxy, weak_ptr<VideoSink> (s), _1, _2, _3, _4));
 }
 
-void
-TimedVideoSource::connect_video (shared_ptr<VideoSink> s)
-{
-	Video.connect (bind (process_video_proxy, weak_ptr<VideoSink> (s), _1, _2, _3));
-}
-
-static void
-timed_process_video_proxy (weak_ptr<TimedVideoSink> sink, shared_ptr<const Image> i, bool same, shared_ptr<Subtitle> s, double t)
-{
-	shared_ptr<TimedVideoSink> p = sink.lock ();
-	if (p) {
-		p->process_video (i, same, s, t);
-	}
-}
-
-void
-TimedVideoSource::connect_video (shared_ptr<TimedVideoSink> s)
-{
-	Video.connect (bind (timed_process_video_proxy, weak_ptr<TimedVideoSink> (s), _1, _2, _3, _4));
-}
diff --git a/src/lib/video_source.h b/src/lib/video_source.h
index 9b4c9b4a2..7ad554480 100644
--- a/src/lib/video_source.h
+++ b/src/lib/video_source.h
@@ -29,7 +29,6 @@
 #include "util.h"
 
 class VideoSink;
-class TimedVideoSink;
 class Subtitle;
 class Image;
 
@@ -45,28 +44,9 @@ public:
 	 *  Second parameter is true if the image is the same as the last one that was emitted.
 	 *  Third parameter is either 0 or a subtitle that should be on this frame.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, Time)> Video;
 
 	void connect_video (boost::shared_ptr<VideoSink>);
 };
 
-/** @class TimedVideoSource
- *  @param A class that emits video data with timestamps.
- */
-class TimedVideoSource
-{
-public:
-
-	/** Emitted when a video frame is ready.
-	 *  First parameter is the video image.
-	 *  Second parameter is true if the image is the same as the last one that was emitted.
-	 *  Third parameter is either 0 or a subtitle that should be on this frame.
-	 *  Fourth parameter is the source timestamp of this frame.
-	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, double)> Video;
-
-	void connect_video (boost::shared_ptr<VideoSink>);
-	void connect_video (boost::shared_ptr<TimedVideoSink>);
-};
-
 #endif
-- 
cgit v1.2.3


From 21ce34c2cd04a2e7e133ff693b84c054182f4f91 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 16 May 2013 08:36:47 +0100
Subject: Compiles; strange hang on adding content to a film.

---
 src/lib/analyse_audio_job.cc    |   4 +-
 src/lib/audio_buffers.cc        | 222 +++++++++++++++++++++
 src/lib/audio_buffers.h         |  67 +++++++
 src/lib/audio_content.cc        |   6 -
 src/lib/audio_content.h         |   5 +-
 src/lib/audio_decoder.cc        |  14 +-
 src/lib/audio_decoder.h         |   1 +
 src/lib/audio_mapping.cc        |  51 ++---
 src/lib/audio_mapping.h         |  28 +--
 src/lib/audio_sink.h            |   2 +
 src/lib/combiner.cc             |   4 +-
 src/lib/content.h               |   2 +-
 src/lib/decoder.h               |   1 -
 src/lib/encoder.cc              |  17 +-
 src/lib/encoder.h               |   2 -
 src/lib/ffmpeg_content.cc       |  33 +++-
 src/lib/ffmpeg_content.h        |   5 +-
 src/lib/ffmpeg_decoder.cc       |   5 +-
 src/lib/film.cc                 | 188 ++++++------------
 src/lib/film.h                  |  48 ++---
 src/lib/format.cc               |   3 +-
 src/lib/format.h                |   2 +-
 src/lib/imagemagick_content.cc  |   7 +
 src/lib/imagemagick_content.h   |   1 +
 src/lib/player.cc               | 338 +++++++++++++++-----------------
 src/lib/player.h                |  53 ++---
 src/lib/playlist.cc             | 419 +++++++++++++---------------------------
 src/lib/playlist.h              |  77 +++-----
 src/lib/sndfile_content.cc      |  14 +-
 src/lib/sndfile_content.h       |   5 +-
 src/lib/sndfile_decoder.cc      |   3 +-
 src/lib/subtitle.h              |   2 +-
 src/lib/transcode_job.cc        |  13 +-
 src/lib/types.h                 |  10 +-
 src/lib/util.cc                 | 227 +---------------------
 src/lib/util.h                  |  50 +----
 src/lib/video_content.cc        |   6 -
 src/lib/video_content.h         |   1 -
 src/lib/video_decoder.cc        |   4 +-
 src/lib/writer.cc               |  47 ++---
 src/lib/wscript                 |   1 +
 src/wx/audio_dialog.cc          |   4 -
 src/wx/audio_mapping_view.cc    |   8 +-
 src/wx/ffmpeg_content_dialog.cc |   2 +-
 src/wx/film_editor.cc           | 149 ++++----------
 src/wx/film_editor.h            |   6 -
 src/wx/film_viewer.cc           |  18 +-
 src/wx/properties_dialog.cc     |  10 +-
 src/wx/timeline.cc              | 102 ++++------
 src/wx/timeline.h               |  16 +-
 src/wx/timeline_dialog.cc       |   4 +-
 src/wx/timeline_dialog.h        |   2 +-
 test/test.cc                    |  32 +--
 wscript                         |   2 +-
 54 files changed, 990 insertions(+), 1353 deletions(-)
 create mode 100644 src/lib/audio_buffers.cc
 create mode 100644 src/lib/audio_buffers.h

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index f3c55b208..0ed33827c 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -55,13 +55,13 @@ AnalyseAudioJob::run ()
 	
 	player->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
 
-	_samples_per_point = max (int64_t (1), _film->audio_length() / _num_points);
+	_samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length()) / _num_points);
 
 	_current.resize (MAX_AUDIO_CHANNELS);
 	_analysis.reset (new AudioAnalysis (MAX_AUDIO_CHANNELS));
 			 
 	while (!player->pass()) {
-		set_progress (float (_done) / _film->audio_length ());
+		set_progress (float (_done) / _film->time_to_audio_frames (_film->length ()));
 	}
 
 	_analysis->write (_film->audio_analysis_path ());
diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc
new file mode 100644
index 000000000..cd8fcd35b
--- /dev/null
+++ b/src/lib/audio_buffers.cc
@@ -0,0 +1,222 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <cassert>
+#include <cstring>
+#include <stdexcept>
+#include "audio_buffers.h"
+
+using std::bad_alloc;
+using boost::shared_ptr;
+
+/** Construct an AudioBuffers.  Audio data is undefined after this constructor.
+ *  @param channels Number of channels.
+ *  @param frames Number of frames to reserve space for.
+ */
+AudioBuffers::AudioBuffers (int channels, int frames)
+	: _channels (channels)
+	, _frames (frames)
+	, _allocated_frames (frames)
+{
+	_data = static_cast<float**> (malloc (_channels * sizeof (float *)));
+	if (!_data) {
+		throw bad_alloc ();
+	}
+	
+	for (int i = 0; i < _channels; ++i) {
+		_data[i] = static_cast<float*> (malloc (frames * sizeof (float)));
+		if (!_data[i]) {
+			throw bad_alloc ();
+		}
+	}
+}
+
+/** Copy constructor.
+ *  @param other Other AudioBuffers; data is copied.
+ */
+AudioBuffers::AudioBuffers (AudioBuffers const & other)
+	: _channels (other._channels)
+	, _frames (other._frames)
+	, _allocated_frames (other._frames)
+{
+	_data = static_cast<float**> (malloc (_channels * sizeof (float *)));
+	if (!_data) {
+		throw bad_alloc ();
+	}
+	
+	for (int i = 0; i < _channels; ++i) {
+		_data[i] = static_cast<float*> (malloc (_frames * sizeof (float)));
+		if (!_data[i]) {
+			throw bad_alloc ();
+		}
+		memcpy (_data[i], other._data[i], _frames * sizeof (float));
+	}
+}
+
+/* XXX: it's a shame that this is a copy-and-paste of the above;
+   probably fixable with c++0x.
+*/
+AudioBuffers::AudioBuffers (boost::shared_ptr<const AudioBuffers> other)
+	: _channels (other->_channels)
+	, _frames (other->_frames)
+	, _allocated_frames (other->_frames)
+{
+	_data = static_cast<float**> (malloc (_channels * sizeof (float *)));
+	if (!_data) {
+		throw bad_alloc ();
+	}
+	
+	for (int i = 0; i < _channels; ++i) {
+		_data[i] = static_cast<float*> (malloc (_frames * sizeof (float)));
+		if (!_data[i]) {
+			throw bad_alloc ();
+		}
+		memcpy (_data[i], other->_data[i], _frames * sizeof (float));
+	}
+}
+
+/** AudioBuffers destructor */
+AudioBuffers::~AudioBuffers ()
+{
+	for (int i = 0; i < _channels; ++i) {
+		free (_data[i]);
+	}
+
+	free (_data);
+}
+
+/** @param c Channel index.
+ *  @return Buffer for this channel.
+ */
+float*
+AudioBuffers::data (int c) const
+{
+	assert (c >= 0 && c < _channels);
+	return _data[c];
+}
+
+/** Set the number of frames that these AudioBuffers will report themselves
+ *  as having.
+ *  @param f Frames; must be less than or equal to the number of allocated frames.
+ */
+void
+AudioBuffers::set_frames (int f)
+{
+	assert (f <= _allocated_frames);
+	_frames = f;
+}
+
+/** Make all samples on all channels silent */
+void
+AudioBuffers::make_silent ()
+{
+	for (int i = 0; i < _channels; ++i) {
+		make_silent (i);
+	}
+}
+
+/** Make all samples on a given channel silent.
+ *  @param c Channel.
+ */
+void
+AudioBuffers::make_silent (int c)
+{
+	assert (c >= 0 && c < _channels);
+	
+	for (int i = 0; i < _frames; ++i) {
+		_data[c][i] = 0;
+	}
+}
+
+/** Copy data from another AudioBuffers to this one.  All channels are copied.
+ *  @param from AudioBuffers to copy from; must have the same number of channels as this.
+ *  @param frames_to_copy Number of frames to copy.
+ *  @param read_offset Offset to read from in `from'.
+ *  @param write_offset Offset to write to in `to'.
+ */
+void
+AudioBuffers::copy_from (AudioBuffers const * from, int frames_to_copy, int read_offset, int write_offset)
+{
+	assert (from->channels() == channels());
+
+	assert (from);
+	assert (read_offset >= 0 && (read_offset + frames_to_copy) <= from->_allocated_frames);
+	assert (write_offset >= 0 && (write_offset + frames_to_copy) <= _allocated_frames);
+
+	for (int i = 0; i < _channels; ++i) {
+		memcpy (_data[i] + write_offset, from->_data[i] + read_offset, frames_to_copy * sizeof(float));
+	}
+}
+
+/** Move audio data around.
+ *  @param from Offset to move from.
+ *  @param to Offset to move to.
+ *  @param frames Number of frames to move.
+ */
+    
+void
+AudioBuffers::move (int from, int to, int frames)
+{
+	if (frames == 0) {
+		return;
+	}
+	
+	assert (from >= 0);
+	assert (from < _frames);
+	assert (to >= 0);
+	assert (to < _frames);
+	assert (frames > 0);
+	assert (frames <= _frames);
+	assert ((from + frames) <= _frames);
+	assert ((to + frames) <= _frames);
+	
+	for (int i = 0; i < _channels; ++i) {
+		memmove (_data[i] + to, _data[i] + from, frames * sizeof(float));
+	}
+}
+
+/** Add data from from `from', `from_channel' to our channel `to_channel' */
+void
+AudioBuffers::accumulate (AudioBuffers const * from, int from_channel, int to_channel)
+{
+	int const N = frames ();
+	assert (from->frames() == N);
+
+	float* s = from->data (from_channel);
+	float* d = _data[to_channel];
+
+	for (int i = 0; i < N; ++i) {
+		*d++ += *s++;
+	}
+}
+
+void
+AudioBuffers::ensure_size (int frames)
+{
+	if (_allocated_frames >= frames) {
+		return;
+	}
+
+	for (int i = 0; i < _channels; ++i) {
+		_data[i] = static_cast<float*> (realloc (_data[i], _frames * sizeof (float)));
+		if (!_data[i]) {
+			throw bad_alloc ();
+		}
+	}
+}
diff --git a/src/lib/audio_buffers.h b/src/lib/audio_buffers.h
new file mode 100644
index 000000000..5e7b9fda4
--- /dev/null
+++ b/src/lib/audio_buffers.h
@@ -0,0 +1,67 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/shared_ptr.hpp>
+
+/** @class AudioBuffers
+ *  @brief A class to hold multi-channel audio data in float format.
+ */
+class AudioBuffers
+{
+public:
+	AudioBuffers (int channels, int frames);
+	AudioBuffers (AudioBuffers const &);
+	AudioBuffers (boost::shared_ptr<const AudioBuffers>);
+	~AudioBuffers ();
+
+	void ensure_size (int);
+
+	float** data () const {
+		return _data;
+	}
+	
+	float* data (int) const;
+
+	int channels () const {
+		return _channels;
+	}
+
+	int frames () const {
+		return _frames;
+	}
+
+	void set_frames (int f);
+
+	void make_silent ();
+	void make_silent (int c);
+
+	void copy_from (AudioBuffers const * from, int frames_to_copy, int read_offset, int write_offset);
+	void move (int from, int to, int frames);
+	void accumulate (AudioBuffers const *, int, int);
+
+private:
+	/** Number of channels */
+	int _channels;
+	/** Number of frames (where a frame is one sample across all channels) */
+	int _frames;
+	/** Number of frames that _data can hold */
+	int _allocated_frames;
+	/** Audio data (so that, e.g. _data[2][6] is channel 2, sample 6) */
+	float** _data;
+};
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index dfa48d97e..9968f4725 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -43,9 +43,3 @@ AudioContent::AudioContent (AudioContent const & o)
 {
 
 }
-
-Time
-AudioContent::temporal_length () const
-{
-	return audio_length() / audio_frame_rate();
-}
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 18107843c..87858488c 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -44,9 +44,8 @@ public:
 
         virtual int audio_channels () const = 0;
         virtual ContentAudioFrame audio_length () const = 0;
-        virtual int audio_frame_rate () const = 0;
-
-	Time temporal_length () const;
+        virtual int content_audio_frame_rate () const = 0;
+	virtual int output_audio_frame_rate (boost::shared_ptr<const Film>) const = 0;
 };
 
 #endif
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 68554daf9..e1c93ac77 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -18,6 +18,7 @@
 */
 
 #include "audio_decoder.h"
+#include "audio_buffers.h"
 #include "exceptions.h"
 #include "log.h"
 
@@ -30,11 +31,12 @@ using boost::shared_ptr;
 AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioContent> c)
 	: Decoder (f)
 	, _audio_content (c)
+	, _output_audio_frame_rate (_audio_content->output_audio_frame_rate (f))
 {
-	if (_audio_content->audio_frame_rate() != _film->target_audio_sample_rate()) {
+	if (_audio_content->content_audio_frame_rate() != _output_audio_frame_rate) {
 
 		stringstream s;
-		s << String::compose ("Will resample audio from %1 to %2", _audio_content->audio_frame_rate(), _film->target_audio_sample_rate());
+		s << String::compose ("Will resample audio from %1 to %2", _audio_content->content_audio_frame_rate(), _output_audio_frame_rate);
 		_film->log()->log (s.str ());
 
 		/* We will be using planar float data when we call the
@@ -49,10 +51,10 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioCont
 			0,
 			av_get_default_channel_layout (MAX_AUDIO_CHANNELS),
 			AV_SAMPLE_FMT_FLTP,
-			_film->target_audio_sample_rate(),
+			_output_audio_frame_rate,
 			av_get_default_channel_layout (MAX_AUDIO_CHANNELS),
 			AV_SAMPLE_FMT_FLTP,
-			_audio_content->audio_frame_rate(),
+			_audio_content->content_audio_frame_rate(),
 			0, 0
 			);
 		
@@ -74,7 +76,7 @@ AudioDecoder::~AudioDecoder ()
 void
 AudioDecoder::process_end ()
 {
-	if (_film->has_audio() && _swr_context) {
+	if (_swr_context) {
 
 		shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_mapping().dcp_channels(), 256));
 			
@@ -106,7 +108,7 @@ AudioDecoder::emit_audio (shared_ptr<const AudioBuffers> data, Time time)
 	if (_swr_context) {
 
 		/* Compute the resampled frames count and add 32 for luck */
-		int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _audio_content->audio_frame_rate()) + 32;
+		int const max_resampled_frames = ceil ((int64_t) data->frames() * _output_audio_frame_rate / _audio_content->content_audio_frame_rate()) + 32;
 
 		shared_ptr<AudioBuffers> resampled (new AudioBuffers (MAX_AUDIO_CHANNELS, max_resampled_frames));
 
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 1c7287a55..94845ec23 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -46,6 +46,7 @@ public:
 private:
 	boost::shared_ptr<const AudioContent> _audio_content;
 	SwrContext* _swr_context;
+	int _output_audio_frame_rate;
 };
 
 #endif
diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index 7e28aa5c4..e1fa0c220 100644
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -31,7 +31,7 @@ using boost::lexical_cast;
 using boost::dynamic_pointer_cast;
 
 void
-AudioMapping::add (Channel c, libdcp::Channel d)
+AudioMapping::add (int c, libdcp::Channel d)
 {
 	_content_to_dcp.push_back (make_pair (c, d));
 }
@@ -40,7 +40,7 @@ AudioMapping::add (Channel c, libdcp::Channel d)
 int
 AudioMapping::dcp_channels () const
 {
-	for (list<pair<Channel, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
+	for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
 		if (((int) i->second) >= 2) {
 			return 6;
 		}
@@ -49,11 +49,11 @@ AudioMapping::dcp_channels () const
 	return 2;
 }
 
-list<AudioMapping::Channel>
+list<int>
 AudioMapping::dcp_to_content (libdcp::Channel d) const
 {
-	list<AudioMapping::Channel> c;
-	for (list<pair<Channel, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
+	list<int> c;
+	for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
 		if (i->second == d) {
 			c.push_back (i->first);
 		}
@@ -62,11 +62,11 @@ AudioMapping::dcp_to_content (libdcp::Channel d) const
 	return c;
 }
 
-list<AudioMapping::Channel>
+list<int>
 AudioMapping::content_channels () const
 {
-	list<AudioMapping::Channel> c;
-	for (list<pair<Channel, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
+	list<int> c;
+	for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
 		if (find (c.begin(), c.end(), i->first) == c.end ()) {
 			c.push_back (i->first);
 		}
@@ -76,10 +76,10 @@ AudioMapping::content_channels () const
 }
 
 list<libdcp::Channel>
-AudioMapping::content_to_dcp (Channel c) const
+AudioMapping::content_to_dcp (int c) const
 {
 	list<libdcp::Channel> d;
-	for (list<pair<Channel, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
+	for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
 		if (i->first == c) {
 			d.push_back (i->second);
 		}
@@ -91,41 +91,18 @@ AudioMapping::content_to_dcp (Channel c) const
 void
 AudioMapping::as_xml (xmlpp::Node* node) const
 {
-	for (list<pair<Channel, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
+	for (list<pair<int, libdcp::Channel> >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) {
 		xmlpp::Node* t = node->add_child ("Map");
-		shared_ptr<const AudioContent> c = i->first.content.lock ();
-		t->add_child ("Content")->add_child_text (c->digest ());
-		t->add_child ("ContentIndex")->add_child_text (lexical_cast<string> (i->first.index));
+		t->add_child ("ContentIndex")->add_child_text (lexical_cast<string> (i->first));
 		t->add_child ("DCP")->add_child_text (lexical_cast<string> (i->second));
 	}
 }
 
 void
-AudioMapping::set_from_xml (ContentList const & content, shared_ptr<const cxml::Node> node)
+AudioMapping::set_from_xml (shared_ptr<const cxml::Node> node)
 {
 	list<shared_ptr<cxml::Node> > const c = node->node_children ("Map");
 	for (list<shared_ptr<cxml::Node> >::const_iterator i = c.begin(); i != c.end(); ++i) {
-		string const c = (*i)->string_child ("Content");
-		ContentList::const_iterator j = content.begin ();
-		while (j != content.end() && (*j)->digest() != c) {
-			++j;
-		}
-
-		if (j == content.end ()) {
-			continue;
-		}
-
-		shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (*j);
-		assert (ac);
-
-		add (AudioMapping::Channel (ac, (*i)->number_child<int> ("ContentIndex")), static_cast<libdcp::Channel> ((*i)->number_child<int> ("DCP")));
+		add ((*i)->number_child<int> ("ContentIndex"), static_cast<libdcp::Channel> ((*i)->number_child<int> ("DCP")));
 	}
 }
-
-bool
-operator== (AudioMapping::Channel const & a, AudioMapping::Channel const & b)
-{
-	shared_ptr<const AudioContent> sa = a.content.lock ();
-	shared_ptr<const AudioContent> sb = b.content.lock ();
-	return sa == sb && a.index == b.index;
-}
diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 248d2570e..3c471d3f4 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -30,33 +30,21 @@ class AudioMapping
 {
 public:
 	void as_xml (xmlpp::Node *) const;
-	void set_from_xml (ContentList const &, boost::shared_ptr<const cxml::Node>);
-	
-	struct Channel {
-		Channel (boost::weak_ptr<const AudioContent> c, int i)
-			: content (c)
-			, index (i)
-		{}
-		
-		boost::weak_ptr<const AudioContent> content;
-		int index;
-	};
-
-	void add (Channel, libdcp::Channel);
+	void set_from_xml (boost::shared_ptr<const cxml::Node>);
+
+	void add (int, libdcp::Channel);
 
 	int dcp_channels () const;
-	std::list<Channel> dcp_to_content (libdcp::Channel) const;
-	std::list<std::pair<Channel, libdcp::Channel> > content_to_dcp () const {
+	std::list<int> dcp_to_content (libdcp::Channel) const;
+	std::list<std::pair<int, libdcp::Channel> > content_to_dcp () const {
 		return _content_to_dcp;
 	}
 
-	std::list<Channel> content_channels () const;
-	std::list<libdcp::Channel> content_to_dcp (Channel) const;
+	std::list<int> content_channels () const;
+	std::list<libdcp::Channel> content_to_dcp (int) const;
 
 private:
-	std::list<std::pair<Channel, libdcp::Channel> > _content_to_dcp;
+	std::list<std::pair<int, libdcp::Channel> > _content_to_dcp;
 };
 
-extern bool operator== (AudioMapping::Channel const &, AudioMapping::Channel const &);
-
 #endif
diff --git a/src/lib/audio_sink.h b/src/lib/audio_sink.h
index 2e3ead005..1aad5edf9 100644
--- a/src/lib/audio_sink.h
+++ b/src/lib/audio_sink.h
@@ -20,6 +20,8 @@
 #ifndef DCPOMATIC_AUDIO_SINK_H
 #define DCPOMATIC_AUDIO_SINK_H
 
+class AudioBuffers;
+
 class AudioSink
 {
 public:
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index 9f9461ec2..0afb9807a 100644
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -33,7 +33,7 @@ Combiner::Combiner (shared_ptr<Log> log)
  *  @param image Frame image.
  */
 void
-Combiner::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle>, double)
+Combiner::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle>, Time)
 {
 	_image.reset (new SimpleImage (image));
 }
@@ -43,7 +43,7 @@ Combiner::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitl
  *  @param sub Subtitle (which will be put onto the whole frame)
  */
 void
-Combiner::process_video_b (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub, double t)
+Combiner::process_video_b (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub, Time t)
 {
 	/* Copy the right half of this image into our _image */
 	/* XXX: this should probably be in the Image class */
diff --git a/src/lib/content.h b/src/lib/content.h
index e1cf41df0..9f465570b 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -46,7 +46,7 @@ public:
 	virtual std::string information () const = 0;
 	virtual void as_xml (xmlpp::Node *) const;
 	virtual boost::shared_ptr<Content> clone () const = 0;
-	virtual Time temporal_length () const = 0;
+	virtual Time length (boost::shared_ptr<const Film>) const = 0;
 	
 	boost::filesystem::path file () const {
 		boost::mutex::scoped_lock lm (_mutex);
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 02ccaa42b..ae0d0c671 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -29,7 +29,6 @@
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
-#include "util.h"
 #include "video_source.h"
 #include "audio_source.h"
 #include "film.h"
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 6cb384e20..95e98ab76 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -58,7 +58,6 @@ int const Encoder::_history_size = 25;
 Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Job> j)
 	: _film (f)
 	, _job (j)
-	, _video_frames_in (0)
 	, _video_frames_out (0)
 	, _have_a_real_frame (false)
 	, _terminate (false)
@@ -180,13 +179,6 @@ Encoder::frame_done ()
 void
 Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time)
 {
-	FrameRateConversion frc (_film->video_frame_rate(), _film->dcp_frame_rate());
-	
-	if (frc.skip && (_video_frames_in % 2)) {
-		++_video_frames_in;
-		return;
-	}
-
 	boost::mutex::scoped_lock lock (_mutex);
 
 	/* Wait until the queue has gone down a bit */
@@ -220,7 +212,7 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Sub
 					  new DCPVideoFrame (
 						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
 						  _film->subtitle_offset(), _film->subtitle_scale(),
-						  _film->scaler(), _video_frames_out, _film->dcp_frame_rate(), s.second,
+						  _film->scaler(), _video_frames_out, _film->dcp_video_frame_rate(), s.second,
 						  _film->colour_lut(), _film->j2k_bandwidth(),
 						  _film->log()
 						  )
@@ -230,14 +222,7 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Sub
 		_have_a_real_frame = true;
 	}
 
-	++_video_frames_in;
 	++_video_frames_out;
-
-	if (frc.repeat) {
-		_writer->repeat (_video_frames_out);
-		++_video_frames_out;
-		frame_done ();
-	}
 }
 
 void
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index b6d3663fd..6815fa6f6 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -101,8 +101,6 @@ private:
 	/** Number of frames that we should keep history for */
 	static int const _history_size;
 
-	/** Number of video frames received so far */
-	ContentVideoFrame _video_frames_in;
 	/** Number of video frames written for the DCP so far */
 	int _video_frames_out;
 
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index a61f777c8..55281ff9b 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -206,7 +206,7 @@ FFmpegContent::audio_length () const
                 return 0;
         }
         
-        return video_frames_to_audio_frames (_video_length, audio_frame_rate(), video_frame_rate());
+        return video_frames_to_audio_frames (_video_length, content_audio_frame_rate(), video_frame_rate());
 }
 
 int
@@ -220,7 +220,7 @@ FFmpegContent::audio_channels () const
 }
 
 int
-FFmpegContent::audio_frame_rate () const
+FFmpegContent::content_audio_frame_rate () const
 {
         if (!_audio_stream) {
                 return 0;
@@ -229,6 +229,28 @@ FFmpegContent::audio_frame_rate () const
         return _audio_stream->frame_rate;
 }
 
+int
+FFmpegContent::output_audio_frame_rate (shared_ptr<const Film> film) const
+{
+	/* Resample to a DCI-approved sample rate */
+	double t = dcp_audio_frame_rate (content_audio_frame_rate ());
+
+	FrameRateConversion frc (video_frame_rate(), film->dcp_video_frame_rate());
+
+	/* Compensate if the DCP is being run at a different frame rate
+	   to the source; that is, if the video is run such that it will
+	   look different in the DCP compared to the source (slower or faster).
+	   skip/repeat doesn't come into effect here.
+	*/
+
+	if (frc.change_speed) {
+		t *= video_frame_rate() * frc.factor() / film->dcp_video_frame_rate();
+		cout << "-> " << t << "\n";
+	}
+
+	return rint (t);
+}
+
 bool
 operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b)
 {
@@ -281,8 +303,9 @@ FFmpegContent::clone () const
 	return shared_ptr<Content> (new FFmpegContent (*this));
 }
 
-double
-FFmpegContent::temporal_length () const
+Time
+FFmpegContent::length (shared_ptr<const Film> film) const
 {
-	return video_length() / video_frame_rate();
+	FrameRateConversion frc (video_frame_rate (), film->dcp_video_frame_rate ());
+	return video_length() * frc.factor() * TIME_HZ / film->dcp_video_frame_rate ();
 }
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 6d7151498..540df041f 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -89,12 +89,13 @@ public:
 	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
 	boost::shared_ptr<Content> clone () const;
-	double temporal_length () const;
+	Time length (boost::shared_ptr<const Film>) const;
 
         /* AudioContent */
         int audio_channels () const;
         ContentAudioFrame audio_length () const;
-        int audio_frame_rate () const;
+        int content_audio_frame_rate () const;
+        int output_audio_frame_rate (boost::shared_ptr<const Film>) const;
 	
         std::vector<FFmpegSubtitleStream> subtitle_streams () const {
                 boost::mutex::scoped_lock lm (_mutex);
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 0e704bb14..d21a93e29 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -48,6 +48,7 @@ extern "C" {
 #include "ffmpeg_decoder.h"
 #include "filter_graph.h"
 #include "subtitle.h"
+#include "audio_buffers.h"
 
 #include "i18n.h"
 
@@ -219,8 +220,10 @@ FFmpegDecoder::setup_subtitle ()
 bool
 FFmpegDecoder::pass ()
 {
-	int r = av_read_frame (_format_context, &_packet);
+	cout << "FFmpeg::pass\n";
 	
+	int r = av_read_frame (_format_context, &_packet);
+
 	if (r < 0) {
 		if (r != AVERROR_EOF) {
 			/* Maybe we should fail here, but for now we'll just finish off instead */
diff --git a/src/lib/film.cc b/src/lib/film.cc
index b8102d315..646b114da 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -108,7 +108,7 @@ Film::Film (string d, bool must_exist)
 	, _colour_lut (0)
 	, _j2k_bandwidth (200000000)
 	, _dci_metadata (Config::instance()->default_dci_metadata ())
-	, _dcp_frame_rate (0)
+	, _dcp_video_frame_rate (0)
 	, _dirty (false)
 {
 	set_dci_date_today ();
@@ -179,7 +179,7 @@ Film::Film (Film const & o)
 	, _colour_lut        (o._colour_lut)
 	, _j2k_bandwidth     (o._j2k_bandwidth)
 	, _dci_metadata      (o._dci_metadata)
-	, _dcp_frame_rate    (o._dcp_frame_rate)
+	, _dcp_video_frame_rate (o._dcp_video_frame_rate)
 	, _dci_date          (o._dci_date)
 	, _dirty             (o._dirty)
 {
@@ -198,7 +198,7 @@ Film::video_state_identifier () const
 	s << format()->id()
 	  << "_" << _playlist->video_digest()
 	  << "_" << crop().left << "_" << crop().right << "_" << crop().top << "_" << crop().bottom
-	  << "_" << _dcp_frame_rate
+	  << "_" << _dcp_video_frame_rate
 	  << "_" << f.first << "_" << f.second
 	  << "_" << scaler()->id()
 	  << "_" << j2k_bandwidth()
@@ -315,8 +315,8 @@ Film::make_dcp ()
 		throw MissingSettingError (_("format"));
 	}
 
-	if (_playlist->content().empty ()) {
-		throw MissingSettingError (_("content"));
+	if (_playlist->regions().empty ()) {
+		throw StringError (_("You must add some content to the DCP before creating it"));
 	}
 
 	if (dcp_content_type() == 0) {
@@ -450,9 +450,8 @@ Film::write_metadata () const
 	root->add_child("ColourLUT")->add_child_text (boost::lexical_cast<string> (_colour_lut));
 	root->add_child("J2KBandwidth")->add_child_text (boost::lexical_cast<string> (_j2k_bandwidth));
 	_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
-	root->add_child("DCPFrameRate")->add_child_text (boost::lexical_cast<string> (_dcp_frame_rate));
+	root->add_child("DCPVideoFrameRate")->add_child_text (boost::lexical_cast<string> (_dcp_video_frame_rate));
 	root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date));
-	_audio_mapping.as_xml (root->add_child("AudioMapping"));
 	_playlist->as_xml (root->add_child ("Playlist"));
 
 	doc.write_to_file_formatted (file ("metadata.xml"));
@@ -524,11 +523,10 @@ Film::read_metadata ()
 	_colour_lut = f.number_child<int> ("ColourLUT");
 	_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
 	_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
-	_dcp_frame_rate = f.number_child<int> ("DCPFrameRate");
+	_dcp_video_frame_rate = f.number_child<int> ("DCPVideoFrameRate");
 	_dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
 
 	_playlist->set_from_xml (f.node_child ("Playlist"));
-	_audio_mapping.set_from_xml (_playlist->content(), f.node_child ("AudioMapping"));
 
 	_dirty = false;
 }
@@ -577,32 +575,6 @@ Film::file (string f) const
 	return p.string ();
 }
 
-/** @return The sampling rate that we will resample the audio to */
-int
-Film::target_audio_sample_rate () const
-{
-	if (!has_audio ()) {
-		return 0;
-	}
-	
-	/* Resample to a DCI-approved sample rate */
-	double t = dcp_audio_sample_rate (audio_frame_rate());
-
-	FrameRateConversion frc (video_frame_rate(), dcp_frame_rate());
-
-	/* Compensate if the DCP is being run at a different frame rate
-	   to the source; that is, if the video is run such that it will
-	   look different in the DCP compared to the source (slower or faster).
-	   skip/repeat doesn't come into effect here.
-	*/
-
-	if (frc.change_speed) {
-		t *= video_frame_rate() * frc.factor() / dcp_frame_rate();
-	}
-
-	return rint (t);
-}
-
 /** @return a DCI-compliant name for a DCP of this film */
 string
 Film::dci_name (bool if_created_now) const
@@ -649,22 +621,7 @@ Film::dci_name (bool if_created_now) const
 		}
 	}
 
-	switch (audio_channels ()) {
-	case 1:
-		d << "_10";
-		break;
-	case 2:
-		d << "_20";
-		break;
-	case 6:
-		d << "_51";
-		break;
-	case 8:
-		d << "_71";
-		break;
-	}
-
-	d << "_2K";
+	d << "_51_2K";
 
 	if (!dm.studio.empty ()) {
 		d << "_" << dm.studio;
@@ -738,11 +695,11 @@ Film::set_trust_content_headers (bool t)
 	signal_changed (TRUST_CONTENT_HEADERS);
 
 	
-	ContentList content = _playlist->content ();
-	if (!_trust_content_headers && !content.empty()) {
+	Playlist::RegionList regions = _playlist->regions ();
+	if (!_trust_content_headers && !regions.empty()) {
 		/* We just said that we don't trust the content's header */
-		for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
-			examine_content (*i);
+		for (Playlist::RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+			examine_content (i->content);
 		}
 	}
 }
@@ -976,13 +933,13 @@ Film::set_dci_metadata (DCIMetadata m)
 
 
 void
-Film::set_dcp_frame_rate (int f)
+Film::set_dcp_video_frame_rate (int f)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_frame_rate = f;
+		_dcp_video_frame_rate = f;
 	}
-	signal_changed (DCP_FRAME_RATE);
+	signal_changed (DCP_VIDEO_FRAME_RATE);
 }
 
 void
@@ -995,8 +952,7 @@ Film::signal_changed (Property p)
 
 	switch (p) {
 	case Film::CONTENT:
-		set_dcp_frame_rate (best_dcp_frame_rate (video_frame_rate ()));
-		set_audio_mapping (_playlist->default_audio_mapping ());
+		set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
 		break;
 	default:
 		break;
@@ -1082,10 +1038,10 @@ Film::playlist () const
 	return _playlist;
 }
 
-ContentList
-Film::content () const
+Playlist::RegionList
+Film::regions () const
 {
-	return _playlist->content ();
+	return _playlist->regions ();
 }
 
 void
@@ -1101,64 +1057,10 @@ Film::remove_content (shared_ptr<Content> c)
 	_playlist->remove (c);
 }
 
-void
-Film::move_content_earlier (shared_ptr<Content> c)
-{
-	_playlist->move_earlier (c);
-}
-
-void
-Film::move_content_later (shared_ptr<Content> c)
-{
-	_playlist->move_later (c);
-}
-
-ContentAudioFrame
-Film::audio_length () const
-{
-	return _playlist->audio_length ();
-}
-
-int
-Film::audio_channels () const
-{
-	return _playlist->audio_channels ();
-}
-
-int
-Film::audio_frame_rate () const
-{
-	return _playlist->audio_frame_rate ();
-}
-
-bool
-Film::has_audio () const
-{
-	return _playlist->has_audio ();
-}
-
-float
-Film::video_frame_rate () const
-{
-	return _playlist->video_frame_rate ();
-}
-
-libdcp::Size
-Film::video_size () const
+Time
+Film::length () const
 {
-	return _playlist->video_size ();
-}
-
-ContentVideoFrame
-Film::video_length () const
-{
-	return _playlist->video_length ();
-}
-
-ContentVideoFrame
-Film::content_length () const
-{
-	return _playlist->content_length ();
+	return _playlist->length (shared_from_this ());
 }
 
 bool
@@ -1167,24 +1069,17 @@ Film::has_subtitles () const
 	return _playlist->has_subtitles ();
 }
 
-void
-Film::set_audio_mapping (AudioMapping m)
+OutputVideoFrame
+Film::best_dcp_video_frame_rate () const
 {
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_audio_mapping = m;
-	}
-
-	signal_changed (AUDIO_MAPPING);
+	return _playlist->best_dcp_frame_rate ();
 }
 
 void
 Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
 {
 	if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
-		set_dcp_frame_rate (best_dcp_frame_rate (video_frame_rate ()));
-	} else if (p == AudioContentProperty::AUDIO_CHANNELS) {
-		set_audio_mapping (_playlist->default_audio_mapping ());
+		set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
 	} 
 
 	if (ui_signaller) {
@@ -1209,3 +1104,34 @@ Film::set_loop (int c)
 {
 	_playlist->set_loop (c);
 }
+
+OutputAudioFrame
+Film::time_to_audio_frames (Time t) const
+{
+	return t * dcp_audio_frame_rate () / TIME_HZ;
+}
+
+OutputVideoFrame
+Film::time_to_video_frames (Time t) const
+{
+	return t * dcp_video_frame_rate () / TIME_HZ;
+}
+
+Time
+Film::audio_frames_to_time (OutputAudioFrame f) const
+{
+	return f * TIME_HZ / dcp_audio_frame_rate ();
+}
+
+Time
+Film::video_frames_to_time (OutputVideoFrame f) const
+{
+	return f * TIME_HZ / dcp_video_frame_rate ();
+}
+
+OutputAudioFrame
+Film::dcp_audio_frame_rate () const
+{
+	/* XXX */
+	return 48000;
+}
diff --git a/src/lib/film.h b/src/lib/film.h
index 18255a15e..cfc55c0ac 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -36,7 +36,7 @@
 #include "dci_metadata.h"
 #include "types.h"
 #include "ffmpeg_content.h"
-#include "audio_mapping.h"
+#include "playlist.h"
 
 class DCPContentType;
 class Format;
@@ -48,7 +48,6 @@ class AnalyseAudioJob;
 class ExternalAudioStream;
 class Content;
 class Player;
-class Playlist;
 
 /** @class Film
  *  @brief A representation of some audio and video content, and details of
@@ -87,8 +86,6 @@ public:
 	std::string file (std::string f) const;
 	std::string dir (std::string d) const;
 
-	int target_audio_sample_rate () const;
-	
 	void write_metadata () const;
 
 	libdcp::Size cropped_size (libdcp::Size) const;
@@ -105,27 +102,24 @@ public:
 	boost::shared_ptr<Player> player () const;
 	boost::shared_ptr<Playlist> playlist () const;
 
-	/* Proxies for some Playlist methods */
+	OutputAudioFrame dcp_audio_frame_rate () const;
 
-	ContentList content () const;
+	OutputAudioFrame time_to_audio_frames (Time) const;
+	OutputVideoFrame time_to_video_frames (Time) const;
+	Time video_frames_to_time (OutputVideoFrame) const;
+	Time audio_frames_to_time (OutputAudioFrame) const;
 
-	ContentAudioFrame audio_length () const;
-	int audio_channels () const;
-	int audio_frame_rate () const;
-	bool has_audio () const;
+	/* Proxies for some Playlist methods */
 
-	bool has_subtitles () const;
-	
-	float video_frame_rate () const;
-	libdcp::Size video_size () const;
-	ContentVideoFrame video_length () const;
+	Playlist::RegionList regions () const;
 
-	ContentVideoFrame content_length () const;
+	Time length () const;
+	bool has_subtitles () const;
+	OutputVideoFrame best_dcp_video_frame_rate () const;
 
 	void set_loop (int);
 	int loop () const;
 
-
 	enum TrimType {
 		CPL,
 		ENCODE
@@ -159,7 +153,7 @@ public:
 		COLOUR_LUT,
 		J2K_BANDWIDTH,
 		DCI_METADATA,
-		DCP_FRAME_RATE,
+		DCP_VIDEO_FRAME_RATE,
 		AUDIO_MAPPING
 	};
 
@@ -271,14 +265,10 @@ public:
 		return _dci_metadata;
 	}
 
-	int dcp_frame_rate () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _dcp_frame_rate;
-	}
-
-	AudioMapping audio_mapping () const {
+	/* XXX: -> "video_frame_rate" */
+	int dcp_video_frame_rate () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _audio_mapping;
+		return _dcp_video_frame_rate;
 	}
 
 	/* SET */
@@ -289,8 +279,6 @@ public:
 	void set_trust_content_headers (bool);
 	void add_content (boost::shared_ptr<Content>);
 	void remove_content (boost::shared_ptr<Content>);
-	void move_content_earlier (boost::shared_ptr<Content>);
-	void move_content_later (boost::shared_ptr<Content>);
 	void set_dcp_content_type (DCPContentType const *);
 	void set_format (Format const *);
 	void set_crop (Crop);
@@ -312,9 +300,8 @@ public:
 	void set_colour_lut (int);
 	void set_j2k_bandwidth (int);
 	void set_dci_metadata (DCIMetadata);
-	void set_dcp_frame_rate (int);
+	void set_dcp_video_frame_rate (int);
 	void set_dci_date_today ();
-	void set_audio_mapping (AudioMapping);
 
 	/** Emitted when some property has of the Film has changed */
 	mutable boost::signals2::signal<void (Property)> Changed;
@@ -398,10 +385,9 @@ private:
 	/** DCI naming stuff */
 	DCIMetadata _dci_metadata;
 	/** Frames per second to run our DCP at */
-	int _dcp_frame_rate;
+	int _dcp_video_frame_rate;
 	/** The date that we should use in a DCI name */
 	boost::gregorian::date _dci_date;
-	AudioMapping _audio_mapping;
 
 	/** true if our state has changed since we last saved it */
 	mutable bool _dirty;
diff --git a/src/lib/format.cc b/src/lib/format.cc
index f5026c0da..688b22f16 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -208,7 +208,8 @@ VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d)
 float
 VariableFormat::ratio (shared_ptr<const Film> f) const
 {
-	libdcp::Size const c = f->cropped_size (f->video_size ());
+	/* XXX */
+	libdcp::Size const c;// = f->cropped_size (f->video_size ());
 	return float (c.width) / c.height;
 }
 
diff --git a/src/lib/format.h b/src/lib/format.h
index d45a3a10a..29347a3fd 100644
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -24,7 +24,7 @@
 
 #include <string>
 #include <vector>
-#include "util.h"
+#include <libdcp/util.h>
 
 class Film;
 
diff --git a/src/lib/imagemagick_content.cc b/src/lib/imagemagick_content.cc
index 9e5f00ba0..2e42e25f3 100644
--- a/src/lib/imagemagick_content.cc
+++ b/src/lib/imagemagick_content.cc
@@ -98,3 +98,10 @@ ImageMagickContent::set_video_length (ContentVideoFrame len)
 
 	signal_changed (VideoContentProperty::VIDEO_LENGTH);
 }
+
+Time
+ImageMagickContent::length (shared_ptr<const Film> film) const
+{
+	FrameRateConversion frc (24, film->dcp_video_frame_rate ());
+	return video_length() * frc.factor() * TIME_HZ / film->dcp_video_frame_rate ();
+}
diff --git a/src/lib/imagemagick_content.h b/src/lib/imagemagick_content.h
index b1e7f9495..366049002 100644
--- a/src/lib/imagemagick_content.h
+++ b/src/lib/imagemagick_content.h
@@ -38,6 +38,7 @@ public:
 	std::string summary () const;
 	void as_xml (xmlpp::Node *) const;
 	boost::shared_ptr<Content> clone () const;
+	Time length (boost::shared_ptr<const Film>) const;
 
 	void set_video_length (ContentVideoFrame);
 
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 95036cfe0..9cc166204 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -27,9 +27,11 @@
 #include "sndfile_content.h"
 #include "playlist.h"
 #include "job.h"
+#include "image.h"
 
 using std::list;
 using std::cout;
+using std::min;
 using std::vector;
 using boost::shared_ptr;
 using boost::weak_ptr;
@@ -42,6 +44,11 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	, _audio (true)
 	, _subtitles (true)
 	, _have_valid_decoders (false)
+	, _position (0)
+	, _audio_buffers (MAX_AUDIO_CHANNELS, 0)
+	, _last_video (0)
+	, _last_was_black (false)
+	, _last_audio (0)
 {
 	_playlist->Changed.connect (bind (&Player::playlist_changed, this));
 	_playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2));
@@ -72,118 +79,118 @@ Player::pass ()
 		setup_decoders ();
 		_have_valid_decoders = true;
 	}
-	
-	bool done = true;
-	
-	if (_video && _video_decoder < _video_decoders.size ()) {
-
-		/* Run video decoder; this may also produce audio */
-
-		if (_video_decoders[_video_decoder]->pass ()) {
-			_video_decoder++;
-		}
-		
-		if (_video_decoder < _video_decoders.size ()) {
-			done = false;
-		}
-		
-	}
-
-	if (!_video && _audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG && _sequential_audio_decoder < _audio_decoders.size ()) {
-
-		/* We're not producing video, so we may need to run FFmpeg content to get the audio */
-		
-		if (_audio_decoders[_sequential_audio_decoder]->pass ()) {
-			_sequential_audio_decoder++;
-		}
-		
-		if (_sequential_audio_decoder < _audio_decoders.size ()) {
-			done = false;
-		}
-		
-	}
-
-	if (_audio && _playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
-		
-		/* We're getting audio from SndfileContent */
-		
-		for (vector<shared_ptr<AudioDecoder> >::iterator i = _audio_decoders.begin(); i != _audio_decoders.end(); ++i) {
-			if (!(*i)->pass ()) {
-				done = false;
-			}
-		}
 
-		Audio (_audio_buffers, _audio_time.get());
-		_audio_buffers.reset ();
-		_audio_time = boost::none;
-	}
-
-	return done;
+	cout << "-> Player::pass\n";
+	
+        /* Here we are just finding the active decoder with the earliest last emission time, then
+           calling pass on it.  If there is no decoder, we skip our position on until there is.
+           Hence this method will cause video and audio to be emitted, and it is up to the
+           process_{video,audio} methods to tidy it up.
+        */
+
+        Time earliest_pos = TIME_MAX;
+        shared_ptr<RegionDecoder> earliest;
+        Time next_wait = TIME_MAX;
+
+        for (list<shared_ptr<RegionDecoder> >::iterator i = _decoders.begin(); i != _decoders.end(); ++i) {
+                Time const ts = (*i)->region.time;
+                Time const te = (*i)->region.time + (*i)->region.content->length (_film);
+                if (ts <= _position && te > _position) {
+                        Time const pos = ts + (*i)->last;
+                        if (pos < earliest_pos) {
+                                earliest_pos = pos;
+                                earliest = *i;
+                        }
+                }
+
+                if (ts > _position) {
+                        next_wait = min (next_wait, ts - _position);
+                }
+        }
+
+        if (earliest) {
+                earliest->decoder->pass ();
+                _position = earliest->last;
+        } else if (next_wait < TIME_MAX) {
+                _position += next_wait;
+        } else {
+		cout << "<- Player::pass\n";
+                return true;
+        }
+
+	cout << "<- Player::pass\n";
+        return false;
 }
 
 void
-Player::process_video (shared_ptr<const Image> i, bool same, shared_ptr<Subtitle> s, double t)
+Player::process_video (shared_ptr<RegionDecoder> rd, shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time time)
 {
-	Video (i, same, s, _video_start[_video_decoder] + t);
+        shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> (rd->decoder);
+        
+        Time const global_time = rd->region.time + time;
+        while ((global_time - _last_video) > 1) {
+                /* Fill in with black */
+                emit_black_frame ();
+        }
+
+        Video (image, same, sub, global_time);
+        rd->last = time;
+	_last_video = global_time;
+	_last_was_black = false;
 }
 
 void
-Player::process_audio (weak_ptr<const AudioContent> c, shared_ptr<const AudioBuffers> b, double t)
+Player::process_audio (shared_ptr<RegionDecoder> rd, shared_ptr<const AudioBuffers> audio, Time time)
 {
-	AudioMapping mapping = _film->audio_mapping ();
-	if (!_audio_buffers) {
-		_audio_buffers.reset (new AudioBuffers (mapping.dcp_channels(), b->frames ()));
-		_audio_buffers->make_silent ();
-		_audio_time = t;
-		if (_playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-			_audio_time = _audio_time.get() + _audio_start[_sequential_audio_decoder];
-		}
-	}
-
-	for (int i = 0; i < b->channels(); ++i) {
-		list<libdcp::Channel> dcp = mapping.content_to_dcp (AudioMapping::Channel (c, i));
-		for (list<libdcp::Channel>::iterator j = dcp.begin(); j != dcp.end(); ++j) {
-			_audio_buffers->accumulate (b, i, static_cast<int> (*j));
-		}
-	}
-
-	if (_playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-		/* We can just emit this audio now as it will all be here */
-		Audio (_audio_buffers, t);
-		_audio_buffers.reset ();
-		_audio_time = boost::none;
-	}
+        /* XXX: mapping */
+
+        /* The time of this audio may indicate that some of our buffered audio is not going to
+           be added to any more, so it can be emitted.
+        */
+
+        if (time > _last_audio) {
+                /* We can emit some audio from our buffers */
+                OutputAudioFrame const N = min (_film->time_to_audio_frames (time - _last_audio), static_cast<OutputAudioFrame> (_audio_buffers.frames()));
+                shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), N));
+                emit->copy_from (&_audio_buffers, N, 0, 0);
+                Audio (emit, _last_audio);
+                _last_audio += _film->audio_frames_to_time (N);
+
+                /* And remove it from our buffers */
+                if (_audio_buffers.frames() > N) {
+                        _audio_buffers.move (N, 0, _audio_buffers.frames() - N);
+                }
+                _audio_buffers.set_frames (_audio_buffers.frames() - N);
+        }
+
+        /* Now accumulate the new audio into our buffers */
+
+        if (_audio_buffers.frames() == 0) {
+                /* We have no remaining data.  Emit silence up to the start of this new data */
+                if ((time - _last_audio) > 0) {
+                        emit_silence (time - _last_audio);
+                }
+        }
+
+        _audio_buffers.ensure_size (time - _last_audio + audio->frames());
+        _audio_buffers.accumulate (audio.get(), 0, _film->time_to_audio_frames (time - _last_audio));
+        rd->last = time + _film->audio_frames_to_time (audio->frames ());
 }
 
 /** @return true on error */
 bool
-Player::seek (double t)
+Player::seek (Time t)
 {
 	if (!_have_valid_decoders) {
 		setup_decoders ();
 		_have_valid_decoders = true;
 	}
 
-	if (_video_decoders.empty ()) {
+	if (_decoders.empty ()) {
 		return true;
 	}
 
-	/* Find the decoder that contains this position */
-	_video_decoder = 0;
-	while (1) {
-		++_video_decoder;
-		if (_video_decoder >= _video_decoders.size () || t < _video_start[_video_decoder]) {
-			--_video_decoder;
-			t -= _video_start[_video_decoder];
-			break;
-		}
-	}
-
-	if (_video_decoder < _video_decoders.size()) {
-		_video_decoders[_video_decoder]->seek (t);
-	} else {
-		return true;
-	}
+	/* XXX */
 
 	/* XXX: don't seek audio because we don't need to... */
 
@@ -207,106 +214,60 @@ Player::seek_forward ()
 void
 Player::setup_decoders ()
 {
-	vector<shared_ptr<VideoDecoder> > old_video_decoders = _video_decoders;
+	list<shared_ptr<RegionDecoder> > old_decoders = _decoders;
 
-	_video_decoders.clear ();
-	_video_decoder = 0;
-	_audio_decoders.clear ();
-	_sequential_audio_decoder = 0;
+	_decoders.clear ();
 
-	_video_start.clear();
-	_audio_start.clear();
+	Playlist::RegionList regions = _playlist->regions ();
+	for (Playlist::RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
 
-	double video_so_far = 0;
-	double audio_so_far = 0;
+		shared_ptr<RegionDecoder> rd (new RegionDecoder);
+		rd->region = *i;
+		
+                /* XXX: into content? */
 
-	for (int l = 0; l < _playlist->loop(); ++l) {
-		list<shared_ptr<const VideoContent> > vc = _playlist->video ();
-		for (list<shared_ptr<const VideoContent> >::iterator i = vc.begin(); i != vc.end(); ++i) {
-			
-			shared_ptr<const VideoContent> video_content;
-			shared_ptr<const AudioContent> audio_content;
-			shared_ptr<VideoDecoder> video_decoder;
-			shared_ptr<AudioDecoder> audio_decoder;
-			
-			/* XXX: into content? */
+		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (i->content);
+		if (fc) {
+			shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio, _subtitles));
 			
-			shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
-			if (fc) {
-				shared_ptr<FFmpegDecoder> fd (
-					new FFmpegDecoder (
-						_film, fc, _video,
-						_audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG,
-						_subtitles
-						)
-					);
-				
-				video_content = fc;
-				audio_content = fc;
-				video_decoder = fd;
-				audio_decoder = fd;
-
-				video_decoder->connect_video (shared_from_this ());
-			}
-			
-			shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
-			if (ic) {
-				video_content = ic;
-
-				/* See if we can re-use an old ImageMagickDecoder */
-				for (vector<shared_ptr<VideoDecoder> >::const_iterator i = old_video_decoders.begin(); i != old_video_decoders.end(); ++i) {
-					shared_ptr<ImageMagickDecoder> imd = dynamic_pointer_cast<ImageMagickDecoder> (*i);
-					if (imd && imd->content() == ic) {
-						video_decoder = *i;
-					}
-				}
+			fd->Video.connect (bind (&Player::process_video, this, rd, _1, _2, _3, _4));
+			fd->Audio.connect (bind (&Player::process_audio, this, rd, _1, _2));
 
-				if (!video_decoder) {
-					video_decoder.reset (new ImageMagickDecoder (_film, ic));
-					video_decoder->connect_video (shared_from_this ());
-				}
-			}
-			
-			_video_decoders.push_back (video_decoder);
-			_video_start.push_back (video_so_far);
-			video_so_far += video_content->video_length() / video_content->video_frame_rate();
-			
-			if (audio_decoder && _playlist->audio_from() == Playlist::AUDIO_FFMPEG) {
-				audio_decoder->Audio.connect (bind (&Player::process_audio, this, audio_content, _1, _2));
-				_audio_decoders.push_back (audio_decoder);
-				_audio_start.push_back (audio_so_far);
-				audio_so_far += double(audio_content->audio_length()) / audio_content->audio_frame_rate();
-			}
+			rd->decoder = fd;
 		}
 		
-		_video_decoder = 0;
-		_sequential_audio_decoder = 0;
-		
-		if (_playlist->audio_from() == Playlist::AUDIO_SNDFILE) {
+		shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (i->content);
+		if (ic) {
+			shared_ptr<ImageMagickDecoder> id;
 			
-			list<shared_ptr<const AudioContent> > ac = _playlist->audio ();
-			for (list<shared_ptr<const AudioContent> >::iterator i = ac.begin(); i != ac.end(); ++i) {
-				
-				shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
-				assert (sc);
-				
-				shared_ptr<AudioDecoder> d (new SndfileDecoder (_film, sc));
-				d->Audio.connect (bind (&Player::process_audio, this, sc, _1, _2));
-				_audio_decoders.push_back (d);
-				_audio_start.push_back (audio_so_far);
+			/* See if we can re-use an old ImageMagickDecoder */
+			for (list<shared_ptr<RegionDecoder> >::const_iterator i = old_decoders.begin(); i != old_decoders.end(); ++i) {
+				shared_ptr<ImageMagickDecoder> imd = dynamic_pointer_cast<ImageMagickDecoder> ((*i)->decoder);
+				if (imd && imd->content() == ic) {
+					id = imd;
+				}
+			}
+
+			if (!id) {
+				id.reset (new ImageMagickDecoder (_film, ic));
+				id->Video.connect (bind (&Player::process_video, this, rd, _1, _2, _3, _4));
 			}
+
+			rd->decoder = id;
 		}
-	}
-}
 
-double
-Player::last_video_time () const
-{
-	if (_video_decoder >= _video_decoders.size ()) {
-		return 0;
+		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (i->content);
+		if (sc) {
+			shared_ptr<AudioDecoder> sd (new SndfileDecoder (_film, sc));
+			sd->Audio.connect (bind (&Player::process_audio, this, rd, _1, _2));
+
+			rd->decoder = sd;
+		}
+
+		_decoders.push_back (rd);
 	}
-	
-	return _video_start[_video_decoder] + _video_decoders[_video_decoder]->last_content_time ();
+
+	_position = 0;
 }
 
 void
@@ -327,3 +288,26 @@ Player::playlist_changed ()
 {
 	_have_valid_decoders = false;
 }
+
+void
+Player::emit_black_frame ()
+{
+	shared_ptr<SimpleImage> image (new SimpleImage (AV_PIX_FMT_RGB24, libdcp::Size (128, 128), true));
+	Video (image, _last_was_black, shared_ptr<Subtitle> (), _last_video);
+	_last_video += _film->video_frames_to_time (1);
+}
+
+void
+Player::emit_silence (Time t)
+{
+	OutputAudioFrame frames = _film->time_to_audio_frames (t);
+	while (frames) {
+		/* Do this in half-second chunks so we don't overwhelm anybody */
+		OutputAudioFrame this_time = min (_film->dcp_audio_frame_rate() / 2, frames);
+		shared_ptr<AudioBuffers> silence (new AudioBuffers (MAX_AUDIO_CHANNELS, this_time));
+		silence->make_silent ();
+		Audio (silence, _last_audio);
+		_last_audio += _film->audio_frames_to_time (this_time);
+		frames -= this_time;
+	}
+}
diff --git a/src/lib/player.h b/src/lib/player.h
index b1be2f456..c9bf2a00b 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -27,19 +27,20 @@
 #include "audio_source.h"
 #include "video_sink.h"
 #include "audio_sink.h"
+#include "playlist.h"
+#include "audio_buffers.h"
 
-class VideoDecoder;
-class AudioDecoder;
 class Job;
 class Film;
 class Playlist;
 class AudioContent;
+class Decoder;
 
 /** @class Player
  *  @brief A class which can `play' a Playlist; emitting its audio and video.
  */
  
-class Player : public VideoSource, public AudioSource, public VideoSink, public boost::enable_shared_from_this<Player>
+class Player : public VideoSource, public AudioSource, public boost::enable_shared_from_this<Player>
 {
 public:
 	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
@@ -49,18 +50,34 @@ public:
 	void disable_subtitles ();
 
 	bool pass ();
-	bool seek (double);
+	bool seek (Time);
 	void seek_back ();
 	void seek_forward ();
 
-	double last_video_time () const;
+	Time last_video () const {
+		return _last_video;
+	}
 
 private:
-	void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s, double);
-	void process_audio (boost::weak_ptr<const AudioContent>, boost::shared_ptr<const AudioBuffers>, double);
+
+	struct RegionDecoder
+	{
+		RegionDecoder ()
+			: last (0)
+		{}
+		
+		Playlist::Region region;
+		boost::shared_ptr<Decoder> decoder;
+		Time last;
+	};
+	
+	void process_video (boost::shared_ptr<RegionDecoder>, boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, Time);
+	void process_audio (boost::shared_ptr<RegionDecoder>, boost::shared_ptr<const AudioBuffers>, Time);
 	void setup_decoders ();
 	void playlist_changed ();
 	void content_changed (boost::weak_ptr<Content>, int);
+	void emit_black_frame ();
+	void emit_silence (Time);
 
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
@@ -71,21 +88,13 @@ private:
 
 	/** Our decoders are ready to go; if this is false the decoders must be (re-)created before they are used */
 	bool _have_valid_decoders;
-	/** Video decoders in order of presentation */
-	std::vector<boost::shared_ptr<VideoDecoder> > _video_decoders;
-	/** Start positions of each video decoder in seconds*/
-	std::vector<double> _video_start;
-        /** Index of current video decoder */
-	size_t _video_decoder;
-        /** Audio decoders in order of presentation (if they are from FFmpeg) */
-	std::vector<boost::shared_ptr<AudioDecoder> > _audio_decoders;
-	/** Start positions of each audio decoder (if they are from FFmpeg) in seconds */
-	std::vector<double> _audio_start;
-	/** Current audio decoder index if we are running them sequentially; otherwise undefined */
-	size_t _sequential_audio_decoder;
-
-	boost::shared_ptr<AudioBuffers> _audio_buffers;
-	boost::optional<double> _audio_time;
+	std::list<boost::shared_ptr<RegionDecoder> > _decoders;
+
+	Time _position;
+	AudioBuffers _audio_buffers;
+	Time _last_video;
+	bool _last_was_black;
+	Time _last_audio;
 };
 
 #endif
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index f1dd881b3..8f4a35ac2 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -29,6 +29,8 @@
 #include "imagemagick_decoder.h"
 #include "imagemagick_content.h"
 #include "job.h"
+#include "config.h"
+#include "util.h"
 
 #include "i18n.h"
 
@@ -39,171 +41,24 @@ using std::min;
 using std::max;
 using std::string;
 using std::stringstream;
+using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
 
 Playlist::Playlist ()
-	: _audio_from (AUDIO_FFMPEG)
-	, _loop (1)
+	: _loop (1)
 {
 
 }
 
 Playlist::Playlist (shared_ptr<const Playlist> other)
-	: _audio_from (other->_audio_from)
-	, _loop (other->_loop)
+	: _loop (other->_loop)
 {
-	for (ContentList::const_iterator i = other->_content.begin(); i != other->_content.end(); ++i) {
-		_content.push_back ((*i)->clone ());
+	for (RegionList::const_iterator i = other->_regions.begin(); i != other->_regions.end(); ++i) {
+		_regions.push_back (Region (i->content->clone(), i->time, this));
 	}
-
-	setup ();
-}
-
-void
-Playlist::setup ()
-{
-	_audio_from = AUDIO_FFMPEG;
-
-	_video.clear ();
-	_audio.clear ();
-
-	for (list<boost::signals2::connection>::iterator i = _content_connections.begin(); i != _content_connections.end(); ++i) {
-		i->disconnect ();
-	}
-	
-	_content_connections.clear ();
-
-	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-
-		/* Video is video */
-		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
-		if (vc) {
-			_video.push_back (vc);
-		}
-
-		/* FFmpegContent is audio if we are doing AUDIO_FFMPEG */
-		shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
-		if (fc && _audio_from == AUDIO_FFMPEG) {
-			_audio.push_back (fc);
-		}
-
-		/* SndfileContent trumps FFmpegContent for audio */
-		shared_ptr<SndfileContent> sc = dynamic_pointer_cast<SndfileContent> (*i);
-		if (sc) {
-			if (_audio_from == AUDIO_FFMPEG) {
-				/* This is our fist SndfileContent; clear any FFmpegContent and
-				   say that we are using Sndfile.
-				*/
-				_audio.clear ();
-				_audio_from = AUDIO_SNDFILE;
-			}
-			
-			_audio.push_back (sc);
-		}
-
-		_content_connections.push_back ((*i)->Changed.connect (bind (&Playlist::content_changed, this, _1, _2)));
-	}
-}
-
-/** @return Length of our audio */
-ContentAudioFrame
-Playlist::audio_length () const
-{
-	ContentAudioFrame len = 0;
-
-	switch (_audio_from) {
-	case AUDIO_FFMPEG:
-		/* FFmpeg content is sequential */
-		for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-			len += (*i)->audio_length ();
-		}
-		break;
-	case AUDIO_SNDFILE:
-		/* Sndfile content is simultaneous */
-		for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-			len = max (len, (*i)->audio_length ());
-		}
-		break;
-	}
-
-	return len * _loop;
-}
-
-/** @return number of audio channels */
-int
-Playlist::audio_channels () const
-{
-	int channels = 0;
-	
-	switch (_audio_from) {
-	case AUDIO_FFMPEG:
-		/* FFmpeg audio is sequential, so use the maximum channel count */
-		for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-			channels = max (channels, (*i)->audio_channels ());
-		}
-		break;
-	case AUDIO_SNDFILE:
-		/* Sndfile audio is simultaneous, so it's the sum of the channel counts */
-		for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-			channels += (*i)->audio_channels ();
-		}
-		break;
-	}
-
-	return channels;
-}
-
-int
-Playlist::audio_frame_rate () const
-{
-	if (_audio.empty ()) {
-		return 0;
-	}
-
-	/* XXX: assuming that all content has the same rate */
-	return _audio.front()->audio_frame_rate ();
-}
-
-float
-Playlist::video_frame_rate () const
-{
-	if (_video.empty ()) {
-		return 0;
-	}
-	
-	/* XXX: assuming all the same */
-	return _video.front()->video_frame_rate ();
-}
-
-libdcp::Size
-Playlist::video_size () const
-{
-	if (_video.empty ()) {
-		return libdcp::Size ();
-	}
-
-	/* XXX: assuming all the same */
-	return _video.front()->video_size ();
-}
-
-ContentVideoFrame
-Playlist::video_length () const
-{
-	ContentVideoFrame len = 0;
-	for (list<shared_ptr<const VideoContent> >::const_iterator i = _video.begin(); i != _video.end(); ++i) {
-		len += (*i)->video_length ();
-	}
-	
-	return len * _loop;
-}
-
-bool
-Playlist::has_audio () const
-{
-	return !_audio.empty ();
 }
 
 void
@@ -212,62 +67,19 @@ Playlist::content_changed (weak_ptr<Content> c, int p)
 	ContentChanged (c, p);
 }
 
-AudioMapping
-Playlist::default_audio_mapping () const
-{
-	AudioMapping m;
-	if (_audio.empty ()) {
-		return m;
-	}
-
-	switch (_audio_from) {
-	case AUDIO_FFMPEG:
-	{
-		/* XXX: assumes all the same */
-		if (_audio.front()->audio_channels() == 1) {
-			/* Map mono sources to centre */
-			m.add (AudioMapping::Channel (_audio.front(), 0), libdcp::CENTRE);
-		} else {
-			int const N = min (_audio.front()->audio_channels (), MAX_AUDIO_CHANNELS);
-			/* Otherwise just start with a 1:1 mapping */
-			for (int i = 0; i < N; ++i) {
-				m.add (AudioMapping::Channel (_audio.front(), i), (libdcp::Channel) i);
-			}
-		}
-		break;
-	}
-
-	case AUDIO_SNDFILE:
-	{
-		int n = 0;
-		for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-			for (int j = 0; j < (*i)->audio_channels(); ++j) {
-				m.add (AudioMapping::Channel (*i, j), (libdcp::Channel) n);
-				++n;
-				if (n >= MAX_AUDIO_CHANNELS) {
-					break;
-				}
-			}
-			if (n >= MAX_AUDIO_CHANNELS) {
-				break;
-			}
-		}
-		break;
-	}
-	}
-
-	return m;
-}
-
 string
 Playlist::audio_digest () const
 {
 	string t;
 	
-	for (list<shared_ptr<const AudioContent> >::const_iterator i = _audio.begin(); i != _audio.end(); ++i) {
-		t += (*i)->digest ();
+	for (RegionList::const_iterator i = _regions.begin(); i != _regions.end(); ++i) {
+		if (!dynamic_pointer_cast<const AudioContent> (i->content)) {
+			continue;
+		}
+		
+		t += i->content->digest ();
 
-		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
+		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (i->content);
 		if (fc) {
 			t += lexical_cast<string> (fc->audio_stream()->id);
 		}
@@ -283,9 +95,13 @@ Playlist::video_digest () const
 {
 	string t;
 	
-	for (list<shared_ptr<const VideoContent> >::const_iterator i = _video.begin(); i != _video.end(); ++i) {
-		t += (*i)->digest ();
-		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
+	for (RegionList::const_iterator i = _regions.begin(); i != _regions.end(); ++i) {
+		if (!dynamic_pointer_cast<const VideoContent> (i->content)) {
+			continue;
+		}
+		
+		t += i->content->digest ();
+		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (i->content);
 		if (fc && fc->subtitle_stream()) {
 			t += fc->subtitle_stream()->id;
 		}
@@ -296,48 +112,22 @@ Playlist::video_digest () const
 	return md5_digest (t.c_str(), t.length());
 }
 
-ContentVideoFrame
-Playlist::content_length () const
-{
-	float const vfr = video_frame_rate() > 0 ? video_frame_rate() : 24;
-	int const afr = audio_frame_rate() > 0 ? audio_frame_rate() : 48000;
-
-        return max (
-		video_length(),
-		ContentVideoFrame (audio_length() * vfr / afr)
-		);
-}
-
 void
 Playlist::set_from_xml (shared_ptr<const cxml::Node> node)
 {
-	list<shared_ptr<cxml::Node> > c = node->node_children ("Content");
+	list<shared_ptr<cxml::Node> > c = node->node_children ("Region");
 	for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
-
-		string const type = (*i)->string_child ("Type");
-		boost::shared_ptr<Content> c;
-		
-		if (type == "FFmpeg") {
-			c.reset (new FFmpegContent (*i));
-		} else if (type == "ImageMagick") {
-			c.reset (new ImageMagickContent (*i));
-		} else if (type == "Sndfile") {
-			c.reset (new SndfileContent (*i));
-		}
-
-		_content.push_back (c);
+		_regions.push_back (Region (*i, this));
 	}
 
 	_loop = node->number_child<int> ("Loop");
-
-	setup ();
 }
 
 void
 Playlist::as_xml (xmlpp::Node* node)
 {
-	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
-		(*i)->as_xml (node->add_child ("Content"));
+	for (RegionList::iterator i = _regions.begin(); i != _regions.end(); ++i) {
+		i->as_xml (node->add_child ("Region"));
 	}
 
 	node->add_child("Loop")->add_child_text(lexical_cast<string> (_loop));
@@ -346,87 +136,146 @@ Playlist::as_xml (xmlpp::Node* node)
 void
 Playlist::add (shared_ptr<Content> c)
 {
-	_content.push_back (c);
-	setup ();
+	_regions.push_back (Region (c, 0, this));
 	Changed ();
 }
 
 void
 Playlist::remove (shared_ptr<Content> c)
 {
-	ContentList::iterator i = find (_content.begin(), _content.end(), c);
-	if (i != _content.end ()) {
-		_content.erase (i);
+	RegionList::iterator i = _regions.begin ();
+	while (i != _regions.end() && i->content != c) {
+		++i;
 	}
+	
+	if (i != _regions.end ()) {
+		_regions.erase (i);
+		Changed ();
+	}
+}
 
-	setup ();
+void
+Playlist::set_loop (int l)
+{
+	_loop = l;
 	Changed ();
 }
 
-void
-Playlist::move_earlier (shared_ptr<Content> c)
+bool
+Playlist::has_subtitles () const
 {
-	ContentList::iterator i = find (_content.begin(), _content.end(), c);
-	if (i == _content.begin () || i == _content.end()) {
-		return;
+	for (RegionList::const_iterator i = _regions.begin(); i != _regions.end(); ++i) {
+		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (i->content);
+		if (fc && !fc->subtitle_streams().empty()) {
+			return true;
+		}
 	}
 
-	ContentList::iterator j = i;
-	--j;
-
-	swap (*i, *j);
-
-	setup ();
-	Changed ();
+	return false;
 }
 
-void
-Playlist::move_later (shared_ptr<Content> c)
+Playlist::Region::Region (shared_ptr<Content> c, Time t, Playlist* p)
+	: content (c)
+	, time (t)
 {
-	ContentList::iterator i = find (_content.begin(), _content.end(), c);
-	if (i == _content.end()) {
-		return;
-	}
+	connection = c->Changed.connect (bind (&Playlist::content_changed, p, _1, _2));
+}
 
-	ContentList::iterator j = i;
-	++j;
-	if (j == _content.end ()) {
-		return;
+Playlist::Region::Region (shared_ptr<const cxml::Node> node, Playlist* p)
+{
+	shared_ptr<const cxml::Node> content_node = node->node_child ("Content");
+	string const type = content_node->string_child ("Type");
+
+	if (type == "FFmpeg") {
+		content.reset (new FFmpegContent (content_node));
+	} else if (type == "ImageMagick") {
+		content.reset (new ImageMagickContent (content_node));
+	} else if (type == "Sndfile") {
+		content.reset (new SndfileContent (content_node));
 	}
 
-	swap (*i, *j);
-
-	setup ();
-	Changed ();
+	time = node->number_child<Time> ("Time");
+	connection = content->Changed.connect (bind (&Playlist::content_changed, p, _1, _2));
 }
 
 void
-Playlist::set_loop (int l)
+Playlist::Region::as_xml (xmlpp::Node* node) const
 {
-	_loop = l;
-	Changed ();
+	xmlpp::Node* sub = node->add_child ("Content");
+	content->as_xml (sub);
+	sub->add_child ("Time")->add_child_text (lexical_cast<string> (time));
 }
-		
-shared_ptr<FFmpegContent>
-Playlist::ffmpeg () const
+
+class FrameRateCandidate
 {
-	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-		shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
-		if (fc) {
-			return fc;
+public:
+	FrameRateCandidate (float source_, int dcp_)
+		: source (source_)
+		, dcp (dcp_)
+	{}
+
+	float source;
+	int dcp;
+};
+
+int
+Playlist::best_dcp_frame_rate () const
+{
+	list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
+
+	/* Work out what rates we could manage, including those achieved by using skip / repeat. */
+	list<FrameRateCandidate> candidates;
+
+	/* Start with the ones without skip / repeat so they will get matched in preference to skipped/repeated ones */
+	for (list<int>::const_iterator i = allowed_dcp_frame_rates.begin(); i != allowed_dcp_frame_rates.end(); ++i) {
+		candidates.push_back (FrameRateCandidate (*i, *i));
+	}
+
+	/* Then the skip/repeat ones */
+	for (list<int>::const_iterator i = allowed_dcp_frame_rates.begin(); i != allowed_dcp_frame_rates.end(); ++i) {
+		candidates.push_back (FrameRateCandidate (float (*i) / 2, *i));
+		candidates.push_back (FrameRateCandidate (float (*i) * 2, *i));
+	}
+
+	/* Pick the best one, bailing early if we hit an exact match */
+	float error = std::numeric_limits<float>::max ();
+	optional<FrameRateCandidate> best;
+	list<FrameRateCandidate>::iterator i = candidates.begin();
+	while (i != candidates.end()) {
+
+		float this_error = std::numeric_limits<float>::max ();
+		for (RegionList::const_iterator j = _regions.begin(); j != _regions.end(); ++j) {
+			shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (j->content);
+			if (!vc) {
+				continue;
+			}
+
+			this_error += fabs (i->source - vc->video_frame_rate ());
 		}
+
+		if (this_error < error) {
+			error = this_error;
+			best = *i;
+		}
+
+		++i;
 	}
 
-	return shared_ptr<FFmpegContent> ();
+	if (!best) {
+		return 24;
+	}
+	
+	return best->dcp;
 }
 
-bool
-Playlist::has_subtitles () const
+Time
+Playlist::length (shared_ptr<const Film> film) const
 {
-	shared_ptr<FFmpegContent> fc = ffmpeg ();
-	if (!fc) {
-		return false;
+	Time len = 0;
+	for (RegionList::const_iterator i = _regions.begin(); i != _regions.end(); ++i) {
+		Time const t = i->time + i->content->length (film);
+		len = max (len, t);
 	}
-	
-	return !fc->subtitle_streams().empty();
+
+	return len;
 }
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index e6acff694..5b9299795 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_PLAYLIST_H
+#define DCPOMATIC_PLAYLIST_H
+
 #include <list>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
@@ -46,7 +49,7 @@ class Film;
  * from the video unless any sound-only files are present.  If sound-only files exist, they
  * are played simultaneously (i.e. they can be split up into multiple files for different channels)
  */
-    
+
 class Playlist
 {
 public:
@@ -58,44 +61,29 @@ public:
 
 	void add (boost::shared_ptr<Content>);
 	void remove (boost::shared_ptr<Content>);
-	void move_earlier (boost::shared_ptr<Content>);
-	void move_later (boost::shared_ptr<Content>);
 
-	ContentAudioFrame audio_length () const;
-	int audio_channels () const;
-	int audio_frame_rate () const;
-	bool has_audio () const;
-	
-	float video_frame_rate () const;
-	libdcp::Size video_size () const;
-	ContentVideoFrame video_length () const;
-
-	AudioMapping default_audio_mapping () const;
-	ContentVideoFrame content_length () const;
+	bool has_subtitles () const;
 
-	enum AudioFrom {
-		AUDIO_FFMPEG,
-		AUDIO_SNDFILE
+	struct Region
+	{
+		Region ()
+			: time (0)
+		{}
+		
+		Region (boost::shared_ptr<Content> c, Time t, Playlist* p);
+		Region (boost::shared_ptr<const cxml::Node>, Playlist* p);
+
+		void as_xml (xmlpp::Node *) const;
+		
+		boost::shared_ptr<Content> content;
+		Time time;
+		boost::signals2::connection connection;
 	};
 
-	AudioFrom audio_from () const {
-		return _audio_from;
-	}
-
-	bool has_subtitles () const;
+	typedef std::vector<Region> RegionList;
 	
-	ContentList content () const {
-		return _content;
-	}
-
-	boost::shared_ptr<FFmpegContent> ffmpeg () const;
-
-	std::list<boost::shared_ptr<const VideoContent> > video () const {
-		return _video;
-	}
-
-	std::list<boost::shared_ptr<const AudioContent> > audio () const {
-		return _audio;
+	RegionList regions () const {
+		return _regions;
 	}
 
 	std::string audio_digest () const;
@@ -107,26 +95,17 @@ public:
 	
 	void set_loop (int l);
 
+	Time length (boost::shared_ptr<const Film>) const;
+	int best_dcp_frame_rate () const;
+
 	mutable boost::signals2::signal<void ()> Changed;
 	mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
 	
 private:
-	void setup ();
 	void content_changed (boost::weak_ptr<Content>, int);
 
-	/** where we should get our audio from */
-	AudioFrom _audio_from;
-
-	/** all our content */
-	ContentList _content;
-	/** all our content which contains video */
-	std::list<boost::shared_ptr<const VideoContent> > _video;
-	/** all our content which contains audio.  This may contain the same objects
-	 *  as _video for FFmpegContent.
-	 */
-	std::list<boost::shared_ptr<const AudioContent> > _audio;
-
+	RegionList _regions;
 	int _loop;
-
-	std::list<boost::signals2::connection> _content_connections;
 };
+
+#endif
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 539b0dfb5..210ca1577 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -68,7 +68,7 @@ SndfileContent::information () const
 	s << String::compose (
 		_("%1 channels, %2kHz, %3 samples"),
 		audio_channels(),
-		audio_frame_rate() / 1000.0,
+		content_audio_frame_rate() / 1000.0,
 		audio_length()
 		);
 	
@@ -120,3 +120,15 @@ SndfileContent::as_xml (xmlpp::Node* node) const
 	node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (_audio_frame_rate));
 }
 
+int
+SndfileContent::output_audio_frame_rate (shared_ptr<const Film>) const
+{
+	/* Resample to a DCI-approved sample rate */
+	return dcp_audio_frame_rate (content_audio_frame_rate ());
+}
+
+Time
+SndfileContent::length (shared_ptr<const Film> film) const
+{
+	return film->audio_frames_to_time (audio_length ());
+}
diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index e8e86b603..0623aa6f0 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -41,6 +41,7 @@ public:
 	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
 	boost::shared_ptr<Content> clone () const;
+	Time length (boost::shared_ptr<const Film>) const;
 
         /* AudioContent */
         int audio_channels () const {
@@ -53,10 +54,12 @@ public:
 		return _audio_length;
 	}
 	
-        int audio_frame_rate () const {
+        int content_audio_frame_rate () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_frame_rate;
 	}
+
+        int output_audio_frame_rate (boost::shared_ptr<const Film>) const;
 	
 	static bool valid_file (boost::filesystem::path);
 
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index dc22475cd..f114979de 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -23,6 +23,7 @@
 #include "sndfile_decoder.h"
 #include "film.h"
 #include "exceptions.h"
+#include "audio_buffers.h"
 
 #include "i18n.h"
 
@@ -59,7 +60,7 @@ SndfileDecoder::pass ()
 	/* Do things in half second blocks as I think there may be limits
 	   to what FFmpeg (and in particular the resampler) can cope with.
 	*/
-	sf_count_t const block = _sndfile_content->audio_frame_rate() / 2;
+	sf_count_t const block = _sndfile_content->content_audio_frame_rate() / 2;
 	sf_count_t const this_time = min (block, _remaining);
 
 	int const channels = _sndfile_content->audio_channels ();
diff --git a/src/lib/subtitle.h b/src/lib/subtitle.h
index 38ba4e70e..2b77eb4cb 100644
--- a/src/lib/subtitle.h
+++ b/src/lib/subtitle.h
@@ -23,7 +23,7 @@
 
 #include <list>
 #include <boost/shared_ptr.hpp>
-#include "util.h"
+#include "types.h"
 
 struct AVSubtitle;
 class Image;
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 0c3b8c37b..a0a9454b7 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -113,18 +113,7 @@ TranscodeJob::remaining_time () const
 		return 0;
 	}
 
-	if (!_film->video_length()) {
-		return 0;
-	}
-
 	/* Compute approximate proposed length here, as it's only here that we need it */
-	int length = _film->video_length();
-	FrameRateConversion const frc (_film->video_frame_rate(), _film->dcp_frame_rate());
-	if (frc.skip) {
-		length /= 2;
-	}
-	/* If we are repeating it shouldn't affect transcode time, so don't take it into account */
-
-	int const left = length - _transcoder->video_frames_out();
+	OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
 	return left / fps;
 }
diff --git a/src/lib/types.h b/src/lib/types.h
index 5e4826918..4b8b8072d 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -21,15 +21,19 @@
 #define DCPOMATIC_TYPES_H
 
 #include <vector>
+#include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <libdcp/util.h>
 
 class Content;
 
-typedef std::vector<boost::shared_ptr<Content> > ContentList;
 typedef int64_t ContentAudioFrame;
-typedef int ContentVideoFrame;
-typedef double Time;
+typedef int     ContentVideoFrame;
+typedef int64_t Time;
+#define TIME_MAX INT64_MAX
+#define TIME_HZ  96000
+typedef int64_t OutputAudioFrame;
+typedef int     OutputVideoFrame;
 
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 5e957f923..9063b46d4 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -113,6 +113,12 @@ seconds_to_hms (int s)
 	return hms.str ();
 }
 
+string
+time_to_hms (Time t)
+{
+	return seconds_to_hms (t / TIME_HZ);
+}
+
 /** @param s Number of seconds.
  *  @return String containing an approximate description of s (e.g. "about 2 hours")
  */
@@ -428,66 +434,11 @@ about_equal (float a, float b)
 	return (fabs (a - b) < 1e-4);
 }
 
-class FrameRateCandidate
-{
-public:
-	FrameRateCandidate (float source_, int dcp_)
-		: source (source_)
-		, dcp (dcp_)
-	{}
-
-	float source;
-	int dcp;
-};
-
-int
-best_dcp_frame_rate (float source_fps)
-{
-	list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
-
-	/* Work out what rates we could manage, including those achieved by using skip / repeat. */
-	list<FrameRateCandidate> candidates;
-
-	/* Start with the ones without skip / repeat so they will get matched in preference to skipped/repeated ones */
-	for (list<int>::const_iterator i = allowed_dcp_frame_rates.begin(); i != allowed_dcp_frame_rates.end(); ++i) {
-		candidates.push_back (FrameRateCandidate (*i, *i));
-	}
-
-	/* Then the skip/repeat ones */
-	for (list<int>::const_iterator i = allowed_dcp_frame_rates.begin(); i != allowed_dcp_frame_rates.end(); ++i) {
-		candidates.push_back (FrameRateCandidate (float (*i) / 2, *i));
-		candidates.push_back (FrameRateCandidate (float (*i) * 2, *i));
-	}
-
-	/* Pick the best one, bailing early if we hit an exact match */
-	float error = std::numeric_limits<float>::max ();
-	optional<FrameRateCandidate> best;
-	list<FrameRateCandidate>::iterator i = candidates.begin();
-	while (i != candidates.end()) {
-		
-		if (about_equal (i->source, source_fps)) {
-			best = *i;
-			break;
-		}
-
-		float const e = fabs (i->source - source_fps);
-		if (e < error) {
-			error = e;
-			best = *i;
-		}
-
-		++i;
-	}
-
-	assert (best);
-	return best->dcp;
-}
-
-/** @param An arbitrary sampling rate.
- *  @return The appropriate DCP-approved sampling rate (48kHz or 96kHz).
+/** @param An arbitrary audio frame rate.
+ *  @return The appropriate DCP-approved frame rate (48kHz or 96kHz).
  */
 int
-dcp_audio_sample_rate (int fs)
+dcp_audio_frame_rate (int fs)
 {
 	if (fs <= 48000) {
 		return 48000;
@@ -724,166 +675,6 @@ get_optional_int (multimap<string, string> const & kv, string k)
 	return lexical_cast<int> (i->second);
 }
 
-/** Construct an AudioBuffers.  Audio data is undefined after this constructor.
- *  @param channels Number of channels.
- *  @param frames Number of frames to reserve space for.
- */
-AudioBuffers::AudioBuffers (int channels, int frames)
-	: _channels (channels)
-	, _frames (frames)
-	, _allocated_frames (frames)
-{
-	_data = new float*[_channels];
-	for (int i = 0; i < _channels; ++i) {
-		_data[i] = new float[frames];
-	}
-}
-
-/** Copy constructor.
- *  @param other Other AudioBuffers; data is copied.
- */
-AudioBuffers::AudioBuffers (AudioBuffers const & other)
-	: _channels (other._channels)
-	, _frames (other._frames)
-	, _allocated_frames (other._frames)
-{
-	_data = new float*[_channels];
-	for (int i = 0; i < _channels; ++i) {
-		_data[i] = new float[_frames];
-		memcpy (_data[i], other._data[i], _frames * sizeof (float));
-	}
-}
-
-/* XXX: it's a shame that this is a copy-and-paste of the above;
-   probably fixable with c++0x.
-*/
-AudioBuffers::AudioBuffers (boost::shared_ptr<const AudioBuffers> other)
-	: _channels (other->_channels)
-	, _frames (other->_frames)
-	, _allocated_frames (other->_frames)
-{
-	_data = new float*[_channels];
-	for (int i = 0; i < _channels; ++i) {
-		_data[i] = new float[_frames];
-		memcpy (_data[i], other->_data[i], _frames * sizeof (float));
-	}
-}
-
-/** AudioBuffers destructor */
-AudioBuffers::~AudioBuffers ()
-{
-	for (int i = 0; i < _channels; ++i) {
-		delete[] _data[i];
-	}
-
-	delete[] _data;
-}
-
-/** @param c Channel index.
- *  @return Buffer for this channel.
- */
-float*
-AudioBuffers::data (int c) const
-{
-	assert (c >= 0 && c < _channels);
-	return _data[c];
-}
-
-/** Set the number of frames that these AudioBuffers will report themselves
- *  as having.
- *  @param f Frames; must be less than or equal to the number of allocated frames.
- */
-void
-AudioBuffers::set_frames (int f)
-{
-	assert (f <= _allocated_frames);
-	_frames = f;
-}
-
-/** Make all samples on all channels silent */
-void
-AudioBuffers::make_silent ()
-{
-	for (int i = 0; i < _channels; ++i) {
-		make_silent (i);
-	}
-}
-
-/** Make all samples on a given channel silent.
- *  @param c Channel.
- */
-void
-AudioBuffers::make_silent (int c)
-{
-	assert (c >= 0 && c < _channels);
-	
-	for (int i = 0; i < _frames; ++i) {
-		_data[c][i] = 0;
-	}
-}
-
-/** Copy data from another AudioBuffers to this one.  All channels are copied.
- *  @param from AudioBuffers to copy from; must have the same number of channels as this.
- *  @param frames_to_copy Number of frames to copy.
- *  @param read_offset Offset to read from in `from'.
- *  @param write_offset Offset to write to in `to'.
- */
-void
-AudioBuffers::copy_from (AudioBuffers* from, int frames_to_copy, int read_offset, int write_offset)
-{
-	assert (from->channels() == channels());
-
-	assert (from);
-	assert (read_offset >= 0 && (read_offset + frames_to_copy) <= from->_allocated_frames);
-	assert (write_offset >= 0 && (write_offset + frames_to_copy) <= _allocated_frames);
-
-	for (int i = 0; i < _channels; ++i) {
-		memcpy (_data[i] + write_offset, from->_data[i] + read_offset, frames_to_copy * sizeof(float));
-	}
-}
-
-/** Move audio data around.
- *  @param from Offset to move from.
- *  @param to Offset to move to.
- *  @param frames Number of frames to move.
- */
-    
-void
-AudioBuffers::move (int from, int to, int frames)
-{
-	if (frames == 0) {
-		return;
-	}
-	
-	assert (from >= 0);
-	assert (from < _frames);
-	assert (to >= 0);
-	assert (to < _frames);
-	assert (frames > 0);
-	assert (frames <= _frames);
-	assert ((from + frames) <= _frames);
-	assert ((to + frames) <= _frames);
-	
-	for (int i = 0; i < _channels; ++i) {
-		memmove (_data[i] + to, _data[i] + from, frames * sizeof(float));
-	}
-}
-
-/** Add data from from `from', `from_channel' to our channel `to_channel' */
-void
-AudioBuffers::accumulate (shared_ptr<const AudioBuffers> from, int from_channel, int to_channel)
-{
-	int const N = frames ();
-	assert (from->frames() == N);
-
-	float* s = from->data (from_channel);
-	float* d = _data[to_channel];
-
-	for (int i = 0; i < N; ++i) {
-		*d++ += *s++;
-	}
-}
-
 /** Trip an assert if the caller is not in the UI thread */
 void
 ensure_ui_thread ()
diff --git a/src/lib/util.h b/src/lib/util.h
index 51ccbba99..65859309d 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -51,6 +51,7 @@ extern "C" {
 class Scaler;
 
 extern std::string seconds_to_hms (int);
+extern std::string time_to_hms (Time);
 extern std::string seconds_to_approximate_hms (int);
 extern void stacktrace (std::ostream &, int);
 extern std::string dependency_version_summary ();
@@ -101,10 +102,8 @@ struct FrameRateConversion
 	std::string description;
 };
 
-int best_dcp_frame_rate (float);
-
 extern std::string crop_string (Position, libdcp::Size);
-extern int dcp_audio_sample_rate (int);
+extern int dcp_audio_frame_rate (int);
 extern std::string colour_lut_index_to_name (int index);
 extern int stride_round_up (int, int const *, int);
 extern int stride_lookup (int c, int const * stride);
@@ -151,51 +150,6 @@ private:
 	int _timeout;
 };
 
-/** @class AudioBuffers
- *  @brief A class to hold multi-channel audio data in float format.
- */
-class AudioBuffers
-{
-public:
-	AudioBuffers (int channels, int frames);
-	AudioBuffers (AudioBuffers const &);
-	AudioBuffers (boost::shared_ptr<const AudioBuffers>);
-	~AudioBuffers ();
-
-	float** data () const {
-		return _data;
-	}
-	
-	float* data (int) const;
-
-	int channels () const {
-		return _channels;
-	}
-
-	int frames () const {
-		return _frames;
-	}
-
-	void set_frames (int f);
-
-	void make_silent ();
-	void make_silent (int c);
-
-	void copy_from (AudioBuffers* from, int frames_to_copy, int read_offset, int write_offset);
-	void move (int from, int to, int frames);
-	void accumulate (boost::shared_ptr<const AudioBuffers>, int, int);
-
-private:
-	/** Number of channels */
-	int _channels;
-	/** Number of frames (where a frame is one sample across all channels) */
-	int _frames;
-	/** Number of frames that _data can hold */
-	int _allocated_frames;
-	/** Audio data (so that, e.g. _data[2][6] is channel 2, sample 6) */
-	float** _data;
-};
-
 extern int64_t video_frames_to_audio_frames (ContentVideoFrame v, float audio_sample_rate, float frames_per_second);
 extern std::pair<std::string, int> cpu_info ();
 
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 2af6ba908..9fb2b9bce 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -104,9 +104,3 @@ VideoContent::information () const
 	
 	return s.str ();
 }
-
-Time
-VideoContent::temporal_length () const
-{
-	return video_length() / video_frame_rate();
-}
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index b2ec87e2b..75e507d4d 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -42,7 +42,6 @@ public:
 
 	void as_xml (xmlpp::Node *) const;
 	virtual std::string information () const;
-	Time temporal_length () const;
 
 	ContentVideoFrame video_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index fd8238441..a24059da2 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -79,7 +79,7 @@ VideoDecoder::set_progress (Job* j) const
 {
 	assert (j);
 
-	if (_film->video_length()) {
-		j->set_progress (float (_video_frame) / _film->video_length());
+	if (_film->length()) {
+		j->set_progress (float (_video_frame) / _film->time_to_video_frames (_film->length()));
 	}
 }
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index c7d2cf8b4..f1451763e 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -75,26 +75,24 @@ Writer::Writer (shared_ptr<Film> f, shared_ptr<Job> j)
 		new libdcp::MonoPictureAsset (
 			_film->internal_video_mxf_dir (),
 			_film->internal_video_mxf_filename (),
-			_film->dcp_frame_rate (),
+			_film->dcp_video_frame_rate (),
 			_film->format()->dcp_size ()
 			)
 		);
 
 	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
-	if (_film->audio_channels() > 0) {
-		_sound_asset.reset (
-			new libdcp::SoundAsset (
-				_film->dir (_film->dcp_name()),
-				_film->dcp_audio_mxf_filename (),
-				_film->dcp_frame_rate (),
-				_film->audio_mapping().dcp_channels (),
-				dcp_audio_sample_rate (_film->audio_frame_rate())
-				)
-			);
-
-		_sound_asset_writer = _sound_asset->start_write ();
-	}
+	_sound_asset.reset (
+		new libdcp::SoundAsset (
+			_film->dir (_film->dcp_name()),
+			_film->dcp_audio_mxf_filename (),
+			_film->dcp_video_frame_rate (),
+			MAX_AUDIO_CHANNELS,
+			_film->dcp_audio_frame_rate()
+			)
+		);
+	
+	_sound_asset_writer = _sound_asset->start_write ();
 
 	_thread = new boost::thread (boost::bind (&Writer::thread, this));
 }
@@ -205,8 +203,8 @@ try
 			}
 			lock.lock ();
 			
-			if (_film->video_length ()) {
-				_job->set_progress (float(_full_written + _fake_written + _repeat_written) / _film->video_length());
+			if (_film->length ()) {
+				_job->set_progress (float(_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length()));
 			}
 
 			++_last_written_frame;
@@ -263,11 +261,8 @@ Writer::finish ()
 	_thread = 0;
 
 	_picture_asset_writer->finalize ();
-
-	if (_sound_asset_writer) {
-		_sound_asset_writer->finalize ();
-	}
-
+	_sound_asset_writer->finalize ();
+	
 	int const frames = _last_written_frame + 1;
 	int duration = 0;
 	if (_film->trim_type() == Film::CPL) {
@@ -302,12 +297,10 @@ Writer::finish ()
 	_picture_asset->set_directory (_film->dir (_film->dcp_name ()));
 	_picture_asset->set_file_name (_film->dcp_video_mxf_filename ());
 
-	if (_sound_asset) {
-		if (_film->trim_type() == Film::CPL) {
-			_sound_asset->set_entry_point (_film->trim_start ());
-		}
-		_sound_asset->set_duration (duration);
+	if (_film->trim_type() == Film::CPL) {
+		_sound_asset->set_entry_point (_film->trim_start ());
 	}
+	_sound_asset->set_duration (duration);
 	
 	libdcp::DCP dcp (_film->dir (_film->dcp_name()));
 
@@ -317,7 +310,7 @@ Writer::finish ()
 			_film->dcp_name(),
 			_film->dcp_content_type()->libdcp_kind (),
 			frames,
-			_film->dcp_frame_rate ()
+			_film->dcp_video_frame_rate ()
 			)
 		);
 	
diff --git a/src/lib/wscript b/src/lib/wscript
index bce6c644c..0d9da3a8f 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -6,6 +6,7 @@ sources = """
 	  ab_transcoder.cc
           analyse_audio_job.cc
           audio_analysis.cc
+          audio_buffers.cc
           audio_content.cc
           audio_decoder.cc
           audio_mapping.cc
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index d1d13ab78..f508b8943 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -90,10 +90,6 @@ AudioDialog::set_film (shared_ptr<Film> f)
 	
 	_film = f;
 
-	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-		_channel_checkbox[i]->Show (!_film->audio_mapping().dcp_to_content (static_cast<libdcp::Channel> (i)).empty());
-	}
-
 	try_to_load_analysis ();
 	_plot->set_gain (_film->audio_gain ());
 
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 093d25b7c..10157eb2c 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -140,7 +140,7 @@ AudioMappingView::set_mapping (AudioMapping map)
 		_grid->DeleteRows (0, _grid->GetNumberRows ());
 	}
 
-	list<AudioMapping::Channel> content_channels = map.content_channels ();
+	list<int> content_channels = map.content_channels ();
 	_grid->InsertRows (0, content_channels.size ());
 
 	for (size_t r = 0; r < content_channels.size(); ++r) {
@@ -150,10 +150,8 @@ AudioMappingView::set_mapping (AudioMapping map)
 	}
 	
 	int n = 0;
-	for (list<AudioMapping::Channel>::iterator i = content_channels.begin(); i != content_channels.end(); ++i) {
-		shared_ptr<const AudioContent> ac = i->content.lock ();
-		assert (ac);
-		_grid->SetCellValue (n, 0, wxString::Format (wxT("%s %d"), std_to_wx (ac->file().filename().string()).data(), i->index + 1));
+	for (list<int>::iterator i = content_channels.begin(); i != content_channels.end(); ++i) {
+		_grid->SetCellValue (n, 0, wxString::Format (wxT("%d"), *i + 1));
 
 		list<libdcp::Channel> const d = map.content_to_dcp (*i);
 		for (list<libdcp::Channel>::const_iterator j = d.begin(); j != d.end(); ++j) {
diff --git a/src/wx/ffmpeg_content_dialog.cc b/src/wx/ffmpeg_content_dialog.cc
index 8adff59f4..0949d02a6 100644
--- a/src/wx/ffmpeg_content_dialog.cc
+++ b/src/wx/ffmpeg_content_dialog.cc
@@ -113,7 +113,7 @@ FFmpegContentDialog::audio_stream_changed (wxCommandEvent &)
 		} else {
 			s << c->audio_channels() << wxT (" ") << _("channels");
 		}
-		s << wxT (", ") << c->audio_frame_rate() << _("Hz");
+		s << wxT (", ") << c->content_audio_frame_rate() << _("Hz");
 		_audio_description->SetLabel (s);
 	}
 }
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 528e3840f..32def4641 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -163,21 +163,6 @@ FilmEditor::make_film_panel ()
 	grid->Add (_length, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	++r;
 
-
-	{
-		add_label_to_grid_bag_sizer (grid, _film_panel, _("Trim frames"), wxGBPosition (r, 0));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		add_label_to_sizer (s, _film_panel, _("Start"));
-		_trim_start = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (_trim_start);
-		add_label_to_sizer (s, _film_panel, _("End"));
-		_trim_end = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (_trim_end);
-
-		grid->Add (s, wxGBPosition (r, 1));
-	}
-	++r;
-
 	add_label_to_grid_bag_sizer (grid, _film_panel, _("Trim method"), wxGBPosition (r, 0));
 	_trim_type = new wxChoice (_film_panel, wxID_ANY);
 	grid->Add (_trim_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
@@ -215,8 +200,6 @@ FilmEditor::connect_to_widgets ()
 	_content_add->Connect            (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this);
 	_content_remove->Connect         (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_remove_clicked), 0, this);
 	_content_properties->Connect     (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_properties_clicked), 0, this);
-	_content_earlier->Connect        (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_earlier_clicked), 0, this);
-	_content_later->Connect          (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_later_clicked), 0, this);
 	_content_timeline->Connect       (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_timeline_clicked), 0, this);
 	_loop_content->Connect           (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::loop_content_toggled), 0, this);
 	_loop_count->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::loop_count_changed), 0, this);
@@ -230,8 +213,6 @@ FilmEditor::connect_to_widgets ()
 	_dcp_frame_rate->Connect         (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this);
 	_best_dcp_frame_rate->Connect    (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this);
 	_ab->Connect                     (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::ab_toggled), 0, this);
-	_trim_start->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::trim_start_changed), 0, this);
-	_trim_end->Connect               (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::trim_end_changed), 0, this);
 	_trim_type->Connect              (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::trim_type_changed), 0, this);
 	_with_subtitles->Connect         (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
 	_subtitle_offset->Connect        (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
@@ -335,8 +316,6 @@ FilmEditor::make_video_panel ()
 	_top_crop->SetRange (0, 1024);
 	_right_crop->SetRange (0, 1024);
 	_bottom_crop->SetRange (0, 1024);
-	_trim_start->SetRange (0, 100);
-	_trim_end->SetRange (0, 100);
 	_j2k_bandwidth->SetRange (50, 250);
 }
 
@@ -363,10 +342,6 @@ FilmEditor::make_content_panel ()
                 b->Add (_content_remove);
                 _content_properties = new wxButton (_content_panel, wxID_ANY, _("Properties..."));
                 b->Add (_content_properties);
-                _content_earlier = new wxButton (_content_panel, wxID_ANY, _("Earlier"));
-                b->Add (_content_earlier);
-                _content_later = new wxButton (_content_panel, wxID_ANY, _("Later"));
-                b->Add (_content_later);
 		_content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
 		b->Add (_content_timeline);
 
@@ -589,7 +564,7 @@ FilmEditor::dcp_frame_rate_changed (wxCommandEvent &)
 		return;
 	}
 
-	_film->set_dcp_frame_rate (
+	_film->set_dcp_video_frame_rate (
 		boost::lexical_cast<int> (
 			wx_to_std (_dcp_frame_rate->GetString (_dcp_frame_rate->GetSelection ()))
 			)
@@ -667,12 +642,6 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::SCALER:
 		checked_set (_scaler, Scaler::as_index (_film->scaler ()));
 		break;
-	case Film::TRIM_START:
-		checked_set (_trim_start, _film->trim_start());
-		break;
-	case Film::TRIM_END:
-		checked_set (_trim_end, _film->trim_end());
-		break;
 	case Film::TRIM_TYPE:
 		checked_set (_trim_type, _film->trim_type() == Film::CPL ? 0 : 1);
 		break;
@@ -706,11 +675,11 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::DCI_METADATA:
 		setup_dcp_name ();
 		break;
-	case Film::DCP_FRAME_RATE:
+	case Film::DCP_VIDEO_FRAME_RATE:
 	{
 		bool done = false;
 		for (unsigned int i = 0; i < _dcp_frame_rate->GetCount(); ++i) {
-			if (wx_to_std (_dcp_frame_rate->GetString(i)) == boost::lexical_cast<string> (_film->dcp_frame_rate())) {
+			if (wx_to_std (_dcp_frame_rate->GetString(i)) == boost::lexical_cast<string> (_film->dcp_video_frame_rate())) {
 				checked_set (_dcp_frame_rate, i);
 				done = true;
 				break;
@@ -721,17 +690,10 @@ FilmEditor::film_changed (Film::Property p)
 			checked_set (_dcp_frame_rate, -1);
 		}
 
-		if (_film->video_frame_rate()) {
-			_best_dcp_frame_rate->Enable (best_dcp_frame_rate (_film->video_frame_rate ()) != _film->dcp_frame_rate ());
-		} else {
-			_best_dcp_frame_rate->Disable ();
-		}
+		_best_dcp_frame_rate->Enable (_film->best_dcp_video_frame_rate () != _film->dcp_video_frame_rate ());
 		setup_frame_rate_description ();
 		break;
 	}
-	case Film::AUDIO_MAPPING:
-		_audio_mapping->set_mapping (_film->audio_mapping ());
-		break;
 	}
 }
 
@@ -785,20 +747,10 @@ void
 FilmEditor::setup_length ()
 {
 	stringstream s;
-	ContentVideoFrame const frames = _film->content_length ();
+	Time const length = _film->length ();
 	
-	if (frames && _film->video_frame_rate()) {
-		s << frames << " " << wx_to_std (_("frames")) << "; " << seconds_to_hms (frames / _film->video_frame_rate());
-	} else if (frames) {
-		s << frames << " " << wx_to_std (_("frames"));
-	}
-
+	s << time_to_hms (length);
 	_length->SetLabel (std_to_wx (s.str ()));
-	
-	if (frames) {
-		_trim_start->SetRange (0, frames);
-		_trim_end->SetRange (0, frames);
-	}
 }	
 
 void
@@ -806,7 +758,10 @@ FilmEditor::setup_frame_rate_description ()
 {
 	wxString d;
 	int lines = 0;
-	
+
+#if 0
+	XXX
+		
 	if (_film->video_frame_rate()) {
 		d << std_to_wx (FrameRateConversion (_film->video_frame_rate(), _film->dcp_frame_rate()).description);
 		++lines;
@@ -819,6 +774,7 @@ FilmEditor::setup_frame_rate_description ()
 			++lines;
 		}
 	}
+#endif	
 
 	for (int i = lines; i < 2; ++i) {
 		d << wxT ("\n ");
@@ -905,7 +861,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::COLOUR_LUT);
 	film_changed (Film::J2K_BANDWIDTH);
 	film_changed (Film::DCI_METADATA);
-	film_changed (Film::DCP_FRAME_RATE);
+	film_changed (Film::DCP_VIDEO_FRAME_RATE);
 	film_changed (Film::AUDIO_MAPPING);
 
 	film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::SUBTITLE_STREAMS);
@@ -940,8 +896,6 @@ FilmEditor::set_things_sensitive (bool s)
 	_dcp_content_type->Enable (s);
 	_best_dcp_frame_rate->Enable (s);
 	_dcp_frame_rate->Enable (s);
-	_trim_start->Enable (s);
-	_trim_end->Enable (s);
 	_ab->Enable (s);
 	_trim_type->Enable (s);
 	_colour_lut->Enable (s);
@@ -1018,26 +972,6 @@ FilmEditor::setup_notebook_size ()
 	Fit ();
 }
 
-void
-FilmEditor::trim_start_changed (wxCommandEvent &)
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_trim_start (_trim_start->GetValue ());
-}
-
-void
-FilmEditor::trim_end_changed (wxCommandEvent &)
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_trim_end (_trim_end->GetValue ());
-}
-
 void
 FilmEditor::audio_gain_calculate_button_clicked (wxCommandEvent &)
 {
@@ -1168,13 +1102,13 @@ FilmEditor::best_dcp_frame_rate_clicked (wxCommandEvent &)
 		return;
 	}
 	
-	_film->set_dcp_frame_rate (best_dcp_frame_rate (_film->video_frame_rate ()));
+	_film->set_dcp_video_frame_rate (_film->best_dcp_video_frame_rate ());
 }
 
 void
 FilmEditor::setup_show_audio_sensitivity ()
 {
-	_show_audio->Enable (_film && _film->has_audio ());
+	_show_audio->Enable (_film);
 }
 
 void
@@ -1188,17 +1122,17 @@ FilmEditor::setup_content ()
 	
 	_content->DeleteAllItems ();
 
-	ContentList content = _film->content ();
-	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+	Playlist::RegionList regions = _film->regions ();
+	for (Playlist::RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
 		int const t = _content->GetItemCount ();
-		_content->InsertItem (t, std_to_wx ((*i)->summary ()));
-		if ((*i)->summary() == selected_summary) {
+		_content->InsertItem (t, std_to_wx (i->content->summary ()));
+		if (i->content->summary() == selected_summary) {
 			_content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 		}
 	}
 
-	if (selected_summary.empty () && !content.empty ()) {
-		/* Select the first item of content if non was selected before */
+	if (selected_summary.empty () && !regions.empty ()) {
+		/* Select the item of content if non was selected before */
 		_content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 	}
 
@@ -1244,10 +1178,10 @@ FilmEditor::content_remove_clicked (wxCommandEvent &)
 void
 FilmEditor::content_activated (wxListEvent& ev)
 {
-	ContentList c = _film->content ();
-	assert (ev.GetIndex() >= 0 && size_t (ev.GetIndex()) < c.size ());
+	Playlist::RegionList r = _film->regions ();
+	assert (ev.GetIndex() >= 0 && size_t (ev.GetIndex()) < r.size ());
 
-	content_properties (c[ev.GetIndex()]);
+	content_properties (r[ev.GetIndex()].content);
 }
 
 void
@@ -1262,16 +1196,16 @@ FilmEditor::content_properties_clicked (wxCommandEvent &)
 }
 
 void
-FilmEditor::content_properties (shared_ptr<Content> c)
+FilmEditor::content_properties (shared_ptr<Content> content)
 {
-	shared_ptr<ImageMagickContent> im = dynamic_pointer_cast<ImageMagickContent> (c);
+	shared_ptr<ImageMagickContent> im = dynamic_pointer_cast<ImageMagickContent> (content);
 	if (im) {
 		ImageMagickContentDialog* d = new ImageMagickContentDialog (this, im);
 		d->ShowModal ();
 		d->Destroy ();
 	}
 
-	shared_ptr<FFmpegContent> ff = dynamic_pointer_cast<FFmpegContent> (c);
+	shared_ptr<FFmpegContent> ff = dynamic_pointer_cast<FFmpegContent> (content);
 	if (ff) {
 		FFmpegContentDialog* d = new FFmpegContentDialog (this, ff);
 		d->ShowModal ();
@@ -1279,24 +1213,6 @@ FilmEditor::content_properties (shared_ptr<Content> c)
 	}
 }
 
-void
-FilmEditor::content_earlier_clicked (wxCommandEvent &)
-{
-	shared_ptr<Content> c = selected_content ();
-	if (c) {
-		_film->move_content_earlier (c);
-	}
-}
-
-void
-FilmEditor::content_later_clicked (wxCommandEvent &)
-{
-	shared_ptr<Content> c = selected_content ();
-	if (c) {
-		_film->move_content_later (c);
-	}
-}
-
 void
 FilmEditor::content_selection_changed (wxListEvent &)
 {
@@ -1329,8 +1245,6 @@ FilmEditor::setup_content_button_sensitivity ()
 		);
 	
         _content_remove->Enable (selection && _generally_sensitive);
-        _content_earlier->Enable (selection && _generally_sensitive);
-        _content_later->Enable (selection && _generally_sensitive);
 	_content_timeline->Enable (_generally_sensitive);
 }
 
@@ -1342,12 +1256,12 @@ FilmEditor::selected_content ()
 		return shared_ptr<Content> ();
 	}
 
-	ContentList c = _film->content ();
-	if (s < 0 || size_t (s) >= c.size ()) {
+	Playlist::RegionList r = _film->regions ();
+	if (s < 0 || size_t (s) >= r.size ()) {
 		return shared_ptr<Content> ();
 	}
 	
-	return c[s];
+	return r[s].content;
 }
 
 void
@@ -1355,6 +1269,8 @@ FilmEditor::setup_scaling_description ()
 {
 	wxString d;
 
+#if 0	
+XXX
 	int lines = 0;
 
 	if (_film->video_size().width && _film->video_size().height) {
@@ -1403,6 +1319,7 @@ FilmEditor::setup_scaling_description ()
 		d << wxT ("\n ");
 	}
 
+#endif	
 	_scaling_description->SetLabel (d);
 }
 
@@ -1444,6 +1361,6 @@ FilmEditor::content_timeline_clicked (wxCommandEvent &)
 		_timeline_dialog = 0;
 	}
 	
-	_timeline_dialog = new TimelineDialog (this, _film->playlist ());
+	_timeline_dialog = new TimelineDialog (this, _film);
 	_timeline_dialog->Show ();
 }
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 41f7bfd1b..c791ad064 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -70,12 +70,8 @@ private:
 	void content_add_clicked (wxCommandEvent &);
 	void content_remove_clicked (wxCommandEvent &);
 	void content_properties_clicked (wxCommandEvent &);
-	void content_earlier_clicked (wxCommandEvent &);
-	void content_later_clicked (wxCommandEvent &);
 	void imagemagick_video_length_changed (wxCommandEvent &);
 	void format_changed (wxCommandEvent &);
-	void trim_start_changed (wxCommandEvent &);
-	void trim_end_changed (wxCommandEvent &);
 	void trim_type_changed (wxCommandEvent &);
 	void dcp_content_type_changed (wxCommandEvent &);
 	void ab_toggled (wxCommandEvent &);
@@ -177,8 +173,6 @@ private:
 	/** The Film's audio details */
 	wxStaticText* _audio;
 
-	wxSpinCtrl* _trim_start;
-	wxSpinCtrl* _trim_end;
 	wxChoice* _trim_type;
 	/** Selector to generate an A/B comparison DCP */
 	wxCheckBox* _ab;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 03f0ca646..11c826a26 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -180,7 +180,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 void
 FilmViewer::update_from_decoder ()
 {
-	if (!_player || _player->seek (_player->last_video_time ())) {
+	if (!_player || _player->seek (_player->last_video ())) {
 		return;
 	}
 
@@ -201,8 +201,8 @@ FilmViewer::timer (wxTimerEvent &)
 
 	get_frame ();
 
-	if (_film->video_length()) {
-		int const new_slider_position = 4096 * _player->last_video_time() / (_film->video_length() / _film->video_frame_rate());
+	if (_film->length()) {
+		int const new_slider_position = 4096 * _player->last_video() / _film->length();
 		if (new_slider_position != _slider->GetValue()) {
 			_slider->SetValue (new_slider_position);
 		}
@@ -259,7 +259,7 @@ void
 FilmViewer::slider_moved (wxScrollEvent &)
 {
 	if (_film && _player) {
-		_player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()));
+		_player->seek (_slider->GetValue() * _film->length() / 4096);
 	}
 	
 	get_frame ();
@@ -312,7 +312,7 @@ FilmViewer::raw_to_display ()
 		   when working out the scale that we are applying.
 		*/
 
-		Size const cropped_size = _film->cropped_size (_film->video_size ());
+		Size const cropped_size = _film->cropped_size (_raw_frame->size ());
 
 		Rect tx = subtitle_transformed_area (
 			float (_film_size.width) / cropped_size.width,
@@ -381,7 +381,7 @@ FilmViewer::check_play_state ()
 	}
 	
 	if (_play_button->GetValue()) {
-		_timer.Start (1000 / _film->video_frame_rate());
+		_timer.Start (1000 / _film->dcp_video_frame_rate());
 	} else {
 		_timer.Stop ();
 	}
@@ -397,7 +397,7 @@ FilmViewer::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subti
 
 	_got_frame = true;
 
-	double const fps = _film->video_frame_rate ();
+	double const fps = _film->dcp_video_frame_rate ();
 	_frame->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps))));
 
 	double w = t;
@@ -425,6 +425,8 @@ FilmViewer::get_frame ()
 		return;
 	}
 
+	cout << "-> FilmViewer::get_frame()\n";
+
 	try {
 		_got_frame = false;
 		while (!_got_frame) {
@@ -441,6 +443,8 @@ FilmViewer::get_frame ()
 		check_play_state ();
 		error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data()));
 	}
+
+	cout << "<- FilmViewer::get_frame()\n";
 }
 
 void
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index d20a58ca8..40527ded7 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -50,10 +50,8 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
 	table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
 
-	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->video_length())));
-	FrameRateConversion frc (_film->video_frame_rate(), _film->dcp_frame_rate());
-	int const dcp_length = _film->video_length() * frc.factor();
-	double const disk = ((double) _film->j2k_bandwidth() / 8) * dcp_length / (_film->dcp_frame_rate() * 1073741824.0f);
+	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->time_to_video_frames (_film->length()))));
+	double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length() / (TIME_HZ * 1073741824.0f);
 	stringstream s;
 	s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
 	_disk->SetLabel (std_to_wx (s.str ()));
@@ -80,9 +78,9 @@ PropertiesDialog::frames_already_encoded () const
 		return "";
 	}
 	
-	if (_film->video_length()) {
+	if (_film->length()) {
 		/* XXX: encoded_frames() should check which frames have been encoded */
-		u << " (" << (_film->encoded_frames() * 100 / _film->video_length()) << "%)";
+		u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length())) << "%)";
 	}
 	return u.str ();
 }
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 731e72168..f6d41dcb9 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -19,6 +19,7 @@
 
 #include <list>
 #include <wx/graphics.h>
+#include "film.h"
 #include "timeline.h"
 #include "wx_util.h"
 #include "playlist.h"
@@ -45,7 +46,7 @@ public:
 protected:
 	int time_x (Time t) const
 	{
-		return _timeline.tracks_position().x + t * _timeline.pixels_per_second();
+		return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit();
 	}
 	
 	Timeline& _timeline;
@@ -54,7 +55,7 @@ protected:
 class ContentView : public View
 {
 public:
-	ContentView (Timeline& tl, boost::shared_ptr<const Content> c, Time s, int t)
+	ContentView (Timeline& tl, shared_ptr<const Content> c, Time s, int t)
 		: View (tl)
 		, _content (c)
 		, _start (s)
@@ -66,12 +67,13 @@ public:
 
 	void paint (wxGraphicsContext* gc)
 	{
+		shared_ptr<const Film> film = _timeline.film ();
 		shared_ptr<const Content> content = _content.lock ();
-		if (!content) {
+		if (!film || !content) {
 			return;
 		}
-		
-		Time const len = content->temporal_length ();
+
+		Time const len = content->length (film);
 
 		gc->SetPen (*wxBLACK_PEN);
 		
@@ -107,19 +109,20 @@ public:
 		wxDouble name_leading;
 		gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading);
 		
-		gc->Clip (wxRegion (time_x (_start), y_pos (_track), len * _timeline.pixels_per_second(), _timeline.track_height()));
+		gc->Clip (wxRegion (time_x (_start), y_pos (_track), len * _timeline.pixels_per_time_unit(), _timeline.track_height()));
 		gc->DrawText (name, time_x (_start) + 12, y_pos (_track + 1) - name_height - 4);
 		gc->ResetClip ();
 	}
 
 	Rect bbox () const
 	{
+		shared_ptr<const Film> film = _timeline.film ();
 		shared_ptr<const Content> content = _content.lock ();
-		if (!content) {
+		if (!film || !content) {
 			return Rect ();
 		}
 		
-		return Rect (time_x (_start), y_pos (_track), content->temporal_length() * _timeline.pixels_per_second(), _timeline.track_height());
+		return Rect (time_x (_start), y_pos (_track), content->length (film) * _timeline.pixels_per_time_unit(), _timeline.track_height());
 	}
 
 	void set_selected (bool s) {
@@ -150,7 +153,7 @@ private:
 class AudioContentView : public ContentView
 {
 public:
-	AudioContentView (Timeline& tl, boost::shared_ptr<const Content> c, Time s, int t)
+	AudioContentView (Timeline& tl, shared_ptr<const Content> c, Time s, int t)
 		: ContentView (tl, c, s, t)
 	{}
 	
@@ -169,7 +172,7 @@ private:
 class VideoContentView : public ContentView
 {
 public:
-	VideoContentView (Timeline& tl, boost::shared_ptr<const Content> c, Time s, int t)
+	VideoContentView (Timeline& tl, shared_ptr<const Content> c, Time s, int t)
 		: ContentView (tl, c, s, t)
 	{}
 
@@ -202,7 +205,7 @@ public:
 		gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxSOLID));
 #endif		    
 		
-		int mark_interval = rint (128 / _timeline.pixels_per_second ());
+		int mark_interval = rint (128 * TIME_HZ / _timeline.pixels_per_time_unit ());
 		if (mark_interval > 5) {
 			mark_interval -= mark_interval % 5;
 		}
@@ -226,7 +229,7 @@ public:
 		gc->StrokePath (path);
 
 		Time t = 0;
-		while ((t * _timeline.pixels_per_second()) < _timeline.width()) {
+		while ((t * _timeline.pixels_per_time_unit()) < _timeline.width()) {
 			wxGraphicsPath path = gc->CreatePath ();
 			path.MoveToPoint (time_x (t), _y - 4);
 			path.AddLineToPoint (time_x (t), _y + 4);
@@ -246,7 +249,7 @@ public:
 			wxDouble str_leading;
 			gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
 			
-			int const tx = _timeline.x_offset() + t * _timeline.pixels_per_second();
+			int const tx = _timeline.x_offset() + t * _timeline.pixels_per_time_unit();
 			if ((tx + str_width) < _timeline.width()) {
 				gc->DrawText (str, time_x (t), _y + 16);
 			}
@@ -263,14 +266,14 @@ private:
 	int _y;
 };
 
-Timeline::Timeline (wxWindow* parent, shared_ptr<Playlist> pl)
+Timeline::Timeline (wxWindow* parent, shared_ptr<const Film> film)
 	: wxPanel (parent)
-	, _playlist (pl)
-	, _pixels_per_second (0)
+	, _film (film)
+	, _pixels_per_time_unit (0)
 {
 	SetDoubleBuffered (true);
 
-	setup_pixels_per_second ();
+	setup_pixels_per_time_unit ();
 	
 	Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (Timeline::paint), 0, this);
 	Connect (wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler (Timeline::left_down), 0, this);
@@ -279,8 +282,8 @@ Timeline::Timeline (wxWindow* parent, shared_ptr<Playlist> pl)
 
 	playlist_changed ();
 
-	pl->Changed.connect (bind (&Timeline::playlist_changed, this));
-	pl->ContentChanged.connect (bind (&Timeline::playlist_changed, this));
+	film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this));
+	film->playlist()->ContentChanged.connect (bind (&Timeline::playlist_changed, this));
 }
 
 void
@@ -288,11 +291,6 @@ Timeline::paint (wxPaintEvent &)
 {
 	wxPaintDC dc (this);
 
-	shared_ptr<Playlist> pl = _playlist.lock ();
-	if (!pl) {
-		return;
-	}
-
 	wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
 	if (!gc) {
 		return;
@@ -300,9 +298,6 @@ Timeline::paint (wxPaintEvent &)
 
 	gc->SetFont (gc->CreateFont (*wxNORMAL_FONT));
 
-	/* XXX */
-	_pixels_per_second = (width() - x_offset() * 2) / (pl->content_length() / pl->video_frame_rate());
-
 	for (list<shared_ptr<View> >::iterator i = _views.begin(); i != _views.end(); ++i) {
 		(*i)->paint (gc);
 	}
@@ -313,30 +308,20 @@ Timeline::paint (wxPaintEvent &)
 void
 Timeline::playlist_changed ()
 {
-	shared_ptr<Playlist> pl = _playlist.lock ();
-	if (!pl) {
+	shared_ptr<const Film> fl = _film.lock ();
+	if (!fl) {
 		return;
 	}
 
 	_views.clear ();
-	
-	int track = 0;
-	Time time = 0;
-	list<shared_ptr<const VideoContent> > vc = pl->video ();
-	for (list<shared_ptr<const VideoContent> >::const_iterator i = vc.begin(); i != vc.end(); ++i) {
-		_views.push_back (shared_ptr<View> (new VideoContentView (*this, *i, time, track)));
-		time += (*i)->temporal_length ();
-	}
 
-	++track;
-	time = 0;
-	list<shared_ptr<const AudioContent> > ac = pl->audio ();
-	for (list<shared_ptr<const AudioContent> >::const_iterator i = ac.begin(); i != ac.end(); ++i) {
-		_views.push_back (shared_ptr<View> (new AudioContentView (*this, *i, time, track)));
-		if (pl->audio_from() != Playlist::AUDIO_FFMPEG) {
-			++track;
+	Playlist::RegionList regions = fl->playlist()->regions ();
+
+	for (Playlist::RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+		if (dynamic_pointer_cast<VideoContent> (i->content)) {
+			_views.push_back (shared_ptr<View> (new VideoContentView (*this, i->content, i->time, 0)));
 		} else {
-			time += (*i)->temporal_length ();
+			_views.push_back (shared_ptr<View> (new AudioContentView (*this, i->content, i->time, 1)));
 		}
 	}
 
@@ -348,28 +333,19 @@ Timeline::playlist_changed ()
 int
 Timeline::tracks () const
 {
-	shared_ptr<Playlist> pl = _playlist.lock ();
-	if (!pl) {
-		return 0;
-	}
-
-	if (pl->audio_from() == Playlist::AUDIO_FFMPEG) {
-		return 2;
-	}
-
-	return 1 + max (size_t (1), pl->audio().size());
+	/* XXX */
+	return 2;
 }
 
 void
-Timeline::setup_pixels_per_second ()
+Timeline::setup_pixels_per_time_unit ()
 {
-	shared_ptr<Playlist> pl = _playlist.lock ();
-	if (!pl) {
+	shared_ptr<const Film> film = _film.lock ();
+	if (!film) {
 		return;
 	}
 
-	/* XXX */
-	_pixels_per_second = (width() - x_offset() * 2) / (pl->content_length() / pl->video_frame_rate());
+	_pixels_per_time_unit = (width() - x_offset() * 2) / film->length();
 }
 
 void
@@ -394,3 +370,9 @@ Timeline::force_redraw (Rect const & r)
 {
 	RefreshRect (wxRect (r.x, r.y, r.width, r.height), false);
 }
+
+shared_ptr<const Film>
+Timeline::film () const
+{
+	return _film.lock ();
+}
diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 59800e7ad..4214ee3a8 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -22,13 +22,15 @@
 #include <wx/wx.h>
 #include "util.h"
 
-class Playlist;
+class Film;
 class View;
 
 class Timeline : public wxPanel
 {
 public:
-	Timeline (wxWindow *, boost::shared_ptr<Playlist>);
+	Timeline (wxWindow *, boost::shared_ptr<const Film>);
+
+	boost::shared_ptr<const Film> film () const;
 
 	void force_redraw (Rect const &);
 
@@ -44,8 +46,8 @@ public:
 		return 64;
 	}
 
-	double pixels_per_second () const {
-		return _pixels_per_second;
+	double pixels_per_time_unit () const {
+		return _pixels_per_time_unit;
 	}
 
 	Position tracks_position () const {
@@ -58,9 +60,9 @@ private:
 	void paint (wxPaintEvent &);
 	void left_down (wxMouseEvent &);
 	void playlist_changed ();
-	void setup_pixels_per_second ();
+	void setup_pixels_per_time_unit ();
 
-	boost::weak_ptr<Playlist> _playlist;
+	boost::weak_ptr<const Film> _film;
 	std::list<boost::shared_ptr<View> > _views;
-	double _pixels_per_second;
+	double _pixels_per_time_unit;
 };
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 7a75044c9..91d1f7b07 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -27,9 +27,9 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 
-TimelineDialog::TimelineDialog (wxWindow* parent, shared_ptr<Playlist> pl)
+TimelineDialog::TimelineDialog (wxWindow* parent, shared_ptr<const Film> film)
 	: wxDialog (parent, wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
-	, _timeline (this, pl)
+	, _timeline (this, film)
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 	
diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index e58de5540..bc6b83eb5 100644
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -27,7 +27,7 @@ class Playlist;
 class TimelineDialog : public wxDialog
 {
 public:
-	TimelineDialog (wxWindow *, boost::shared_ptr<Playlist>);
+	TimelineDialog (wxWindow *, boost::shared_ptr<const Film>);
 
 private:
 	Timeline _timeline;
diff --git a/test/test.cc b/test/test.cc
index 2c957fd35..82b958216 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -364,6 +364,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
 	BOOST_CHECK_EQUAL (JobManager::instance()->errors(), false);
 }
 
+#if 0
 /* Test best_dcp_frame_rate and FrameRateConversion */
 BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test)
 {
@@ -502,6 +503,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test)
 	BOOST_CHECK_EQUAL (frc.repeat, false);
 	BOOST_CHECK_EQUAL (frc.change_speed, true);
 }
+#endif
 
 BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 {
@@ -513,47 +515,47 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 
 	shared_ptr<Film> f = new_test_film ("audio_sampling_rate_test");
 //	f->set_source_frame_rate (24);
-	f->set_dcp_frame_rate (24);
+//	f->set_dcp_frame_rate (24);
 
 //	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
-	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
+//	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
 
 //	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
-	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
+//	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 48000);
 
 //	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 80000, 0)));
-	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000);
+//	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 96000);
 
 //	f->set_source_frame_rate (23.976);
-	f->set_dcp_frame_rate (best_dcp_frame_rate (23.976));
+//	f->set_dcp_frame_rate (best_dcp_frame_rate (23.976));
 //	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
-	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
+//	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
 
 //	f->set_source_frame_rate (29.97);
-	f->set_dcp_frame_rate (best_dcp_frame_rate (29.97));
-	BOOST_CHECK_EQUAL (f->dcp_frame_rate (), 30);
+//	f->set_dcp_frame_rate (best_dcp_frame_rate (29.97));
+//	BOOST_CHECK_EQUAL (f->dcp_frame_rate (), 30);
 //	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
-	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
+//	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 47952);
 
 //	f->set_source_frame_rate (25);
-	f->set_dcp_frame_rate (24);
+//	f->set_dcp_frame_rate (24);
 //	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
-	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000);
+//	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000);
 
 //	f->set_source_frame_rate (25);
-	f->set_dcp_frame_rate (24);
+//	f->set_dcp_frame_rate (24);
 //	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
-	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000);
+//	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), 50000);
 
 	/* Check some out-there conversions (not the best) */
 	
 //	f->set_source_frame_rate (14.99);
-	f->set_dcp_frame_rate (25);
+//	f->set_dcp_frame_rate (25);
 //	f->set_content_audio_stream (shared_ptr<AudioStream> (new FFmpegAudioStream ("a", 42, 16000, 0)));
 	/* The FrameRateConversion within target_audio_sample_rate should choose to double-up
 	   the 14.99 fps video to 30 and then run it slow at 25.
 	*/
-	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), rint (48000 * 2 * 14.99 / 25));
+//	BOOST_CHECK_EQUAL (f->target_audio_sample_rate(), rint (48000 * 2 * 14.99 / 25));
 }
 
 class TestJob : public Job
diff --git a/wscript b/wscript
index 50d6d9040..ca40d08eb 100644
--- a/wscript
+++ b/wscript
@@ -21,7 +21,7 @@ def configure(conf):
     if conf.options.target_windows:
         conf.load('winres')
 
-    conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing',
+    conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing',
                                        '-Wall', '-Wno-attributes', '-Wextra'])
 
     if conf.options.target_windows:
-- 
cgit v1.2.3


From b9f6e9512017dc1ecd3a42aa1ef3c6058608cef5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 21 May 2013 23:19:31 +0100
Subject: Give Film a container; move crop into video content; other bits.

---
 branch-notes                   |   1 +
 src/lib/config.cc              |  16 +++---
 src/lib/config.h               |  12 ++--
 src/lib/container.cc           |  83 ++++++++++++++++++++++++++++
 src/lib/container.h            |  78 ++++++++++++++++++++++++++
 src/lib/encoder.cc             |   4 +-
 src/lib/ffmpeg_decoder.cc      |   3 +-
 src/lib/ffmpeg_decoder.h       |   4 ++
 src/lib/film.cc                | 122 ++++++-----------------------------------
 src/lib/film.h                 |  28 +++-------
 src/lib/filter_graph.cc        |   6 +-
 src/lib/imagemagick_decoder.cc |   4 +-
 src/lib/util.cc                |   2 +
 src/lib/video_content.cc       |  81 +++++++++++++++++++++++++++
 src/lib/video_content.h        |  13 +++++
 src/lib/video_decoder.cc       |   5 +-
 src/lib/video_decoder.h        |   4 +-
 src/lib/writer.cc              |   4 +-
 src/lib/wscript                |   1 +
 src/wx/config_dialog.cc        |  26 ++++-----
 src/wx/config_dialog.h         |   4 +-
 src/wx/film_editor.cc          | 106 +++++++++++++++++++++++------------
 src/wx/film_editor.h           |   7 ++-
 src/wx/film_viewer.cc          |  23 ++++----
 test/test.cc                   |  19 ++-----
 25 files changed, 428 insertions(+), 228 deletions(-)
 create mode 100644 src/lib/container.cc
 create mode 100644 src/lib/container.h

(limited to 'src/lib/encoder.cc')

diff --git a/branch-notes b/branch-notes
index 134883135..3695ecfd5 100644
--- a/branch-notes
+++ b/branch-notes
@@ -6,3 +6,4 @@ things to put back
        overall length?
        trim method (trim in general)
        A/B
+
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 3beb0aea6..c5245bfb4 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -27,7 +27,7 @@
 #include "server.h"
 #include "scaler.h"
 #include "filter.h"
-#include "format.h"
+#include "container.h"
 #include "dcp_content_type.h"
 #include "sound_processor.h"
 
@@ -52,7 +52,7 @@ Config::Config ()
 	, _tms_path (N_("."))
 	, _sound_processor (SoundProcessor::from_id (N_("dolby_cp750")))
 	, _default_still_length (10)
-	, _default_format (0)
+	, _default_container (0)
 	, _default_dcp_content_type (0)
 {
 	_allowed_dcp_frame_rates.push_back (24);
@@ -104,9 +104,9 @@ Config::read ()
 
 	_language = f.optional_string_child ("Language");
 
-	c = f.optional_string_child ("DefaultFormat");
+	c = f.optional_string_child ("DefaultContainer");
 	if (c) {
-		_default_format = Format::from_id (c.get ());
+		_default_container = Container::from_id (c.get ());
 	}
 
 	c = f.optional_string_child ("DefaultDCPContentType");
@@ -167,8 +167,8 @@ Config::read_old_metadata ()
 			_sound_processor = SoundProcessor::from_id (v);
 		} else if (k == "language") {
 			_language = v;
-		} else if (k == "default_format") {
-			_default_format = Format::from_id (v);
+		} else if (k == "default_container") {
+			_default_container = Container::from_id (v);
 		} else if (k == "default_dcp_content_type") {
 			_default_dcp_content_type = DCPContentType::from_dci_name (v);
 		} else if (k == "dcp_metadata_issuer") {
@@ -247,8 +247,8 @@ Config::write () const
 	if (_language) {
 		root->add_child("Language")->add_child_text (_language.get());
 	}
-	if (_default_format) {
-		root->add_child("DefaultFormat")->add_child_text (_default_format->id ());
+	if (_default_container) {
+		root->add_child("DefaultContainer")->add_child_text (_default_container->id ());
 	}
 	if (_default_dcp_content_type) {
 		root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->dci_name ());
diff --git a/src/lib/config.h b/src/lib/config.h
index 96aa4e449..c43a4f079 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -34,7 +34,7 @@ class ServerDescription;
 class Scaler;
 class Filter;
 class SoundProcessor;
-class Format;
+class Container;
 class DCPContentType;
 
 /** @class Config
@@ -114,8 +114,8 @@ public:
 		return _default_still_length;
 	}
 
-	Format const * default_format () const {
-		return _default_format;
+	Container const * default_container () const {
+		return _default_container;
 	}
 
 	DCPContentType const * default_dcp_content_type () const {
@@ -193,8 +193,8 @@ public:
 		_default_still_length = s;
 	}
 
-	void set_default_format (Format const * f) {
-		_default_format = f;
+	void set_default_container (Container const * f) {
+		_default_container = f;
 	}
 
 	void set_default_dcp_content_type (DCPContentType const * t) {
@@ -244,7 +244,7 @@ private:
 	DCIMetadata _default_dci_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
-	Format const * _default_format;
+	Container const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	libdcp::XMLMetadata _dcp_metadata;
 
diff --git a/src/lib/container.cc b/src/lib/container.cc
new file mode 100644
index 000000000..6eaea7300
--- /dev/null
+++ b/src/lib/container.cc
@@ -0,0 +1,83 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <sstream>
+#include <libdcp/types.h>
+#include "container.h"
+
+#include "i18n.h"
+
+using std::string;
+using std::stringstream;
+using std::vector;
+
+vector<Container const *> Container::_containers;
+
+void
+Container::setup_containers ()
+{
+	_containers.push_back (new Container (libdcp::Size (1285, 1080), "119", _("1.19"), "F"));
+	_containers.push_back (new Container (libdcp::Size (1436, 1080), "133", _("4:3"), "F"));
+	_containers.push_back (new Container (libdcp::Size (1480, 1080), "137", _("Academy"), "F"));
+	_containers.push_back (new Container (libdcp::Size (1485, 1080), "138", _("1.375"), "F"));
+	_containers.push_back (new Container (libdcp::Size (1793, 1080), "166", _("1.66"), "F"));
+	_containers.push_back (new Container (libdcp::Size (1920, 1080), "178", _("16:9"), "F"));
+	_containers.push_back (new Container (libdcp::Size (1998, 1080), "185", _("Flat"), "F"));
+	_containers.push_back (new Container (libdcp::Size (2048, 858), "239", _("Scope"), "S"));
+	_containers.push_back (new Container (libdcp::Size (2048, 1080), "full-frame", _("Full frame"), "C"));
+}
+
+/** @return A name to be presented to the user */
+string
+Container::name () const
+{
+	stringstream s;
+	if (!_nickname.empty ()) {
+		s << _nickname << " (";
+	}
+
+	s << _dcp_size.width << "x" << _dcp_size.height;
+
+	if (!_nickname.empty ()) {
+		s << ")";
+	}
+
+	return s.str ();
+}
+
+Container const *
+Container::from_id (string i)
+{
+	vector<Container const *>::iterator j = _containers.begin ();
+	while (j != _containers.end() && (*j)->id() != i) {
+		++j;
+	}
+
+	if (j == _containers.end ()) {
+		return 0;
+	}
+
+	return *j;
+}
+
+float
+Container::ratio () const
+{
+	return static_cast<float> (_dcp_size.width) / _dcp_size.height;
+}
diff --git a/src/lib/container.h b/src/lib/container.h
new file mode 100644
index 000000000..fc3c72792
--- /dev/null
+++ b/src/lib/container.h
@@ -0,0 +1,78 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <vector>
+#include <libdcp/util.h>
+
+class Container
+{
+public:
+	Container (libdcp::Size dcp, std::string id, std::string n, std::string d)
+		: _dcp_size (dcp)
+		, _id (id)
+		, _nickname (n)
+		, _dci_name (d)
+	{}
+
+	/** @return size in pixels of the images that we should
+	 *  put in a DCP for this ratio.  This size will not correspond
+	 *  to the ratio when we are doing things like 16:9 in a Flat frame.
+	 */
+	libdcp::Size dcp_size () const {
+		return _dcp_size;
+	}
+
+	std::string id () const {
+		return _id;
+	}
+
+	/** @return Full name to present to the user */
+	std::string name () const;
+
+	/** @return Nickname (e.g. Flat, Scope) */
+	std::string nickname () const {
+		return _nickname;
+	}
+
+	std::string dci_name () const {
+		return _dci_name;
+	}
+
+	float ratio () const;
+	
+	static void setup_containers ();
+	static Container const * from_id (std::string i);
+	static std::vector<Container const *> all () {
+		return _containers;
+	}
+
+private:
+	/** libdcp::Size in pixels of the images that we should
+	 *  put in a DCP for this container.
+	 */
+	libdcp::Size _dcp_size;
+	/** id for use in metadata */
+	std::string _id;
+	/** nickname (e.g. Flat, Scope) */
+	std::string _nickname;
+	std::string _dci_name;
+
+	/** all available containers */
+	static std::vector<Container const *> _containers;
+};
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 95e98ab76..52927c5d3 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -39,6 +39,7 @@
 #include "writer.h"
 #include "player.h"
 #include "audio_mapping.h"
+#include "container.h"
 
 #include "i18n.h"
 
@@ -208,9 +209,10 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Sub
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
 		TIMING ("adding to queue of %1", _queue.size ());
+		/* XXX: padding */
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
+						  image, sub, _film->container()->dcp_size(), 0,
 						  _film->subtitle_offset(), _film->subtitle_scale(),
 						  _film->scaler(), _video_frames_out, _film->dcp_video_frame_rate(), s.second,
 						  _film->colour_lut(), _film->j2k_bandwidth(),
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index a637160ae..fcb2e82ba 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -68,7 +68,7 @@ boost::mutex FFmpegDecoder::_mutex;
 
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegContent> c, bool video, bool audio, bool subtitles)
 	: Decoder (f)
-	, VideoDecoder (f)
+	, VideoDecoder (f, c)
 	, AudioDecoder (f, c)
 	, _ffmpeg_content (c)
 	, _format_context (0)
@@ -540,7 +540,6 @@ void
 FFmpegDecoder::film_changed (Film::Property p)
 {
 	switch (p) {
-	case Film::CROP:
 	case Film::FILTERS:
 	{
 		boost::mutex::scoped_lock lm (_filter_graphs_mutex);
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index f3f6b126b..7aadef105 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -83,6 +83,10 @@ public:
 	bool seek_back ();
 	bool pass ();
 
+	boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
+		return _ffmpeg_content;
+	}
+
 private:
 
 	/* No copy construction */
diff --git a/src/lib/film.cc b/src/lib/film.cc
index ef67a2704..f05362d56 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -34,7 +34,7 @@
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include "film.h"
-#include "format.h"
+#include "container.h"
 #include "job.h"
 #include "filter.h"
 #include "util.h"
@@ -95,7 +95,7 @@ Film::Film (string d, bool must_exist)
 	: _playlist (new Playlist)
 	, _use_dci_name (true)
 	, _dcp_content_type (Config::instance()->default_dcp_content_type ())
-	, _format (Config::instance()->default_format ())
+	, _container (Config::instance()->default_container ())
 	, _scaler (Scaler::from_id ("bicubic"))
 	, _ab (false)
 	, _audio_gain (0)
@@ -160,8 +160,7 @@ Film::Film (Film const & o)
 	, _name              (o._name)
 	, _use_dci_name      (o._use_dci_name)
 	, _dcp_content_type  (o._dcp_content_type)
-	, _format            (o._format)
-	, _crop              (o._crop)
+	, _container         (o._container)
 	, _filters           (o._filters)
 	, _scaler            (o._scaler)
 	, _ab                (o._ab)
@@ -183,15 +182,14 @@ Film::Film (Film const & o)
 string
 Film::video_state_identifier () const
 {
-	assert (format ());
+	assert (container ());
 	LocaleGuard lg;
 
 	pair<string, string> f = Filter::ffmpeg_strings (filters());
 
 	stringstream s;
-	s << format()->id()
+	s << container()->id()
 	  << "_" << _playlist->video_digest()
-	  << "_" << crop().left << "_" << crop().right << "_" << crop().top << "_" << crop().bottom
 	  << "_" << _dcp_video_frame_rate
 	  << "_" << f.first << "_" << f.second
 	  << "_" << scaler()->id()
@@ -305,8 +303,8 @@ Film::make_dcp ()
 	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"));
+	if (container() == 0) {
+		throw MissingSettingError (_("container"));
 	}
 
 	if (_playlist->content().empty ()) {
@@ -377,7 +375,7 @@ Film::send_dcp_to_tms ()
 int
 Film::encoded_frames () const
 {
-	if (format() == 0) {
+	if (container() == 0) {
 		return 0;
 	}
 
@@ -410,15 +408,10 @@ Film::write_metadata () const
 		root->add_child("DCPContentType")->add_child_text (_dcp_content_type->dci_name ());
 	}
 
-	if (_format) {
-		root->add_child("Format")->add_child_text (_format->id ());
+	if (_container) {
+		root->add_child("Container")->add_child_text (_container->id ());
 	}
 
-	root->add_child("LeftCrop")->add_child_text (boost::lexical_cast<string> (_crop.left));
-	root->add_child("RightCrop")->add_child_text (boost::lexical_cast<string> (_crop.right));
-	root->add_child("TopCrop")->add_child_text (boost::lexical_cast<string> (_crop.top));
-	root->add_child("BottomCrop")->add_child_text (boost::lexical_cast<string> (_crop.bottom));
-
 	for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
 		root->add_child("Filter")->add_child_text ((*i)->id ());
 	}
@@ -466,17 +459,12 @@ Film::read_metadata ()
 	}
 
 	{
-		optional<string> c = f.optional_string_child ("Format");
+		optional<string> c = f.optional_string_child ("Container");
 		if (c) {
-			_format = Format::from_id (c.get ());
+			_container = Container::from_id (c.get ());
 		}
 	}
 
-	_crop.left = f.number_child<int> ("LeftCrop");
-	_crop.right = f.number_child<int> ("RightCrop");
-	_crop.top = f.number_child<int> ("TopCrop");
-	_crop.bottom = f.number_child<int> ("BottomCrop");
-
 	{
 		list<shared_ptr<cxml::Node> > c = f.node_children ("Filter");
 		for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
@@ -502,15 +490,6 @@ Film::read_metadata ()
 	_dirty = false;
 }
 
-libdcp::Size
-Film::cropped_size (libdcp::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.
  */
@@ -570,8 +549,8 @@ Film::dci_name (bool if_created_now) const
 		d << "_" << dcp_content_type()->dci_name();
 	}
 
-	if (format()) {
-		d << "_" << format()->dci_name();
+	if (container()) {
+		d << "_" << container()->dci_name();
 	}
 
 	DCIMetadata const dm = dci_metadata ();
@@ -666,80 +645,13 @@ Film::set_dcp_content_type (DCPContentType const * t)
 }
 
 void
-Film::set_format (Format const * f)
+Film::set_container (Container const * c)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_format = f;
-	}
-	signal_changed (FORMAT);
-}
-
-void
-Film::set_crop (Crop c)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_crop = c;
-	}
-	signal_changed (CROP);
-}
-
-void
-Film::set_left_crop (int c)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		
-		if (_crop.left == c) {
-			return;
-		}
-		
-		_crop.left = c;
-	}
-	signal_changed (CROP);
-}
-
-void
-Film::set_right_crop (int c)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		if (_crop.right == c) {
-			return;
-		}
-		
-		_crop.right = c;
-	}
-	signal_changed (CROP);
-}
-
-void
-Film::set_top_crop (int c)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		if (_crop.top == c) {
-			return;
-		}
-		
-		_crop.top = c;
-	}
-	signal_changed (CROP);
-}
-
-void
-Film::set_bottom_crop (int c)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		if (_crop.bottom == c) {
-			return;
-		}
-		
-		_crop.bottom = c;
+		_container = c;
 	}
-	signal_changed (CROP);
+	signal_changed (CONTAINER);
 }
 
 void
diff --git a/src/lib/film.h b/src/lib/film.h
index 6dd2b446d..9b01dc604 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -39,7 +39,7 @@
 #include "playlist.h"
 
 class DCPContentType;
-class Format;
+class Container;
 class Job;
 class Filter;
 class Log;
@@ -88,7 +88,6 @@ public:
 
 	void write_metadata () const;
 
-	libdcp::Size cropped_size (libdcp::Size) const;
 	std::string dci_name (bool if_created_now) const;
 	std::string dcp_name (bool if_created_now = false) const;
 
@@ -131,8 +130,7 @@ public:
 		CONTENT,
 		LOOP,
 		DCP_CONTENT_TYPE,
-		FORMAT,
-		CROP,
+		CONTAINER,
 		FILTERS,
 		SCALER,
 		AB,
@@ -170,14 +168,9 @@ public:
 		return _dcp_content_type;
 	}
 
-	Format const * format () const {
+	Container const * container () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _format;
-	}
-
-	Crop crop () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _crop;
+		return _container;
 	}
 
 	std::vector<Filter const *> filters () const {
@@ -249,12 +242,7 @@ public:
 	void add_content (boost::shared_ptr<Content>);
 	void remove_content (boost::shared_ptr<Content>);
 	void set_dcp_content_type (DCPContentType const *);
-	void set_format (Format const *);
-	void set_crop (Crop);
-	void set_left_crop (int);
-	void set_right_crop (int);
-	void set_top_crop (int);
-	void set_bottom_crop (int);
+	void set_container (Container const *);
 	void set_filters (std::vector<Filter const *>);
 	void set_scaler (Scaler const *);
 	void set_ab (bool);
@@ -309,10 +297,8 @@ private:
 	bool _use_dci_name;
 	/** The type of content that this Film represents (feature, trailer etc.) */
 	DCPContentType const * _dcp_content_type;
-	/** The format to present this Film in (flat, scope, etc.) */
-	Format const * _format;
-	/** The crop to apply to the source */
-	Crop _crop;
+	/** The container to put this Film in (flat, scope, etc.) */
+	Container const * _container;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;
 	/** Scaler algorithm to use */
diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index a52c030fe..09bbf5dcd 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -68,7 +68,11 @@ FilterGraph::FilterGraph (shared_ptr<const Film> film, FFmpegDecoder* decoder, l
 		filters += N_(",");
 	}
 
-	filters += crop_string (Position (film->crop().left, film->crop().top), film->cropped_size (decoder->native_size()));
+	Crop crop = decoder->ffmpeg_content()->crop ();
+	libdcp::Size cropped_size = decoder->native_size ();
+	cropped_size.width -= crop.left + crop.right;
+	cropped_size.height -= crop.top + crop.bottom;
+	filters += crop_string (Position (crop.left, crop.top), cropped_size);
 
 	AVFilterGraph* graph = avfilter_graph_alloc();
 	if (graph == 0) {
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index dd18ad64e..c6b19b742 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -34,7 +34,7 @@ using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
 	: Decoder (f)
-	, VideoDecoder (f)
+	, VideoDecoder (f, c)
 	, _imagemagick_content (c)
 	, _position (0)
 {
@@ -92,7 +92,7 @@ ImageMagickDecoder::pass ()
 
 	delete magick_image;
 
-	_image = _image->crop (_film->crop(), true);
+	_image = _image->crop (_imagemagick_content->crop(), true);
 	emit_video (_image, false, double (_position) / 24);
 
 	++_position;
diff --git a/src/lib/util.cc b/src/lib/util.cc
index de5fbf8d1..e1bc560c6 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -61,6 +61,7 @@ extern "C" {
 #include "filter.h"
 #include "sound_processor.h"
 #include "config.h"
+#include "container.h"
 #ifdef DVDOMATIC_WINDOWS
 #include "stack.hpp"
 #endif
@@ -285,6 +286,7 @@ dcpomatic_setup ()
 	avfilter_register_all ();
 	
 	Format::setup_formats ();
+	Container::setup_containers ();
 	DCPContentType::setup_dcp_content_types ();
 	Scaler::setup_scalers ();
 	Filter::setup_filters ();
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 9fb2b9bce..cb31b6476 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -26,6 +26,7 @@
 int const VideoContentProperty::VIDEO_LENGTH = 0;
 int const VideoContentProperty::VIDEO_SIZE = 1;
 int const VideoContentProperty::VIDEO_FRAME_RATE = 2;
+int const VideoContentProperty::VIDEO_CROP = 3;
 
 using std::string;
 using std::stringstream;
@@ -47,6 +48,10 @@ VideoContent::VideoContent (shared_ptr<const cxml::Node> node)
 	_video_size.width = node->number_child<int> ("VideoWidth");
 	_video_size.height = node->number_child<int> ("VideoHeight");
 	_video_frame_rate = node->number_child<float> ("VideoFrameRate");
+	_crop.left = node->number_child<int> ("LeftCrop");
+	_crop.right = node->number_child<int> ("RightCrop");
+	_crop.top = node->number_child<int> ("TopCrop");
+	_crop.bottom = node->number_child<int> ("BottomCrop");
 }
 
 VideoContent::VideoContent (VideoContent const & o)
@@ -66,6 +71,10 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	node->add_child("VideoWidth")->add_child_text (lexical_cast<string> (_video_size.width));
 	node->add_child("VideoHeight")->add_child_text (lexical_cast<string> (_video_size.height));
 	node->add_child("VideoFrameRate")->add_child_text (lexical_cast<string> (_video_frame_rate));
+	node->add_child("LeftCrop")->add_child_text (boost::lexical_cast<string> (_crop.left));
+	node->add_child("RightCrop")->add_child_text (boost::lexical_cast<string> (_crop.right));
+	node->add_child("TopCrop")->add_child_text (boost::lexical_cast<string> (_crop.top));
+	node->add_child("BottomCrop")->add_child_text (boost::lexical_cast<string> (_crop.bottom));
 }
 
 void
@@ -104,3 +113,75 @@ VideoContent::information () const
 	
 	return s.str ();
 }
+
+void
+VideoContent::set_crop (Crop c)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_crop = c;
+	}
+	signal_changed (VideoContentProperty::VIDEO_CROP);
+}
+
+void
+VideoContent::set_left_crop (int c)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		
+		if (_crop.left == c) {
+			return;
+		}
+		
+		_crop.left = c;
+	}
+	
+	signal_changed (VideoContentProperty::VIDEO_CROP);
+}
+
+void
+VideoContent::set_right_crop (int c)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		if (_crop.right == c) {
+			return;
+		}
+		
+		_crop.right = c;
+	}
+	
+	signal_changed (VideoContentProperty::VIDEO_CROP);
+}
+
+void
+VideoContent::set_top_crop (int c)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		if (_crop.top == c) {
+			return;
+		}
+		
+		_crop.top = c;
+	}
+	
+	signal_changed (VideoContentProperty::VIDEO_CROP);
+}
+
+void
+VideoContent::set_bottom_crop (int c)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		if (_crop.bottom == c) {
+			return;
+		}
+		
+		_crop.bottom = c;
+	}
+
+	signal_changed (VideoContentProperty::VIDEO_CROP);
+}
+
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 75e507d4d..67217e10c 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -31,6 +31,7 @@ public:
 	static int const VIDEO_LENGTH;
 	static int const VIDEO_SIZE;
 	static int const VIDEO_FRAME_RATE;
+	static int const VIDEO_CROP;
 };
 
 class VideoContent : public virtual Content
@@ -58,6 +59,17 @@ public:
 		return _video_frame_rate;
 	}
 
+	void set_crop (Crop);
+	void set_left_crop (int);
+	void set_right_crop (int);
+	void set_top_crop (int);
+	void set_bottom_crop (int);
+
+	Crop crop () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _crop;
+	}
+
 protected:
 	void take_from_video_decoder (boost::shared_ptr<VideoDecoder>);
 
@@ -66,6 +78,7 @@ protected:
 private:
 	libdcp::Size _video_size;
 	float _video_frame_rate;
+	Crop _crop;
 };
 
 #endif
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 533fdcf1a..0c8cda294 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -32,8 +32,9 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
 	: Decoder (f)
+	, _video_content (c)
 	, _video_frame (0)
 	, _last_content_time (0)
 {
@@ -72,7 +73,7 @@ VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
 	
 	if (_timed_subtitle) {
 		Position const p = _timed_subtitle->subtitle()->position ();
-		_timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top));
+		_timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top));
 	}
 }
 
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index a73c7d11e..286a0d6e4 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -28,7 +28,7 @@ class VideoContent;
 class VideoDecoder : public VideoSource, public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>);
+	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
 
 	/** @return video frame rate second, or 0 if unknown */
 	virtual float video_frame_rate () const = 0;
@@ -60,9 +60,9 @@ protected:
 	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
 
 private:
+	boost::shared_ptr<const VideoContent> _video_content;
 	int _video_frame;
 	double _last_content_time;
-	
 	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
 };
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 96c797c5a..aef7230dd 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -27,7 +27,7 @@
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"
-#include "format.h"
+#include "container.h"
 #include "log.h"
 #include "dcp_video_frame.h"
 #include "dcp_content_type.h"
@@ -76,7 +76,7 @@ Writer::Writer (shared_ptr<Film> f, shared_ptr<Job> j)
 			_film->internal_video_mxf_dir (),
 			_film->internal_video_mxf_filename (),
 			_film->dcp_video_frame_rate (),
-			_film->format()->dcp_size ()
+			_film->container()->dcp_size ()
 			)
 		);
 
diff --git a/src/lib/wscript b/src/lib/wscript
index d8cc8261d..1da245484 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -13,6 +13,7 @@ sources = """
           audio_source.cc
           config.cc
           combiner.cc
+          container.cc
           content.cc
           cross.cc
           dci_metadata.cc
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 50b8990b1..ae5bed723 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -28,7 +28,7 @@
 #include <wx/notebook.h>
 #include "lib/config.h"
 #include "lib/server.h"
-#include "lib/format.h"
+#include "lib/container.h"
 #include "lib/scaler.h"
 #include "lib/filter.h"
 #include "lib/dcp_content_type.h"
@@ -127,9 +127,9 @@ ConfigDialog::make_misc_panel ()
 	table->Add (_default_dci_metadata_button);
 	table->AddSpacer (1);
 
-	add_label_to_sizer (table, _misc_panel, _("Default format"));
-	_default_format = new wxChoice (_misc_panel, wxID_ANY);
-	table->Add (_default_format);
+	add_label_to_sizer (table, _misc_panel, _("Default container"));
+	_default_container = new wxChoice (_misc_panel, wxID_ANY);
+	table->Add (_default_container);
 	table->AddSpacer (1);
 
 	add_label_to_sizer (table, _misc_panel, _("Default content type"));
@@ -171,17 +171,17 @@ ConfigDialog::make_misc_panel ()
 
 	_default_dci_metadata_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_default_dci_metadata_clicked), 0, this);
 
-	vector<Format const *> fmt = Format::all ();
+	vector<Container const *> fmt = Container::all ();
 	int n = 0;
-	for (vector<Format const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
-		_default_format->Append (std_to_wx ((*i)->name ()));
-		if (*i == config->default_format ()) {
-			_default_format->SetSelection (n);
+	for (vector<Container const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
+		_default_container->Append (std_to_wx ((*i)->name ()));
+		if (*i == config->default_container ()) {
+			_default_container->SetSelection (n);
 		}
 		++n;
 	}
 
-	_default_format->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::default_format_changed), 0, this);
+	_default_container->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::default_container_changed), 0, this);
 	
 	vector<DCPContentType const *> const ct = DCPContentType::all ();
 	n = 0;
@@ -533,10 +533,10 @@ ConfigDialog::default_still_length_changed (wxCommandEvent &)
 }
 
 void
-ConfigDialog::default_format_changed (wxCommandEvent &)
+ConfigDialog::default_container_changed (wxCommandEvent &)
 {
-	vector<Format const *> fmt = Format::all ();
-	Config::instance()->set_default_format (fmt[_default_format->GetSelection()]);
+	vector<Container const *> fmt = Container::all ();
+	Config::instance()->set_default_container (fmt[_default_container->GetSelection()]);
 }
 
 void
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 5df1a634f..dda846b7d 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -57,7 +57,7 @@ private:
 	void edit_server_clicked (wxCommandEvent &);
 	void remove_server_clicked (wxCommandEvent &);
 	void server_selection_changed (wxListEvent &);
-	void default_format_changed (wxCommandEvent &);
+	void default_container_changed (wxCommandEvent &);
 	void default_dcp_content_type_changed (wxCommandEvent &);
 	void issuer_changed (wxCommandEvent &);
 	void creator_changed (wxCommandEvent &);
@@ -79,7 +79,7 @@ private:
 	wxPanel* _metadata_panel;
 	wxCheckBox* _set_language;
 	wxChoice* _language;
-	wxChoice* _default_format;
+	wxChoice* _default_container;
 	wxChoice* _default_dcp_content_type;
 	wxTextCtrl* _tms_ip;
 	wxTextCtrl* _tms_path;
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 4955d9f3d..3c5e1e0a7 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -54,6 +54,7 @@
 #include "imagemagick_content_dialog.h"
 #include "timeline_dialog.h"
 #include "audio_mapping_view.h"
+#include "container.h"
 
 using std::string;
 using std::cout;
@@ -126,6 +127,11 @@ FilmEditor::make_dcp_panel ()
 	grid->Add (_edit_dci_button, wxGBPosition (r, 1), wxDefaultSpan);
 	++r;
 
+	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Container"), wxGBPosition (r, 0));
+	_container = new wxChoice (_dcp_panel, wxID_ANY);
+	grid->Add (_container, wxGBPosition (r, 1));
+	++r;
+
 	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Content Type"), wxGBPosition (r, 0));
 	_dcp_content_type = new wxChoice (_dcp_panel, wxID_ANY);
 	grid->Add (_dcp_content_type, wxGBPosition (r, 1));
@@ -137,11 +143,16 @@ FilmEditor::make_dcp_panel ()
 		_dcp_frame_rate = new wxChoice (_dcp_panel, wxID_ANY);
 		s->Add (_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
 		_best_dcp_frame_rate = new wxButton (_dcp_panel, wxID_ANY, _("Use best"));
-		s->Add (_best_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxALL | wxEXPAND, 6);
+		s->Add (_best_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND);
 		grid->Add (s, wxGBPosition (r, 1));
 	}
 	++r;
 
+	vector<Container const *> const co = Container::all ();
+	for (vector<Container const *>::const_iterator i = co.begin(); i != co.end(); ++i) {
+		_container->Append (std_to_wx ((*i)->name ()));
+	}
+
 	vector<DCPContentType const *> const ct = DCPContentType::all ();
 	for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
 		_dcp_content_type->Append (std_to_wx ((*i)->pretty_name ()));
@@ -159,7 +170,8 @@ FilmEditor::connect_to_widgets ()
 	_name->Connect                   (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED,         wxCommandEventHandler (FilmEditor::name_changed), 0, this);
 	_use_dci_name->Connect           (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this);
 	_edit_dci_button->Connect        (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
-	_format->Connect                 (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::format_changed), 0, this);
+	_container->Connect              (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::container_changed), 0, this);
+//	_format->Connect                 (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::format_changed), 0, this);
 	_content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED,   wxListEventHandler    (FilmEditor::content_selection_changed), 0, this);
 	_content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler    (FilmEditor::content_selection_changed), 0, this);
 	_content_add->Connect            (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this);
@@ -434,44 +446,48 @@ FilmEditor::make_subtitle_panel ()
 void
 FilmEditor::left_crop_changed (wxCommandEvent &)
 {
-	if (!_film) {
+	shared_ptr<VideoContent> c = selected_video_content ();
+	if (!c) {
 		return;
 	}
 
-	_film->set_left_crop (_left_crop->GetValue ());
+	c->set_left_crop (_left_crop->GetValue ());
 }
 
 /** Called when the right crop widget has been changed */
 void
 FilmEditor::right_crop_changed (wxCommandEvent &)
 {
-	if (!_film) {
+	shared_ptr<VideoContent> c = selected_video_content ();
+	if (!c) {
 		return;
 	}
 
-	_film->set_right_crop (_right_crop->GetValue ());
+	c->set_right_crop (_right_crop->GetValue ());
 }
 
 /** Called when the top crop widget has been changed */
 void
 FilmEditor::top_crop_changed (wxCommandEvent &)
 {
-	if (!_film) {
+	shared_ptr<VideoContent> c = selected_video_content ();
+	if (!c) {
 		return;
 	}
 
-	_film->set_top_crop (_top_crop->GetValue ());
+	c->set_top_crop (_top_crop->GetValue ());
 }
 
 /** Called when the bottom crop value has been changed */
 void
 FilmEditor::bottom_crop_changed (wxCommandEvent &)
 {
-	if (!_film) {
+	shared_ptr<VideoContent> c = selected_video_content ();
+	if (!c) {
 		return;
 	}
 
-	_film->set_bottom_crop (_bottom_crop->GetValue ());
+	c->set_bottom_crop (_bottom_crop->GetValue ());
 }
 
 /** Called when the name widget has been changed */
@@ -561,7 +577,7 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::CONTENT:
 		setup_content ();
 		setup_formats ();
-		setup_format ();
+//		setup_format ();
 		setup_subtitle_control_sensitivity ();
 		setup_show_audio_sensitivity ();
 		break;
@@ -570,15 +586,8 @@ FilmEditor::film_changed (Film::Property p)
 		checked_set (_loop_count, _film->loop());
 		setup_loop_sensitivity ();
 		break;
-	case Film::FORMAT:
-		setup_format ();
-		break;
-	case Film::CROP:
-		checked_set (_left_crop, _film->crop().left);
-		checked_set (_right_crop, _film->crop().right);
-		checked_set (_top_crop, _film->crop().top);
-		checked_set (_bottom_crop, _film->crop().bottom);
-		setup_scaling_description ();
+	case Film::CONTAINER:
+		setup_container ();
 		break;
 	case Film::FILTERS:
 	{
@@ -655,7 +664,7 @@ FilmEditor::film_changed (Film::Property p)
 }
 
 void
-FilmEditor::film_content_changed (weak_ptr<Content> content, int property)
+FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property)
 {
 	if (!_film) {
 		/* We call this method ourselves (as well as using it as a signal handler)
@@ -663,8 +672,20 @@ FilmEditor::film_content_changed (weak_ptr<Content> content, int property)
 		*/
 		return;
 	}
-		
-	if (property == FFmpegContentProperty::SUBTITLE_STREAMS) {
+
+	shared_ptr<Content> content = weak_content.lock ();
+	shared_ptr<VideoContent> video_content;
+	if (content) {
+		video_content = dynamic_pointer_cast<VideoContent> (content);
+	}
+
+	if (property == VideoContentProperty::VIDEO_CROP) {
+		checked_set (_left_crop,   video_content ? video_content->crop().left :   0);
+		checked_set (_right_crop,  video_content ? video_content->crop().right :  0);
+		checked_set (_top_crop,    video_content ? video_content->crop().top :    0);
+		checked_set (_bottom_crop, video_content ? video_content->crop().bottom : 0);
+		setup_scaling_description ();
+	} else if (property == FFmpegContentProperty::SUBTITLE_STREAMS) {
 		setup_subtitle_control_sensitivity ();
 	} else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
 		setup_show_audio_sensitivity ();
@@ -675,37 +696,39 @@ FilmEditor::film_content_changed (weak_ptr<Content> content, int property)
 }
 
 void
-FilmEditor::setup_format ()
+FilmEditor::setup_container ()
 {
 	int n = 0;
-	vector<Format const *>::iterator i = _formats.begin ();
-	while (i != _formats.end() && *i != _film->format ()) {
+	vector<Container const *> containers = Container::all ();
+	vector<Container const *>::iterator i = containers.begin ();
+	while (i != containers.end() && *i != _film->container ()) {
 		++i;
 		++n;
 	}
 	
-	if (i == _formats.end()) {
-		checked_set (_format, -1);
+	if (i == containers.end()) {
+		checked_set (_container, -1);
 	} else {
-		checked_set (_format, n);
+		checked_set (_container, n);
 	}
 	
 	setup_dcp_name ();
 	setup_scaling_description ();
 }	
 
-/** Called when the format widget has been changed */
+/** Called when the container widget has been changed */
 void
-FilmEditor::format_changed (wxCommandEvent &)
+FilmEditor::container_changed (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 
-	int const n = _format->GetSelection ();
+	int const n = _container->GetSelection ();
 	if (n >= 0) {
-		assert (n < int (_formats.size()));
-		_film->set_format (_formats[n]);
+		vector<Container const *> containers = Container::all ();
+		assert (n < int (containers.size()));
+		_film->set_container (containers[n]);
 	}
 }
 
@@ -755,8 +778,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::CONTENT);
 	film_changed (Film::LOOP);
 	film_changed (Film::DCP_CONTENT_TYPE);
-	film_changed (Film::FORMAT);
-	film_changed (Film::CROP);
+	film_changed (Film::CONTAINER);
 	film_changed (Film::FILTERS);
 	film_changed (Film::SCALER);
 	film_changed (Film::AUDIO_GAIN);
@@ -769,6 +791,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::DCI_METADATA);
 	film_changed (Film::DCP_VIDEO_FRAME_RATE);
 
+	film_content_changed (boost::shared_ptr<Content> (), VideoContentProperty::VIDEO_CROP);
 	film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::SUBTITLE_STREAMS);
 	film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::SUBTITLE_STREAM);
 	film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::AUDIO_STREAMS);
@@ -1102,6 +1125,17 @@ FilmEditor::selected_content ()
 	return c[s];
 }
 
+shared_ptr<VideoContent>
+FilmEditor::selected_video_content ()
+{
+	shared_ptr<Content> c = selected_content ();
+	if (!c) {
+		return shared_ptr<VideoContent> ();
+	}
+
+	return dynamic_pointer_cast<VideoContent> (c);
+}
+
 void
 FilmEditor::setup_scaling_description ()
 {
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 9123dfdb4..3f7264296 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -35,6 +35,7 @@ class Film;
 class AudioDialog;
 class TimelineDialog;
 class AudioMappingView;
+class Format;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -69,7 +70,7 @@ private:
 	void content_add_clicked (wxCommandEvent &);
 	void content_remove_clicked (wxCommandEvent &);
 	void imagemagick_video_length_changed (wxCommandEvent &);
-	void format_changed (wxCommandEvent &);
+	void container_changed (wxCommandEvent &);
 	void dcp_content_type_changed (wxCommandEvent &);
 	void scaler_changed (wxCommandEvent &);
 	void audio_gain_changed (wxCommandEvent &);
@@ -103,13 +104,14 @@ private:
 	void setup_scaling_description ();
 	void setup_main_notebook_size ();
 	void setup_content ();
-	void setup_format ();
+	void setup_container ();
 	void setup_content_button_sensitivity ();
 	void setup_loop_sensitivity ();
 	void setup_content_properties ();
 	
 	void active_jobs_changed (bool);
 	boost::shared_ptr<Content> selected_content ();
+	boost::shared_ptr<VideoContent> selected_video_content ();
 
 	wxNotebook* _main_notebook;
 	wxNotebook* _content_notebook;
@@ -129,6 +131,7 @@ private:
 	wxTextCtrl* _name;
 	wxStaticText* _dcp_name;
 	wxCheckBox* _use_dci_name;
+	wxChoice* _container;
 	wxListCtrl* _content;
 	wxButton* _content_add;
 	wxButton* _content_remove;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 2f69235c1..6a40e88f7 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -27,6 +27,7 @@
 #include <iomanip>
 #include <wx/tglbtn.h>
 #include "lib/film.h"
+#include "lib/container.h"
 #include "lib/format.h"
 #include "lib/util.h"
 #include "lib/job_manager.h"
@@ -115,7 +116,7 @@ void
 FilmViewer::film_changed (Film::Property p)
 {
 	switch (p) {
-	case Film::FORMAT:
+	case Film::CONTAINER:
 		calculate_sizes ();
 		update_from_raw ();
 		break;
@@ -135,7 +136,6 @@ FilmViewer::film_changed (Film::Property p)
 		break;
 	case Film::SCALER:
 	case Film::FILTERS:
-	case Film::CROP:
 		update_from_decoder ();
 		break;
 	default:
@@ -173,7 +173,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 	_film->ContentChanged.connect (boost::bind (&FilmViewer::film_content_changed, this, _1, _2));
 
 	film_changed (Film::CONTENT);
-	film_changed (Film::FORMAT);
+	film_changed (Film::CONTAINER);
 	film_changed (Film::WITH_SUBTITLES);
 	film_changed (Film::SUBTITLE_OFFSET);
 	film_changed (Film::SUBTITLE_SCALE);
@@ -314,7 +314,8 @@ FilmViewer::raw_to_display ()
 		   when working out the scale that we are applying.
 		*/
 
-		Size const cropped_size = _film->cropped_size (_raw_frame->size ());
+		/* XXX */
+		Size const cropped_size = _raw_frame->size ();//_film->cropped_size (_raw_frame->size ());
 
 		Rect tx = subtitle_transformed_area (
 			float (_film_size.width) / cropped_size.width,
@@ -337,10 +338,10 @@ FilmViewer::calculate_sizes ()
 		return;
 	}
 
-	Format const * format = _film->format ();
+	Container const * container = _film->container ();
 	
 	float const panel_ratio = static_cast<float> (_panel_size.width) / _panel_size.height;
-	float const film_ratio = format ? format->container_ratio () : 1.78;
+	float const film_ratio = container ? container->ratio () : 1.78;
 			
 	if (panel_ratio < film_ratio) {
 		/* panel is less widscreen than the film; clamp width */
@@ -356,9 +357,9 @@ FilmViewer::calculate_sizes ()
 	   of our _display_frame.
 	*/
 	_display_frame_x = 0;
-	if (format) {
-		_display_frame_x = static_cast<float> (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width;
-	}
+//	if (format) {
+//		_display_frame_x = static_cast<float> (format->dcp_padding (_film)) * _out_size.width / format->dcp_size().width;
+//	}
 
 	_film_size = _out_size;
 	_film_size.width -= _display_frame_x * 2;
@@ -472,7 +473,9 @@ FilmViewer::film_content_changed (weak_ptr<Content>, int p)
 		/* Force an update to our frame */
 		wxScrollEvent ev;
 		slider_moved (ev);
-	}
+	} else if (p == VideoContentProperty::VIDEO_CROP) {
+		update_from_decoder ();
+	}		
 }
 
 void
diff --git a/test/test.cc b/test/test.cc
index eaf210370..68d8611c1 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -40,6 +40,7 @@
 #include "ffmpeg_decoder.h"
 #include "sndfile_decoder.h"
 #include "dcp_content_type.h"
+#include "container.h"
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
@@ -137,18 +138,14 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	
 	shared_ptr<Film> f (new Film (test_film, false));
 	f->_dci_date = boost::gregorian::from_undelimited_string ("20130211");
-	BOOST_CHECK (f->format() == 0);
+	BOOST_CHECK (f->container() == 0);
 	BOOST_CHECK (f->dcp_content_type() == 0);
 	BOOST_CHECK (f->filters ().empty());
 
 	f->set_name ("fred");
 //	BOOST_CHECK_THROW (f->set_content ("jim"), OpenFileError);
 	f->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
-	f->set_format (Format::from_nickname ("Flat"));
-	f->set_left_crop (1);
-	f->set_right_crop (2);
-	f->set_top_crop (3);
-	f->set_bottom_crop (4);
+	f->set_container (Container::from_id ("185"));
 	vector<Filter const *> f_filters;
 	f_filters.push_back (Filter::from_id ("pphb"));
 	f_filters.push_back (Filter::from_id ("unsharp"));
@@ -164,11 +161,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 
 	BOOST_CHECK_EQUAL (g->name(), "fred");
 	BOOST_CHECK_EQUAL (g->dcp_content_type(), DCPContentType::from_pretty_name ("Short"));
-	BOOST_CHECK_EQUAL (g->format(), Format::from_nickname ("Flat"));
-	BOOST_CHECK_EQUAL (g->crop().left, 1);
-	BOOST_CHECK_EQUAL (g->crop().right, 2);
-	BOOST_CHECK_EQUAL (g->crop().top, 3);
-	BOOST_CHECK_EQUAL (g->crop().bottom, 4);
+	BOOST_CHECK_EQUAL (g->container(), Container::from_id ("185"));
 	vector<Filter const *> g_filters = g->filters ();
 	BOOST_CHECK_EQUAL (g_filters.size(), 2);
 	BOOST_CHECK_EQUAL (g_filters.front(), Filter::from_id ("pphb"));
@@ -317,7 +310,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_test)
 	shared_ptr<Film> film = new_test_film ("make_dcp_test");
 	film->set_name ("test_film2");
 //	film->set_content ("../../../test/test.mp4");
-	film->set_format (Format::from_nickname ("Flat"));
+	film->set_container (Container::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
 	film->make_dcp ();
 	film->write_metadata ();
@@ -348,7 +341,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
 	film->set_name ("test_film3");
 //	film->set_content ("../../../test/test.mp4");
 //	film->examine_content ();
-	film->set_format (Format::from_nickname ("Flat"));
+	film->set_container (Container::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
 	film->make_dcp ();
 
-- 
cgit v1.2.3


From 706201707778567317c0d023b04be9836fbf77bf Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 28 May 2013 16:12:44 +0100
Subject: Remove DCP-specialism from Container and add tests for it.

---
 src/lib/container.cc   | 43 +++++++++++++----------------
 src/lib/container.h    | 22 +++++----------
 src/lib/encoder.cc     |  2 +-
 src/lib/film.cc        |  6 +++++
 src/lib/film.h         |  2 ++
 src/lib/writer.cc      |  2 +-
 test/container_test.cc | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++
 test/test.cc           |  1 +
 8 files changed, 110 insertions(+), 41 deletions(-)
 create mode 100644 test/container_test.cc

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/container.cc b/src/lib/container.cc
index 6eaea7300..d679e4848 100644
--- a/src/lib/container.cc
+++ b/src/lib/container.cc
@@ -32,33 +32,22 @@ vector<Container const *> Container::_containers;
 void
 Container::setup_containers ()
 {
-	_containers.push_back (new Container (libdcp::Size (1285, 1080), "119", _("1.19"), "F"));
-	_containers.push_back (new Container (libdcp::Size (1436, 1080), "133", _("4:3"), "F"));
-	_containers.push_back (new Container (libdcp::Size (1480, 1080), "137", _("Academy"), "F"));
-	_containers.push_back (new Container (libdcp::Size (1485, 1080), "138", _("1.375"), "F"));
-	_containers.push_back (new Container (libdcp::Size (1793, 1080), "166", _("1.66"), "F"));
-	_containers.push_back (new Container (libdcp::Size (1920, 1080), "178", _("16:9"), "F"));
-	_containers.push_back (new Container (libdcp::Size (1998, 1080), "185", _("Flat"), "F"));
-	_containers.push_back (new Container (libdcp::Size (2048, 858), "239", _("Scope"), "S"));
-	_containers.push_back (new Container (libdcp::Size (2048, 1080), "full-frame", _("Full frame"), "C"));
+	_containers.push_back (new Container (float(1285) / 1080, "119", _("1.19"), "F"));
+	_containers.push_back (new Container (float(1436) / 1080, "133", _("4:3"), "F"));
+	_containers.push_back (new Container (float(1480) / 1080, "137", _("Academy"), "F"));
+	_containers.push_back (new Container (float(1485) / 1080, "138", _("1.375"), "F"));
+	_containers.push_back (new Container (float(1793) / 1080, "166", _("1.66"), "F"));
+	_containers.push_back (new Container (float(1920) / 1080, "178", _("16:9"), "F"));
+	_containers.push_back (new Container (float(1998) / 1080, "185", _("Flat"), "F"));
+	_containers.push_back (new Container (float(2048) /  858, "239", _("Scope"), "S"));
+	_containers.push_back (new Container (float(2048) / 1080, "full-frame", _("Full frame"), "C"));
 }
 
 /** @return A name to be presented to the user */
 string
 Container::name () const
 {
-	stringstream s;
-	if (!_nickname.empty ()) {
-		s << _nickname << " (";
-	}
-
-	s << _dcp_size.width << "x" << _dcp_size.height;
-
-	if (!_nickname.empty ()) {
-		s << ")";
-	}
-
-	return s.str ();
+	return _nickname;
 }
 
 Container const *
@@ -76,8 +65,14 @@ Container::from_id (string i)
 	return *j;
 }
 
-float
-Container::ratio () const
+libdcp::Size
+Container::size (libdcp::Size full_frame) const
 {
-	return static_cast<float> (_dcp_size.width) / _dcp_size.height;
+	if (_ratio < static_cast<float>(full_frame.width) / full_frame.height) {
+		return libdcp::Size (full_frame.height * _ratio, full_frame.height);
+	} else {
+		return libdcp::Size (full_frame.width, full_frame.width / _ratio);
+	}
+
+	return libdcp::Size ();
 }
diff --git a/src/lib/container.h b/src/lib/container.h
index fc3c72792..4bf03a3f1 100644
--- a/src/lib/container.h
+++ b/src/lib/container.h
@@ -23,26 +23,19 @@
 class Container
 {
 public:
-	Container (libdcp::Size dcp, std::string id, std::string n, std::string d)
-		: _dcp_size (dcp)
+	Container (float ratio, std::string id, std::string n, std::string d)
+		: _ratio (ratio)
 		, _id (id)
 		, _nickname (n)
 		, _dci_name (d)
 	{}
 
-	/** @return size in pixels of the images that we should
-	 *  put in a DCP for this ratio.  This size will not correspond
-	 *  to the ratio when we are doing things like 16:9 in a Flat frame.
-	 */
-	libdcp::Size dcp_size () const {
-		return _dcp_size;
-	}
+	libdcp::Size size (libdcp::Size) const;
 
 	std::string id () const {
 		return _id;
 	}
 
-	/** @return Full name to present to the user */
 	std::string name () const;
 
 	/** @return Nickname (e.g. Flat, Scope) */
@@ -54,7 +47,9 @@ public:
 		return _dci_name;
 	}
 
-	float ratio () const;
+	float ratio () const {
+		return _ratio;
+	}
 	
 	static void setup_containers ();
 	static Container const * from_id (std::string i);
@@ -63,10 +58,7 @@ public:
 	}
 
 private:
-	/** libdcp::Size in pixels of the images that we should
-	 *  put in a DCP for this container.
-	 */
-	libdcp::Size _dcp_size;
+	float _ratio;
 	/** id for use in metadata */
 	std::string _id;
 	/** nickname (e.g. Flat, Scope) */
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 270bf3d43..3152669ad 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -211,7 +211,7 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Sub
 		/* XXX: padding */
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, sub, _film->container()->dcp_size(), 0,
+						  image, sub, _film->container()->size (_film->full_frame()), 0,
 						  _film->subtitle_offset(), _film->subtitle_scale(),
 						  _film->scaler(), _video_frames_out, _film->dcp_video_frame_rate(),
 						  _film->colour_lut(), _film->j2k_bandwidth(),
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 8eeb4fec5..e76d97b59 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -911,3 +911,9 @@ Film::set_sequence_video (bool s)
 {
 	_playlist->set_sequence_video (s);
 }
+
+libdcp::Size
+Film::full_frame () const
+{
+	return libdcp::Size (2048, 1080);
+}
diff --git a/src/lib/film.h b/src/lib/film.h
index cb970da4d..31454c5a7 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -96,6 +96,8 @@ public:
 		return _dirty;
 	}
 
+	libdcp::Size full_frame () const;
+
 	bool have_dcp () const;
 
 	boost::shared_ptr<Player> player () const;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 39b9b9304..22aacb640 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -76,7 +76,7 @@ Writer::Writer (shared_ptr<Film> f, shared_ptr<Job> j)
 			_film->internal_video_mxf_dir (),
 			_film->internal_video_mxf_filename (),
 			_film->dcp_video_frame_rate (),
-			_film->container()->dcp_size ()
+			_film->container()->size (_film->full_frame ())
 			)
 		);
 
diff --git a/test/container_test.cc b/test/container_test.cc
new file mode 100644
index 000000000..825a8cdc4
--- /dev/null
+++ b/test/container_test.cc
@@ -0,0 +1,73 @@
+/*
+    Copyright (C) 2012 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+using std::ostream;
+
+namespace libdcp {
+	
+ostream&
+operator<< (ostream& s, libdcp::Size const & t)
+{
+	s << t.width << "x" << t.height;
+	return s;
+}
+
+}
+
+BOOST_AUTO_TEST_CASE (container_test)
+{
+	Container::setup_containers ();
+
+	Container const * c = Container::from_id ("119");
+	BOOST_CHECK (c);
+	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1285, 1080));
+
+	c = Container::from_id ("133");
+	BOOST_CHECK (c);
+	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1436, 1080));
+
+	c = Container::from_id ("137");
+	BOOST_CHECK (c);
+	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1480, 1080));
+
+	c = Container::from_id ("138");
+	BOOST_CHECK (c);
+	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1485, 1080));
+
+	c = Container::from_id ("166");
+	BOOST_CHECK (c);
+	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1793, 1080));
+
+	c = Container::from_id ("178");
+	BOOST_CHECK (c);
+	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1920, 1080));
+
+	c = Container::from_id ("185");
+	BOOST_CHECK (c);
+	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1998, 1080));
+
+	c = Container::from_id ("239");
+	BOOST_CHECK (c);
+	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (2048, 858));
+
+	c = Container::from_id ("full-frame");
+	BOOST_CHECK (c);
+	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (2048, 1080));
+}
+
diff --git a/test/test.cc b/test/test.cc
index 7e2715a02..f7e2b2e82 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -93,6 +93,7 @@ new_test_film (string name)
 	return f;
 }
 
+#include "container_test.cc"
 #include "pixel_formats_test.cc"
 #include "make_black_test.cc"
 #include "film_metadata_test.cc"
-- 
cgit v1.2.3


From f385ef03e5ea27519a31c0839447735a7fba0602 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 31 May 2013 14:19:50 +0100
Subject: Various stuff; mostly change to decoder scaling and adding subtitle;
 scaling test.

---
 src/lib/ab_transcode_job.cc |   3 --
 src/lib/ab_transcoder.cc    |   4 +-
 src/lib/combiner.cc         |   6 +--
 src/lib/combiner.h          |   4 +-
 src/lib/config.cc           |   6 +--
 src/lib/config.h            |  10 ++--
 src/lib/container.cc        |  78 ---------------------------
 src/lib/container.h         |  70 ------------------------
 src/lib/dcp_video_frame.cc  | 105 +++++++++++-------------------------
 src/lib/dcp_video_frame.h   |  18 ++-----
 src/lib/encoder.cc          |  18 ++-----
 src/lib/encoder.h           |   6 +--
 src/lib/ffmpeg_decoder.cc   |   3 --
 src/lib/ffmpeg_decoder.h    |   4 +-
 src/lib/film.cc             |   6 +--
 src/lib/film.h              |   7 ++-
 src/lib/format.cc           | 126 --------------------------------------------
 src/lib/format.h            |  80 ----------------------------
 src/lib/image.cc            |  46 +++++++---------
 src/lib/image.h             |   3 +-
 src/lib/player.cc           |  23 ++++++--
 src/lib/player.h            |   3 +-
 src/lib/ratio.cc            |  71 +++++++++++++++++++++++++
 src/lib/ratio.h             |  66 +++++++++++++++++++++++
 src/lib/server.cc           |  35 +++---------
 src/lib/transcode_job.cc    |   2 -
 src/lib/util.cc             |   6 +--
 src/lib/video_content.cc    |  31 ++++++++++-
 src/lib/video_content.h     |  10 ++++
 src/lib/video_decoder.cc    |  38 ++++++++++---
 src/lib/video_sink.h        |   3 +-
 src/lib/video_source.cc     |   6 +--
 src/lib/video_source.h      |   5 +-
 src/lib/writer.cc           |   3 +-
 src/lib/wscript             |   3 +-
 src/tools/dcpomatic.cc      |   4 --
 src/tools/dcpomatic_cli.cc  |   1 -
 src/wx/config_dialog.cc     |  12 ++---
 src/wx/film_editor.cc       |  46 ++++++++--------
 src/wx/film_editor.h        |  10 ++--
 src/wx/film_viewer.cc       |  41 ++------------
 src/wx/film_viewer.h        |  12 ++---
 test/client_server_test.cc  |   6 ---
 test/container_test.cc      |  73 -------------------------
 test/dcp_test.cc            |   2 +-
 test/film_metadata_test.cc  |   4 +-
 test/format_test.cc         |  33 ------------
 test/make_black_test.cc     |   2 +-
 test/ratio_test.cc          |  73 +++++++++++++++++++++++++
 test/scaling_test.cc        |  43 ++++++++++++++-
 test/test.cc                |  64 ++++++++++++++++++++--
 51 files changed, 549 insertions(+), 785 deletions(-)
 delete mode 100644 src/lib/container.cc
 delete mode 100644 src/lib/container.h
 delete mode 100644 src/lib/format.cc
 delete mode 100644 src/lib/format.h
 create mode 100644 src/lib/ratio.cc
 create mode 100644 src/lib/ratio.h
 delete mode 100644 test/container_test.cc
 delete mode 100644 test/format_test.cc
 create mode 100644 test/ratio_test.cc

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/ab_transcode_job.cc b/src/lib/ab_transcode_job.cc
index 9a883fdd9..2d6f99c91 100644
--- a/src/lib/ab_transcode_job.cc
+++ b/src/lib/ab_transcode_job.cc
@@ -20,11 +20,8 @@
 #include <stdexcept>
 #include "ab_transcode_job.h"
 #include "film.h"
-#include "format.h"
-#include "filter.h"
 #include "ab_transcoder.h"
 #include "config.h"
-#include "encoder.h"
 
 #include "i18n.h"
 
diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 1ec298626..a5659b22f 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -50,8 +50,8 @@ ABTranscoder::ABTranscoder (shared_ptr<Film> film_a, shared_ptr<Film> film_b, sh
 	, _encoder (new Encoder (film_a, j))
 	, _combiner (new Combiner)
 {
-	_player_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3, _4));
-	_player_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3, _4));
+	_player_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
+	_player_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3));
 
 	_combiner->connect_video (_encoder);
 	_player_a->connect_audio (_encoder);
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index db490fd34..ca68ef68a 100644
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -32,7 +32,7 @@ Combiner::Combiner ()
  *  @param image Frame image.
  */
 void
-Combiner::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle>, Time)
+Combiner::process_video (shared_ptr<const Image> image, bool, Time)
 {
 	_image.reset (new SimpleImage (image));
 }
@@ -42,7 +42,7 @@ Combiner::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitl
  *  @param sub Subtitle (which will be put onto the whole frame)
  */
 void
-Combiner::process_video_b (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub, Time t)
+Combiner::process_video_b (shared_ptr<const Image> image, bool, Time t)
 {
 	/* Copy the right half of this image into our _image */
 	/* XXX: this should probably be in the Image class */
@@ -60,6 +60,6 @@ Combiner::process_video_b (shared_ptr<const Image> image, bool, shared_ptr<Subti
 		}
 	}
 
-	Video (_image, false, sub, t);
+	Video (_image, false, t);
 	_image.reset ();
 }
diff --git a/src/lib/combiner.h b/src/lib/combiner.h
index 1b7537d42..46c90b4d8 100644
--- a/src/lib/combiner.h
+++ b/src/lib/combiner.h
@@ -34,8 +34,8 @@ class Combiner : public VideoSource, public VideoSink
 public:
 	Combiner ();
 
-	void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, Time);
-	void process_video_b (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, Time);
+	void process_video (boost::shared_ptr<const Image> i, bool, Time);
+	void process_video_b (boost::shared_ptr<const Image> i, bool, Time);
 
 private:
 	/** The image that we are currently working on */
diff --git a/src/lib/config.cc b/src/lib/config.cc
index c5245bfb4..978428b02 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -27,7 +27,7 @@
 #include "server.h"
 #include "scaler.h"
 #include "filter.h"
-#include "container.h"
+#include "ratio.h"
 #include "dcp_content_type.h"
 #include "sound_processor.h"
 
@@ -106,7 +106,7 @@ Config::read ()
 
 	c = f.optional_string_child ("DefaultContainer");
 	if (c) {
-		_default_container = Container::from_id (c.get ());
+		_default_container = Ratio::from_id (c.get ());
 	}
 
 	c = f.optional_string_child ("DefaultDCPContentType");
@@ -168,7 +168,7 @@ Config::read_old_metadata ()
 		} else if (k == "language") {
 			_language = v;
 		} else if (k == "default_container") {
-			_default_container = Container::from_id (v);
+			_default_container = Ratio::from_id (v);
 		} else if (k == "default_dcp_content_type") {
 			_default_dcp_content_type = DCPContentType::from_dci_name (v);
 		} else if (k == "dcp_metadata_issuer") {
diff --git a/src/lib/config.h b/src/lib/config.h
index c43a4f079..110bcc6a8 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -34,8 +34,8 @@ class ServerDescription;
 class Scaler;
 class Filter;
 class SoundProcessor;
-class Container;
 class DCPContentType;
+class Ratio;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -114,7 +114,7 @@ public:
 		return _default_still_length;
 	}
 
-	Container const * default_container () const {
+	Ratio const * default_container () const {
 		return _default_container;
 	}
 
@@ -193,8 +193,8 @@ public:
 		_default_still_length = s;
 	}
 
-	void set_default_container (Container const * f) {
-		_default_container = f;
+	void set_default_container (Ratio const * c) {
+		_default_container = c;
 	}
 
 	void set_default_dcp_content_type (DCPContentType const * t) {
@@ -244,7 +244,7 @@ private:
 	DCIMetadata _default_dci_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
-	Container const * _default_container;
+	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	libdcp::XMLMetadata _dcp_metadata;
 
diff --git a/src/lib/container.cc b/src/lib/container.cc
deleted file mode 100644
index d679e4848..000000000
--- a/src/lib/container.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <sstream>
-#include <libdcp/types.h>
-#include "container.h"
-
-#include "i18n.h"
-
-using std::string;
-using std::stringstream;
-using std::vector;
-
-vector<Container const *> Container::_containers;
-
-void
-Container::setup_containers ()
-{
-	_containers.push_back (new Container (float(1285) / 1080, "119", _("1.19"), "F"));
-	_containers.push_back (new Container (float(1436) / 1080, "133", _("4:3"), "F"));
-	_containers.push_back (new Container (float(1480) / 1080, "137", _("Academy"), "F"));
-	_containers.push_back (new Container (float(1485) / 1080, "138", _("1.375"), "F"));
-	_containers.push_back (new Container (float(1793) / 1080, "166", _("1.66"), "F"));
-	_containers.push_back (new Container (float(1920) / 1080, "178", _("16:9"), "F"));
-	_containers.push_back (new Container (float(1998) / 1080, "185", _("Flat"), "F"));
-	_containers.push_back (new Container (float(2048) /  858, "239", _("Scope"), "S"));
-	_containers.push_back (new Container (float(2048) / 1080, "full-frame", _("Full frame"), "C"));
-}
-
-/** @return A name to be presented to the user */
-string
-Container::name () const
-{
-	return _nickname;
-}
-
-Container const *
-Container::from_id (string i)
-{
-	vector<Container const *>::iterator j = _containers.begin ();
-	while (j != _containers.end() && (*j)->id() != i) {
-		++j;
-	}
-
-	if (j == _containers.end ()) {
-		return 0;
-	}
-
-	return *j;
-}
-
-libdcp::Size
-Container::size (libdcp::Size full_frame) const
-{
-	if (_ratio < static_cast<float>(full_frame.width) / full_frame.height) {
-		return libdcp::Size (full_frame.height * _ratio, full_frame.height);
-	} else {
-		return libdcp::Size (full_frame.width, full_frame.width / _ratio);
-	}
-
-	return libdcp::Size ();
-}
diff --git a/src/lib/container.h b/src/lib/container.h
deleted file mode 100644
index 4bf03a3f1..000000000
--- a/src/lib/container.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <vector>
-#include <libdcp/util.h>
-
-class Container
-{
-public:
-	Container (float ratio, std::string id, std::string n, std::string d)
-		: _ratio (ratio)
-		, _id (id)
-		, _nickname (n)
-		, _dci_name (d)
-	{}
-
-	libdcp::Size size (libdcp::Size) const;
-
-	std::string id () const {
-		return _id;
-	}
-
-	std::string name () const;
-
-	/** @return Nickname (e.g. Flat, Scope) */
-	std::string nickname () const {
-		return _nickname;
-	}
-
-	std::string dci_name () const {
-		return _dci_name;
-	}
-
-	float ratio () const {
-		return _ratio;
-	}
-	
-	static void setup_containers ();
-	static Container const * from_id (std::string i);
-	static std::vector<Container const *> all () {
-		return _containers;
-	}
-
-private:
-	float _ratio;
-	/** id for use in metadata */
-	std::string _id;
-	/** nickname (e.g. Flat, Scope) */
-	std::string _nickname;
-	std::string _dci_name;
-
-	/** all available containers */
-	static std::vector<Container const *> _containers;
-};
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 1c1838df7..2f597522c 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -53,7 +53,6 @@
 #include "scaler.h"
 #include "image.h"
 #include "log.h"
-#include "subtitle.h"
 
 #include "i18n.h"
 
@@ -66,34 +65,21 @@ using libdcp::Size;
 
 /** Construct a DCP video frame.
  *  @param input Input image.
- *  @param out Required size of output, in pixels (including any padding).
- *  @param s Scaler to use.
- *  @param p Number of pixels of padding either side of the image.
  *  @param f Index of the frame within the DCP.
- *  @param fps Frames per second of the Film's source.
- *  @param pp FFmpeg post-processing string to use.
  *  @param clut Colour look-up table to use (see Config::colour_lut_index ())
  *  @param bw J2K bandwidth to use (see Config::j2k_bandwidth ())
  *  @param l Log to write to.
  */
 DCPVideoFrame::DCPVideoFrame (
-	shared_ptr<const Image> yuv, shared_ptr<Subtitle> sub,
-	Size out, int p, int subtitle_offset, float subtitle_scale,
-	Scaler const * s, int f, int dcp_fps, int clut, int bw, shared_ptr<Log> l
+	shared_ptr<const Image> image, int f, int dcp_fps, int clut, int bw, shared_ptr<Log> l
 	)
-	: _input (yuv)
-	, _subtitle (sub)
-	, _out_size (out)
-	, _padding (p)
-	, _subtitle_offset (subtitle_offset)
-	, _subtitle_scale (subtitle_scale)
-	, _scaler (s)
+	: _image (image)
 	, _frame (f)
 	, _frames_per_second (dcp_fps)
 	, _colour_lut (clut)
 	, _j2k_bandwidth (bw)
 	, _log (l)
-	, _image (0)
+	, _opj_image (0)
 	, _parameters (0)
 	, _cinfo (0)
 	, _cio (0)
@@ -108,8 +94,8 @@ DCPVideoFrame::create_openjpeg_container ()
 	for (int i = 0; i < 3; ++i) {
 		_cmptparm[i].dx = 1;
 		_cmptparm[i].dy = 1;
-		_cmptparm[i].w = _out_size.width;
-		_cmptparm[i].h = _out_size.height;
+		_cmptparm[i].w = _image->size().width;
+		_cmptparm[i].h = _image->size().height;
 		_cmptparm[i].x0 = 0;
 		_cmptparm[i].y0 = 0;
 		_cmptparm[i].prec = 12;
@@ -117,21 +103,21 @@ DCPVideoFrame::create_openjpeg_container ()
 		_cmptparm[i].sgnd = 0;
 	}
 
-	_image = opj_image_create (3, &_cmptparm[0], CLRSPC_SRGB);
-	if (_image == 0) {
+	_opj_image = opj_image_create (3, &_cmptparm[0], CLRSPC_SRGB);
+	if (_opj_image == 0) {
 		throw EncodeError (N_("could not create libopenjpeg image"));
 	}
 
-	_image->x0 = 0;
-	_image->y0 = 0;
-	_image->x1 = _out_size.width;
-	_image->y1 = _out_size.height;
+	_opj_image->x0 = 0;
+	_opj_image->y0 = 0;
+	_opj_image->x1 = _image->size().width;
+	_opj_image->y1 = _image->size().height;
 }
 
 DCPVideoFrame::~DCPVideoFrame ()
 {
-	if (_image) {
-		opj_image_destroy (_image);
+	if (_opj_image) {
+		opj_image_destroy (_opj_image);
 	}
 
 	if (_cio) {
@@ -155,19 +141,6 @@ DCPVideoFrame::~DCPVideoFrame ()
 shared_ptr<EncodedData>
 DCPVideoFrame::encode_locally ()
 {
-	shared_ptr<Image> prepared = _input->scale_and_convert_to_rgb (_out_size, _padding, _scaler, true);
-
-	if (_subtitle) {
-		Rect tx = subtitle_transformed_area (
-			float (_out_size.width) / _input->size().width,
-			float (_out_size.height) / _input->size().height,
-			_subtitle->area(), _subtitle_offset, _subtitle_scale
-			);
-
-		shared_ptr<Image> im = _subtitle->image()->scale (tx.size(), _scaler, true);
-		prepared->alpha_blend (im, tx.position());
-	}
-
 	create_openjpeg_container ();
 
 	struct {
@@ -181,9 +154,9 @@ DCPVideoFrame::encode_locally ()
 	/* Copy our RGB into the openjpeg container, converting to XYZ in the process */
 
 	int jn = 0;
-	for (int y = 0; y < _out_size.height; ++y) {
-		uint8_t* p = prepared->data()[0] + y * prepared->stride()[0];
-		for (int x = 0; x < _out_size.width; ++x) {
+	for (int y = 0; y < _image->size().height; ++y) {
+		uint8_t* p = _image->data()[0] + y * _image->stride()[0];
+		for (int x = 0; x < _image->size().width; ++x) {
 
 			/* In gamma LUT (converting 8-bit input to 12-bit) */
 			s.r = lut_in[_colour_lut][*p++ << 4];
@@ -209,9 +182,9 @@ DCPVideoFrame::encode_locally ()
 			d.z = d.z * DCI_COEFFICENT * (DCI_LUT_SIZE - 1);
 			
 			/* Out gamma LUT */
-			_image->comps[0].data[jn] = lut_out[LO_DCI][(int) d.x];
-			_image->comps[1].data[jn] = lut_out[LO_DCI][(int) d.y];
-			_image->comps[2].data[jn] = lut_out[LO_DCI][(int) d.z];
+			_opj_image->comps[0].data[jn] = lut_out[LO_DCI][(int) d.x];
+			_opj_image->comps[1].data[jn] = lut_out[LO_DCI][(int) d.y];
+			_opj_image->comps[2].data[jn] = lut_out[LO_DCI][(int) d.z];
 
 			++jn;
 		}
@@ -269,7 +242,7 @@ DCPVideoFrame::encode_locally ()
 	
 	/* set max image */
 	_parameters->max_comp_size = max_comp_size;
-	_parameters->tcp_rates[0] = ((float) (3 * _image->comps[0].w * _image->comps[0].h * _image->comps[0].prec)) / (max_cs_len * 8);
+	_parameters->tcp_rates[0] = ((float) (3 * _opj_image->comps[0].w * _opj_image->comps[0].h * _opj_image->comps[0].prec)) / (max_cs_len * 8);
 
 	/* get a J2K compressor handle */
 	_cinfo = opj_create_compress (CODEC_J2K);
@@ -281,14 +254,14 @@ DCPVideoFrame::encode_locally ()
 	_cinfo->event_mgr = 0;
 
 	/* Setup the encoder parameters using the current image and user parameters */
-	opj_setup_encoder (_cinfo, _parameters, _image);
+	opj_setup_encoder (_cinfo, _parameters, _opj_image);
 
 	_cio = opj_cio_open ((opj_common_ptr) _cinfo, 0, 0);
 	if (_cio == 0) {
 		throw EncodeError (N_("could not open JPEG2000 stream"));
 	}
 
-	int const r = opj_encode (_cinfo, _cio, _image, 0);
+	int const r = opj_encode (_cinfo, _cio, _opj_image, 0);
 	if (r == 0) {
 		throw EncodeError (N_("JPEG2000 encoding failed"));
 	}
@@ -316,42 +289,24 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
 
 	stringstream s;
 	s << N_("encode please\n")
-	  << N_("input_width ") << _input->size().width << N_("\n")
-	  << N_("input_height ") << _input->size().height << N_("\n")
-	  << N_("input_pixel_format ") << _input->pixel_format() << N_("\n")
-	  << N_("output_width ") << _out_size.width << N_("\n")
-	  << N_("output_height ") << _out_size.height << N_("\n")
-	  << N_("padding ") <<  _padding << N_("\n")
-	  << N_("subtitle_offset ") << _subtitle_offset << N_("\n")
-	  << N_("subtitle_scale ") << _subtitle_scale << N_("\n")
-	  << N_("scaler ") << _scaler->id () << N_("\n")
+	  << N_("width ") << _image->size().width << N_("\n")
+	  << N_("height ") << _image->size().height << N_("\n")
 	  << N_("frame ") << _frame << N_("\n")
-	  << N_("frames_per_second ") << _frames_per_second << N_("\n");
-
-	s << N_("colour_lut ") << _colour_lut << N_("\n")
+	  << N_("frames_per_second ") << _frames_per_second << N_("\n")
+	  << N_("colour_lut ") << _colour_lut << N_("\n")
 	  << N_("j2k_bandwidth ") << _j2k_bandwidth << N_("\n");
 
-	if (_subtitle) {
-		s << N_("subtitle_x ") << _subtitle->position().x << N_("\n")
-		  << N_("subtitle_y ") << _subtitle->position().y << N_("\n")
-		  << N_("subtitle_width ") << _subtitle->image()->size().width << N_("\n")
-		  << N_("subtitle_height ") << _subtitle->image()->size().height << N_("\n");
-	}
-
 	_log->log (String::compose (
 			   N_("Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)"),
-			   _input->pixel_format(), _input->components(),
-			   _input->lines(0), _input->lines(1), _input->lines(2),
-			   _input->line_size()[0], _input->line_size()[1], _input->line_size()[2]
+			   _image->pixel_format(), _image->components(),
+			   _image->lines(0), _image->lines(1), _image->lines(2),
+			   _image->line_size()[0], _image->line_size()[1], _image->line_size()[2]
 			   ));
 
 	socket->write (s.str().length() + 1);
 	socket->write ((uint8_t *) s.str().c_str(), s.str().length() + 1);
 
-	_input->write_to_socket (socket);
-	if (_subtitle) {
-		_subtitle->image()->write_to_socket (socket);
-	}
+	_image->write_to_socket (socket);
 
 	shared_ptr<EncodedData> e (new RemotelyEncodedData (socket->read_uint32 ()));
 	socket->read (e->data(), e->size());
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index ba49c95a4..f234b445a 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -105,12 +105,8 @@ public:
 class DCPVideoFrame
 {
 public:
-	DCPVideoFrame (
-		boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, libdcp::Size,
-		int, int, float, Scaler const *, int, int, int, int, boost::shared_ptr<Log>
-		);
-	
-	virtual ~DCPVideoFrame ();
+	DCPVideoFrame (boost::shared_ptr<const Image>, int, int, int, int, boost::shared_ptr<Log>);
+	~DCPVideoFrame ();
 
 	boost::shared_ptr<EncodedData> encode_locally ();
 	boost::shared_ptr<EncodedData> encode_remotely (ServerDescription const *);
@@ -122,13 +118,7 @@ public:
 private:
 	void create_openjpeg_container ();
 
-	boost::shared_ptr<const Image> _input; ///< the input image
-	boost::shared_ptr<Subtitle> _subtitle; ///< any subtitle that should be on the image
-	libdcp::Size _out_size;                ///< the required size of the output, in pixels
-	int _padding;
-	int _subtitle_offset;
-	float _subtitle_scale;
-	Scaler const * _scaler;          ///< scaler to use
+	boost::shared_ptr<const Image> _image;
 	int _frame;                      ///< frame index within the DCP's intrinsic duration
 	int _frames_per_second;          ///< Frames per second that we will use for the DCP
 	int _colour_lut;                 ///< Colour look-up table to use
@@ -137,7 +127,7 @@ private:
 	boost::shared_ptr<Log> _log; ///< log
 
 	opj_image_cmptparm_t _cmptparm[3]; ///< libopenjpeg's opj_image_cmptparm_t
-	opj_image* _image;                 ///< libopenjpeg's image container 
+	opj_image* _opj_image;             ///< libopenjpeg's image container 
 	opj_cparameters_t* _parameters;    ///< libopenjpeg's parameters
 	opj_cinfo_t* _cinfo;               ///< libopenjpeg's opj_cinfo_t
 	opj_cio_t* _cio;                   ///< libopenjpeg's opj_cio_t
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 3152669ad..f3745ff98 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -22,24 +22,15 @@
  */
 
 #include <iostream>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
-#include <libdcp/picture_asset.h>
 #include "encoder.h"
 #include "util.h"
 #include "film.h"
 #include "log.h"
-#include "exceptions.h"
-#include "filter.h"
 #include "config.h"
 #include "dcp_video_frame.h"
 #include "server.h"
-#include "format.h"
 #include "cross.h"
 #include "writer.h"
-#include "player.h"
-#include "audio_mapping.h"
-#include "container.h"
 
 #include "i18n.h"
 
@@ -178,7 +169,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time)
+Encoder::process_video (shared_ptr<const Image> image, bool same, Time)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
@@ -211,11 +202,8 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Sub
 		/* XXX: padding */
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, sub, _film->container()->size (_film->full_frame()), 0,
-						  _film->subtitle_offset(), _film->subtitle_scale(),
-						  _film->scaler(), _video_frames_out, _film->dcp_video_frame_rate(),
-						  _film->colour_lut(), _film->j2k_bandwidth(),
-						  _film->log()
+						  image, _video_frames_out, _film->dcp_video_frame_rate(),
+						  _film->colour_lut(), _film->j2k_bandwidth(), _film->log()
 						  )
 					  ));
 		
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6815fa6f6..8f724525c 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -40,7 +40,6 @@ extern "C" {
 #include "audio_sink.h"
 
 class Image;
-class Subtitle;
 class AudioBuffers;
 class Film;
 class ServerDescription;
@@ -52,7 +51,7 @@ class Job;
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
  *
- *  Video is supplied to process_video as YUV frames, and audio
+ *  Video is supplied to process_video as RGB frames, and audio
  *  is supplied as uncompressed PCM in blocks of various sizes.
  */
 
@@ -68,9 +67,8 @@ public:
 	/** Call with a frame of video.
 	 *  @param i Video frame image.
 	 *  @param same true if i is the same as the last time we were called.
-	 *  @param s A subtitle that should be on this frame, or 0.
 	 */
-	void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s, Time);
+	void process_video (boost::shared_ptr<const Image> i, bool same, Time);
 
 	/** Call with some audio data */
 	void process_audio (boost::shared_ptr<const AudioBuffers>, Time);
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index a1a6636fb..c148bc530 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -39,9 +39,6 @@ extern "C" {
 }
 #include <sndfile.h>
 #include "film.h"
-#include "format.h"
-#include "transcoder.h"
-#include "job.h"
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index c37479612..7b8e1b50c 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -37,8 +37,6 @@ extern "C" {
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "film.h"
-#include "ffmpeg_content.h"
 
 struct AVFilterGraph;
 struct AVCodecContext;
@@ -52,6 +50,8 @@ class Job;
 class Options;
 class Image;
 class Log;
+class FFmpegContent;
+class Film;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
diff --git a/src/lib/film.cc b/src/lib/film.cc
index e76d97b59..ef29d35fd 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -32,7 +32,6 @@
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include "film.h"
-#include "container.h"
 #include "job.h"
 #include "filter.h"
 #include "util.h"
@@ -54,6 +53,7 @@
 #include "imagemagick_content.h"
 #include "sndfile_content.h"
 #include "dcp_content_type.h"
+#include "ratio.h"
 
 #include "i18n.h"
 
@@ -426,7 +426,7 @@ Film::read_metadata ()
 	{
 		optional<string> c = f.optional_string_child ("Container");
 		if (c) {
-			_container = Container::from_id (c.get ());
+			_container = Ratio::from_id (c.get ());
 		}
 	}
 
@@ -602,7 +602,7 @@ Film::set_dcp_content_type (DCPContentType const * t)
 }
 
 void
-Film::set_container (Container const * c)
+Film::set_container (Ratio const * c)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
diff --git a/src/lib/film.h b/src/lib/film.h
index 31454c5a7..28beeaed1 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -39,7 +39,6 @@
 #include "playlist.h"
 
 class DCPContentType;
-class Container;
 class Job;
 class Filter;
 class Log;
@@ -169,7 +168,7 @@ public:
 		return _dcp_content_type;
 	}
 
-	Container const * container () const {
+	Ratio const * container () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _container;
 	}
@@ -234,7 +233,7 @@ public:
 	void add_content (boost::shared_ptr<Content>);
 	void remove_content (boost::shared_ptr<Content>);
 	void set_dcp_content_type (DCPContentType const *);
-	void set_container (Container const *);
+	void set_container (Ratio const *);
 	void set_scaler (Scaler const *);
 	void set_ab (bool);
 	void set_with_subtitles (bool);
@@ -286,7 +285,7 @@ private:
 	/** The type of content that this Film represents (feature, trailer etc.) */
 	DCPContentType const * _dcp_content_type;
 	/** The container to put this Film in (flat, scope, etc.) */
-	Container const * _container;
+	Ratio const * _container;
 	/** Scaler algorithm to use */
 	Scaler const * _scaler;
 	/** true to create an A/B comparison DCP, where the left half of the image
diff --git a/src/lib/format.cc b/src/lib/format.cc
deleted file mode 100644
index 87bdda3d1..000000000
--- a/src/lib/format.cc
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file src/format.cc
- *  @brief Class to describe a format (aspect ratio) that a Film should
- *  be shown in.
- */
-
-#include <sstream>
-#include <cstdlib>
-#include <cassert>
-#include <iomanip>
-#include <iostream>
-#include "format.h"
-#include "film.h"
-#include "playlist.h"
-
-#include "i18n.h"
-
-using std::string;
-using std::setprecision;
-using std::stringstream;
-using std::vector;
-using boost::shared_ptr;
-using libdcp::Size;
-
-vector<Format const *> Format::_formats;
-
-/** @return A name to be presented to the user */
-string
-Format::name () const
-{
-	stringstream s;
-	if (!_nickname.empty ()) {
-		s << _nickname << N_(" (");
-	}
-
-	s << setprecision(3) << ratio() << N_(":1");
-
-	if (!_nickname.empty ()) {
-		s << N_(")");
-	}
-
-	return s.str ();
-}
-
-/** Fill our _formats vector with all available formats */
-void
-Format::setup_formats ()
-{
-	/// TRANSLATORS: these are film picture aspect ratios; "Academy" means 1.37, "Flat" 1.85 and "Scope" 2.39.
-	_formats.push_back (new Format (libdcp::Size (1285, 1080), "119", _("1.19")));
-	_formats.push_back (new Format (libdcp::Size (1436, 1080), "133", _("4:3")));
-	_formats.push_back (new Format (libdcp::Size (1485, 1080), "138", _("1.375")));
-	_formats.push_back (new Format (libdcp::Size (1480, 1080), "137", _("Academy")));
-	_formats.push_back (new Format (libdcp::Size (1793, 1080), "166", _("1.66")));
-	_formats.push_back (new Format (libdcp::Size (1920, 1080), "178", _("16:9")));
-	_formats.push_back (new Format (libdcp::Size (1998, 1080), "185", _("Flat")));
-	_formats.push_back (new Format (libdcp::Size (2048, 858), "239", _("Scope")));
-	_formats.push_back (new Format (libdcp::Size (2048, 1080), "full-frame", _("Full frame")));
-}
-
-/** @param n Nickname.
- *  @return Matching Format, or 0.
- */
-Format const *
-Format::from_nickname (string n)
-{
-	vector<Format const *>::iterator i = _formats.begin ();
-	while (i != _formats.end() && (*i)->nickname() != n) {
-		++i;
-	}
-
-	if (i == _formats.end ()) {
-		return 0;
-	}
-
-	return *i;
-}
-
-/** @param i Id.
- *  @return Matching Format, or 0.
- */
-Format const *
-Format::from_id (string i)
-{
-	vector<Format const *>::iterator j = _formats.begin ();
-	while (j != _formats.end() && (*j)->id() != i) {
-		++j;
-	}
-
-	if (j == _formats.end ()) {
-		return 0;
-	}
-
-	return *j;
-}
-
-/** @return All available formats */
-vector<Format const *>
-Format::all ()
-{
-	return _formats;
-}
-
-float
-Format::ratio () const
-{
-	return static_cast<float> (_dcp_size.width) / _dcp_size.height;
-}
diff --git a/src/lib/format.h b/src/lib/format.h
deleted file mode 100644
index 06423d2b1..000000000
--- a/src/lib/format.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file src/format.h
- *  @brief Classes to describe a format (aspect ratio) that a Film should
- *  be shown in.
- */
-
-#include <string>
-#include <vector>
-#include <libdcp/util.h>
-
-class Film;
-
-class Format
-{
-public:
-	Format (libdcp::Size dcp, std::string id, std::string n)
-		: _dcp_size (dcp)
-		, _id (id)
-		, _nickname (n)
-	{}
-
-	/** @return size in pixels of the images that we should
-	 *  put in a DCP for this format.
-	 */
-	libdcp::Size dcp_size () const {
-		return _dcp_size;
-	}
-
-	std::string id () const {
-		return _id;
-	}
-
-	/** @return Full name to present to the user */
-	std::string name () const;
-
-	/** @return Nickname (e.g. Flat, Scope) */
-	std::string nickname () const {
-		return _nickname;
-	}
-
-	static Format const * from_nickname (std::string n);
-	static Format const * from_id (std::string i);
-	static std::vector<Format const *> all ();
-	static void setup_formats ();
-
-protected:	
-        /** @return the ratio */
-	float ratio () const;
-
-	/** libdcp::Size in pixels of the images that we should
-	 *  put in a DCP for this format.
-	 */
-	libdcp::Size _dcp_size;
-	/** id for use in metadata */
-	std::string _id;
-	/** nickname (e.g. Flat, Scope) */
-	std::string _nickname;
-
-private:	
-	/** all available formats */
-	static std::vector<Format const *> _formats;
-};
diff --git a/src/lib/image.cc b/src/lib/image.cc
index b166dfac6..a12c61b3e 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -121,7 +121,7 @@ Image::scale (libdcp::Size out_size, Scaler const * scaler, bool result_aligned)
  *  @param scaler Scaler to use.
  */
 shared_ptr<Image>
-Image::scale_and_convert_to_rgb (libdcp::Size out_size, int padding, Scaler const * scaler, bool result_aligned) const
+Image::scale_and_convert_to_rgb (libdcp::Size out_size, Scaler const * scaler, bool result_aligned) const
 {
 	assert (scaler);
 	/* Empirical testing suggests that sws_scale() will crash if
@@ -129,14 +129,11 @@ Image::scale_and_convert_to_rgb (libdcp::Size out_size, int padding, Scaler cons
 	*/
 	assert (aligned ());
 
-	libdcp::Size content_size = out_size;
-	content_size.width -= (padding * 2);
-
-	shared_ptr<Image> rgb (new SimpleImage (PIX_FMT_RGB24, content_size, result_aligned));
+	shared_ptr<Image> rgb (new SimpleImage (PIX_FMT_RGB24, out_size, result_aligned));
 
 	struct SwsContext* scale_context = sws_getContext (
 		size().width, size().height, pixel_format(),
-		content_size.width, content_size.height, PIX_FMT_RGB24,
+		out_size.width, out_size.height, PIX_FMT_RGB24,
 		scaler->ffmpeg_id (), 0, 0, 0
 		);
 
@@ -148,28 +145,6 @@ Image::scale_and_convert_to_rgb (libdcp::Size out_size, int padding, Scaler cons
 		rgb->data(), rgb->stride()
 		);
 
-	/* Put the image in the right place in a black frame if are padding; this is
-	   a bit grubby and expensive, but probably inconsequential in the great
-	   scheme of things.
-	*/
-	if (padding > 0) {
-		shared_ptr<Image> padded_rgb (new SimpleImage (PIX_FMT_RGB24, out_size, result_aligned));
-		padded_rgb->make_black ();
-
-		/* XXX: we are cheating a bit here; we know the frame is RGB so we can
-		   make assumptions about its composition.
-		*/
-		uint8_t* p = padded_rgb->data()[0] + padding * 3;
-		uint8_t* q = rgb->data()[0];
-		for (int j = 0; j < rgb->lines(0); ++j) {
-			memcpy (p, q, rgb->line_size()[0]);
-			p += padded_rgb->stride()[0];
-			q += rgb->stride()[0];
-		}
-
-		rgb = padded_rgb;
-	}
-
 	sws_freeContext (scale_context);
 
 	return rgb;
@@ -376,6 +351,21 @@ Image::alpha_blend (shared_ptr<const Image> other, Position position)
 	}
 }
 
+void
+Image::copy (shared_ptr<const Image> other, Position position)
+{
+	/* Only implemented for RGB24 onto RGB24 so far */
+	assert (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGB24);
+	assert (position.x >= 0 && position.y >= 0);
+
+	int const N = min (position.x + other->size().width, size().width) - position.x;
+	for (int ty = position.y, oy = 0; ty < size().height && oy < other->size().height; ++ty, ++oy) {
+		uint8_t * const tp = data()[0] + ty * stride()[0] + position.x * 3;
+		uint8_t * const op = other->data()[0] + oy * other->stride()[0];
+		memcpy (tp, op, N * 3);
+	}
+}	
+
 void
 Image::read_from_socket (shared_ptr<Socket> socket)
 {
diff --git a/src/lib/image.h b/src/lib/image.h
index 34f87b188..f9bda7460 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -71,10 +71,11 @@ public:
 	int components () const;
 	int lines (int) const;
 
-	boost::shared_ptr<Image> scale_and_convert_to_rgb (libdcp::Size out_size, int padding, Scaler const * scaler, bool aligned) const;
+	boost::shared_ptr<Image> scale_and_convert_to_rgb (libdcp::Size, Scaler const *, bool) const;
 	boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, bool aligned) const;
 	boost::shared_ptr<Image> post_process (std::string, bool aligned) const;
 	void alpha_blend (boost::shared_ptr<const Image> image, Position pos);
+	void copy (boost::shared_ptr<const Image> image, Position pos);
 	boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
 	
 	void make_black ();
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 2926796ef..e64e1e011 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -119,6 +119,7 @@ Player::pass ()
 	}
 
 	if (!earliest) {
+		flush ();
 		return true;
 	}
 
@@ -144,7 +145,7 @@ Player::pass ()
 }
 
 void
-Player::process_video (weak_ptr<Content> weak_content, shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time time)
+Player::process_video (weak_ptr<Content> weak_content, shared_ptr<const Image> image, bool same, Time time)
 {
 	shared_ptr<Content> content = weak_content.lock ();
 	if (!content) {
@@ -153,7 +154,7 @@ Player::process_video (weak_ptr<Content> weak_content, shared_ptr<const Image> i
 	
 	time += content->start ();
 	
-        Video (image, same, sub, time);
+        Video (image, same, time);
 }
 
 void
@@ -192,6 +193,18 @@ Player::process_audio (weak_ptr<Content> weak_content, shared_ptr<const AudioBuf
 	_audio_buffers.set_frames (_audio_buffers.frames() + audio->frames());
 }
 
+void
+Player::flush ()
+{
+	if (_audio_buffers.frames() > 0) {
+		shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), _audio_buffers.frames()));
+		emit->copy_from (&_audio_buffers, _audio_buffers.frames(), 0, 0);
+		Audio (emit, _next_audio);
+		_next_audio += _film->audio_frames_to_time (_audio_buffers.frames ());
+		_audio_buffers.set_frames (0);
+	}
+}
+
 /** @return true on error */
 void
 Player::seek (Time t)
@@ -236,7 +249,7 @@ Player::add_black_piece (Time s, Time len)
 {
 	shared_ptr<NullContent> nc (new NullContent (_film, s, len));
 	shared_ptr<BlackDecoder> bd (new BlackDecoder (_film, nc));
-	bd->Video.connect (bind (&Player::process_video, this, nc, _1, _2, _3, _4));
+	bd->Video.connect (bind (&Player::process_video, this, nc, _1, _2, _3));
 	_pieces.push_back (shared_ptr<Piece> (new Piece (nc, bd)));
 	cout << "\tblack @ " << s << " -- " << (s + len) << "\n";
 }
@@ -274,7 +287,7 @@ Player::setup_pieces ()
 		if (fc) {
 			shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio, _subtitles));
 			
-			fd->Video.connect (bind (&Player::process_video, this, *i, _1, _2, _3, _4));
+			fd->Video.connect (bind (&Player::process_video, this, *i, _1, _2, _3));
 			fd->Audio.connect (bind (&Player::process_audio, this, *i, _1, _2));
 
 			decoder = fd;
@@ -295,7 +308,7 @@ Player::setup_pieces ()
 
 			if (!id) {
 				id.reset (new ImageMagickDecoder (_film, ic));
-				id->Video.connect (bind (&Player::process_video, this, *i, _1, _2, _3, _4));
+				id->Video.connect (bind (&Player::process_video, this, *i, _1, _2, _3));
 			}
 
 			decoder = id;
diff --git a/src/lib/player.h b/src/lib/player.h
index cdedf1676..cce2bdc21 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -62,7 +62,7 @@ public:
 
 private:
 
-	void process_video (boost::weak_ptr<Content>, boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, Time);
+	void process_video (boost::weak_ptr<Content>, boost::shared_ptr<const Image>, bool, Time);
 	void process_audio (boost::weak_ptr<Content>, boost::shared_ptr<const AudioBuffers>, Time);
 	void setup_pieces ();
 	void playlist_changed ();
@@ -70,6 +70,7 @@ private:
 	void do_seek (Time, bool);
 	void add_black_piece (Time, Time);
 	void add_silent_piece (Time, Time);
+	void flush ();
 
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc
new file mode 100644
index 000000000..5988b3418
--- /dev/null
+++ b/src/lib/ratio.cc
@@ -0,0 +1,71 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <libdcp/types.h>
+#include "ratio.h"
+
+#include "i18n.h"
+
+using std::string;
+using std::stringstream;
+using std::vector;
+
+vector<Ratio const *> Ratio::_ratios;
+
+libdcp::Size
+Ratio::size (libdcp::Size full_frame) const
+{
+	if (_ratio < static_cast<float>(full_frame.width) / full_frame.height) {
+		return libdcp::Size (full_frame.height * _ratio, full_frame.height);
+	} else {
+		return libdcp::Size (full_frame.width, full_frame.width / _ratio);
+	}
+
+	return libdcp::Size ();
+}
+
+
+void
+Ratio::setup_ratios ()
+{
+	_ratios.push_back (new Ratio (float(1285) / 1080, "119", _("1.19"), "F"));
+	_ratios.push_back (new Ratio (float(1436) / 1080, "133", _("4:3"), "F"));
+	_ratios.push_back (new Ratio (float(1480) / 1080, "137", _("Academy"), "F"));
+	_ratios.push_back (new Ratio (float(1485) / 1080, "138", _("1.375"), "F"));
+	_ratios.push_back (new Ratio (float(1793) / 1080, "166", _("1.66"), "F"));
+	_ratios.push_back (new Ratio (float(1920) / 1080, "178", _("16:9"), "F"));
+	_ratios.push_back (new Ratio (float(1998) / 1080, "185", _("Flat"), "F"));
+	_ratios.push_back (new Ratio (float(2048) /  858, "239", _("Scope"), "S"));
+	_ratios.push_back (new Ratio (float(2048) / 1080, "full-frame", _("Full frame"), "C"));
+}
+
+Ratio const *
+Ratio::from_id (string i)
+{
+	vector<Ratio const *>::iterator j = _ratios.begin ();
+	while (j != _ratios.end() && (*j)->id() != i) {
+		++j;
+	}
+
+	if (j == _ratios.end ()) {
+		return 0;
+	}
+
+	return *j;
+}
diff --git a/src/lib/ratio.h b/src/lib/ratio.h
new file mode 100644
index 000000000..6916a7491
--- /dev/null
+++ b/src/lib/ratio.h
@@ -0,0 +1,66 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <vector>
+#include <libdcp/util.h>
+
+class Ratio
+{
+public:
+	Ratio (float ratio, std::string id, std::string n, std::string d)
+		: _ratio (ratio)
+		, _id (id)
+		, _nickname (n)
+		, _dci_name (d)
+	{}
+
+	libdcp::Size size (libdcp::Size) const;
+
+	std::string id () const {
+		return _id;
+	}
+
+	std::string nickname () const {
+		return _nickname;
+	}
+
+	std::string dci_name () const {
+		return _dci_name;
+	}
+
+	float ratio () const {
+		return _ratio;
+	}
+
+	static void setup_ratios ();
+	static Ratio const * from_id (std::string i);
+	static std::vector<Ratio const *> all () {
+		return _ratios;
+	}
+
+private:
+	float _ratio;
+	/** id for use in metadata */
+	std::string _id;
+	/** nickname (e.g. Flat, Scope) */
+	std::string _nickname;
+	std::string _dci_name;
+
+	static std::vector<Ratio const *> _ratios;	
+};
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 07b826946..5ca04c692 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -98,44 +98,25 @@ Server::process (shared_ptr<Socket> socket)
 	stringstream s (buffer.get());
 	multimap<string, string> kv = read_key_value (s);
 
-	if (get_required_string (kv, N_("encode")) != N_("please")) {
+	if (get_required_string (kv, "encode") != "please") {
 		return -1;
 	}
 
-	libdcp::Size in_size (get_required_int (kv, N_("input_width")), get_required_int (kv, N_("input_height")));
-	int pixel_format_int = get_required_int (kv, N_("input_pixel_format"));
-	libdcp::Size out_size (get_required_int (kv, N_("output_width")), get_required_int (kv, N_("output_height")));
-	int padding = get_required_int (kv, N_("padding"));
-	int subtitle_offset = get_required_int (kv, N_("subtitle_offset"));
-	float subtitle_scale = get_required_float (kv, N_("subtitle_scale"));
-	string scaler_id = get_required_string (kv, N_("scaler"));
-	int frame = get_required_int (kv, N_("frame"));
-	int frames_per_second = get_required_int (kv, N_("frames_per_second"));
-	int colour_lut_index = get_required_int (kv, N_("colour_lut"));
-	int j2k_bandwidth = get_required_int (kv, N_("j2k_bandwidth"));
-	Position subtitle_position (get_optional_int (kv, N_("subtitle_x")), get_optional_int (kv, N_("subtitle_y")));
-	libdcp::Size subtitle_size (get_optional_int (kv, N_("subtitle_width")), get_optional_int (kv, N_("subtitle_height")));
+	libdcp::Size size (get_required_int (kv, "width"), get_required_int (kv, "height"));
+	int frame = get_required_int (kv, "frame");
+	int frames_per_second = get_required_int (kv, "frames_per_second");
+	int colour_lut_index = get_required_int (kv, "colour_lut");
+	int j2k_bandwidth = get_required_int (kv, "j2k_bandwidth");
 
 	/* This checks that colour_lut_index is within range */
 	colour_lut_index_to_name (colour_lut_index);
 
-	PixelFormat pixel_format = (PixelFormat) pixel_format_int;
-	Scaler const * scaler = Scaler::from_id (scaler_id);
-	
-	shared_ptr<Image> image (new SimpleImage (pixel_format, in_size, true));
+	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, true));
 
 	image->read_from_socket (socket);
 
-	shared_ptr<Subtitle> sub;
-	if (subtitle_size.width && subtitle_size.height) {
-		shared_ptr<Image> subtitle_image (new SimpleImage (PIX_FMT_RGBA, subtitle_size, true));
-		subtitle_image->read_from_socket (socket);
-		sub.reset (new Subtitle (subtitle_position, subtitle_image));
-	}
-
 	DCPVideoFrame dcp_video_frame (
-		image, sub, out_size, padding, subtitle_offset, subtitle_scale,
-		scaler, frame, frames_per_second, colour_lut_index, j2k_bandwidth, _log
+		image, frame, frames_per_second, colour_lut_index, j2k_bandwidth, _log
 		);
 	
 	shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index f9a305367..ce02fa57e 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -25,10 +25,8 @@
 #include <iomanip>
 #include "transcode_job.h"
 #include "film.h"
-#include "format.h"
 #include "transcoder.h"
 #include "log.h"
-#include "encoder.h"
 
 #include "i18n.h"
 
diff --git a/src/lib/util.cc b/src/lib/util.cc
index e1bc560c6..71a21105b 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -56,12 +56,11 @@ extern "C" {
 #include "util.h"
 #include "exceptions.h"
 #include "scaler.h"
-#include "format.h"
 #include "dcp_content_type.h"
 #include "filter.h"
 #include "sound_processor.h"
 #include "config.h"
-#include "container.h"
+#include "ratio.h"
 #ifdef DVDOMATIC_WINDOWS
 #include "stack.hpp"
 #endif
@@ -285,8 +284,7 @@ dcpomatic_setup ()
 	
 	avfilter_register_all ();
 	
-	Format::setup_formats ();
-	Container::setup_containers ();
+	Ratio::setup_ratios ();
 	DCPContentType::setup_dcp_content_types ();
 	Scaler::setup_scalers ();
 	Filter::setup_filters ();
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index ae799dad3..18a128a5d 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -20,22 +20,26 @@
 #include <libcxml/cxml.h>
 #include "video_content.h"
 #include "video_decoder.h"
+#include "ratio.h"
 
 #include "i18n.h"
 
-int const VideoContentProperty::VIDEO_SIZE = 0;
+int const VideoContentProperty::VIDEO_SIZE	 = 0;
 int const VideoContentProperty::VIDEO_FRAME_RATE = 1;
-int const VideoContentProperty::VIDEO_CROP = 2;
+int const VideoContentProperty::VIDEO_CROP	 = 2;
+int const VideoContentProperty::VIDEO_RATIO	 = 3;
 
 using std::string;
 using std::stringstream;
 using std::setprecision;
 using boost::shared_ptr;
 using boost::lexical_cast;
+using boost::optional;
 
 VideoContent::VideoContent (shared_ptr<const Film> f, Time s, ContentVideoFrame len)
 	: Content (f, s)
 	, _video_length (len)
+	, _ratio (0)
 {
 
 }
@@ -43,6 +47,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, Time s, ContentVideoFrame
 VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
 	, _video_length (0)
+	, _ratio (0)
 {
 
 }
@@ -58,6 +63,10 @@ VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
 	_crop.right = node->number_child<int> ("RightCrop");
 	_crop.top = node->number_child<int> ("TopCrop");
 	_crop.bottom = node->number_child<int> ("BottomCrop");
+	optional<string> r = node->optional_string_child ("Ratio");
+	if (r) {
+		_ratio = Ratio::from_id (r.get ());
+	}
 }
 
 VideoContent::VideoContent (VideoContent const & o)
@@ -65,6 +74,7 @@ VideoContent::VideoContent (VideoContent const & o)
 	, _video_length (o._video_length)
 	, _video_size (o._video_size)
 	, _video_frame_rate (o._video_frame_rate)
+	, _ratio (o._ratio)
 {
 
 }
@@ -81,6 +91,9 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	node->add_child("RightCrop")->add_child_text (boost::lexical_cast<string> (_crop.right));
 	node->add_child("TopCrop")->add_child_text (boost::lexical_cast<string> (_crop.top));
 	node->add_child("BottomCrop")->add_child_text (boost::lexical_cast<string> (_crop.bottom));
+	if (_ratio) {
+		node->add_child("Ratio")->add_child_text (_ratio->id ());
+	}
 }
 
 void
@@ -191,3 +204,17 @@ VideoContent::set_bottom_crop (int c)
 	signal_changed (VideoContentProperty::VIDEO_CROP);
 }
 
+void
+VideoContent::set_ratio (Ratio const * r)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		if (_ratio == r) {
+			return;
+		}
+
+		_ratio = r;
+	}
+
+	signal_changed (VideoContentProperty::VIDEO_RATIO);
+}
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index ce2550d12..44f1c2847 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -24,6 +24,7 @@
 #include "util.h"
 
 class VideoDecoder;
+class Ratio;
 
 class VideoContentProperty
 {
@@ -31,6 +32,7 @@ public:
 	static int const VIDEO_SIZE;
 	static int const VIDEO_FRAME_RATE;
 	static int const VIDEO_CROP;
+	static int const VIDEO_RATIO;
 };
 
 class VideoContent : public virtual Content
@@ -70,6 +72,13 @@ public:
 		return _crop;
 	}
 
+	void set_ratio (Ratio const *);
+
+	Ratio const * ratio () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _ratio;
+	}
+
 protected:
 	void take_from_video_decoder (boost::shared_ptr<VideoDecoder>);
 
@@ -79,6 +88,7 @@ private:
 	libdcp::Size _video_size;
 	float _video_frame_rate;
 	Crop _crop;
+	Ratio const * _ratio;
 };
 
 #endif
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 609594e76..cba21d280 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -23,6 +21,7 @@
 #include "subtitle.h"
 #include "film.h"
 #include "image.h"
+#include "ratio.h"
 
 #include "i18n.h"
 
@@ -52,18 +51,45 @@ VideoDecoder::video (shared_ptr<Image> image, bool same, Time t)
 		return;
 	}
 
+	image->crop (_video_content->crop(), true);
+
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	
+	libdcp::Size const container_size = film->container()->size (film->full_frame ());
+	libdcp::Size const image_size = _video_content->ratio()->size (container_size);
+	
+	shared_ptr<Image> out = image->scale_and_convert_to_rgb (image_size, film->scaler(), true);
+
 	shared_ptr<Subtitle> sub;
 	if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
 		sub = _timed_subtitle->subtitle ();
 	}
 
-	Video (image, same, sub, t);
+	if (sub) {
+		Rect const tx = subtitle_transformed_area (
+			float (image_size.width) / video_size().width,
+			float (image_size.height) / video_size().height,
+			sub->area(), film->subtitle_offset(), film->subtitle_scale()
+			);
 
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+		shared_ptr<Image> im = sub->image()->scale (tx.size(), film->scaler(), true);
+		out->alpha_blend (im, tx.position());
+	}
+
+	if (image_size != container_size) {
+		assert (image_size.width <= container_size.width);
+		assert (image_size.height <= container_size.height);
+		shared_ptr<Image> im (new SimpleImage (PIX_FMT_RGB24, container_size, true));
+		im->make_black ();
+		im->copy (out, Position ((container_size.width - image_size.width) / 2, (container_size.height - image_size.height) / 2));
+		out = im;
+	}
+		
+	Video (out, same, t);
 
 	if (_frame_rate_conversion.repeat) {
-		Video (image, true, sub, t + film->video_frames_to_time (1));
+		Video (image, true, t + film->video_frames_to_time (1));
 		_next_video = t + film->video_frames_to_time (2);
 	} else {
 		_next_video = t + film->video_frames_to_time (1);
diff --git a/src/lib/video_sink.h b/src/lib/video_sink.h
index 2da42528c..957aeb4b4 100644
--- a/src/lib/video_sink.h
+++ b/src/lib/video_sink.h
@@ -32,9 +32,8 @@ public:
 	/** Call with a frame of video.
 	 *  @param i Video frame image.
 	 *  @param same true if i is the same as last time we were called.
-	 *  @param s A subtitle that should be on this frame, or 0.
 	 */
-	virtual void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s, Time) = 0;
+	virtual void process_video (boost::shared_ptr<const Image> i, bool same, Time) = 0;
 };
 
 #endif
diff --git a/src/lib/video_source.cc b/src/lib/video_source.cc
index 39043c860..824587bcb 100644
--- a/src/lib/video_source.cc
+++ b/src/lib/video_source.cc
@@ -25,11 +25,11 @@ using boost::weak_ptr;
 using boost::bind;
 
 static void
-process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time time)
+process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<const Image> image, bool same, Time time)
 {
 	shared_ptr<VideoSink> p = sink.lock ();
 	if (p) {
-		p->process_video (image, same, sub, time);
+		p->process_video (image, same, time);
 	}
 }
 
@@ -39,6 +39,6 @@ VideoSource::connect_video (shared_ptr<VideoSink> s)
 	/* If we bind, say, a Player (as the VideoSink) to a Decoder (which is owned
 	   by the Player) we create a cycle.  Use a weak_ptr to break it.
 	*/
-	Video.connect (bind (process_video_proxy, weak_ptr<VideoSink> (s), _1, _2, _3, _4));
+	Video.connect (bind (process_video_proxy, weak_ptr<VideoSink> (s), _1, _2, _3));
 }
 
diff --git a/src/lib/video_source.h b/src/lib/video_source.h
index c94b5a20a..9242af444 100644
--- a/src/lib/video_source.h
+++ b/src/lib/video_source.h
@@ -42,10 +42,9 @@ public:
 	/** Emitted when a video frame is ready.
 	 *  First parameter is the video image.
 	 *  Second parameter is true if the image is the same as the last one that was emitted.
-	 *  Third parameter is either 0 or a subtitle that should be on this frame.
-	 *  Fourth parameter is the time relative to the start of this source's content.
+	 *  Third parameter is the time relative to the start of this source's content.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, Time)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, Time)> Video;
 
 	void connect_video (boost::shared_ptr<VideoSink>);
 };
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 22aacb640..e9f7ab582 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -27,7 +27,7 @@
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"
-#include "container.h"
+#include "ratio.h"
 #include "log.h"
 #include "dcp_video_frame.h"
 #include "dcp_content_type.h"
@@ -133,6 +133,7 @@ Writer::fake_write (int frame)
 void
 Writer::write (shared_ptr<const AudioBuffers> audio)
 {
+	cout << "W: audio " << audio->frames() << "\n";
 	_sound_asset_writer->write (audio->data(), audio->frames());
 }
 
diff --git a/src/lib/wscript b/src/lib/wscript
index 54941df42..6e69b98b2 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -14,7 +14,6 @@ sources = """
           black_decoder.cc
           config.cc
           combiner.cc
-          container.cc
           content.cc
           cross.cc
           dci_metadata.cc
@@ -30,7 +29,6 @@ sources = """
           ffmpeg_decoder.cc
           film.cc
           filter.cc
-          format.cc
           image.cc
           imagemagick_content.cc
           imagemagick_decoder.cc
@@ -41,6 +39,7 @@ sources = """
           null_content.cc
           player.cc
           playlist.cc
+          ratio.cc
           scp_dcp_job.cc
           scaler.cc
           server.cc
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 196045a9b..8d3de53ff 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -36,12 +36,8 @@
 #include "wx/properties_dialog.h"
 #include "wx/wx_ui_signaller.h"
 #include "lib/film.h"
-#include "lib/format.h"
 #include "lib/config.h"
-#include "lib/filter.h"
 #include "lib/util.h"
-#include "lib/scaler.h"
-#include "lib/exceptions.h"
 #include "lib/version.h"
 #include "lib/ui_signaller.h"
 #include "lib/log.h"
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index c295a011d..c7b7e3b3d 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -21,7 +21,6 @@
 #include <iomanip>
 #include <getopt.h>
 #include <libdcp/version.h>
-#include "format.h"
 #include "film.h"
 #include "filter.h"
 #include "transcode_job.h"
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index ae5bed723..3efd7857a 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -28,7 +28,7 @@
 #include <wx/notebook.h>
 #include "lib/config.h"
 #include "lib/server.h"
-#include "lib/container.h"
+#include "lib/ratio.h"
 #include "lib/scaler.h"
 #include "lib/filter.h"
 #include "lib/dcp_content_type.h"
@@ -171,10 +171,10 @@ ConfigDialog::make_misc_panel ()
 
 	_default_dci_metadata_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_default_dci_metadata_clicked), 0, this);
 
-	vector<Container const *> fmt = Container::all ();
+	vector<Ratio const *> ratio = Ratio::all ();
 	int n = 0;
-	for (vector<Container const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
-		_default_container->Append (std_to_wx ((*i)->name ()));
+	for (vector<Ratio const *>::iterator i = ratio.begin(); i != ratio.end(); ++i) {
+		_default_container->Append (std_to_wx ((*i)->nickname ()));
 		if (*i == config->default_container ()) {
 			_default_container->SetSelection (n);
 		}
@@ -535,8 +535,8 @@ ConfigDialog::default_still_length_changed (wxCommandEvent &)
 void
 ConfigDialog::default_container_changed (wxCommandEvent &)
 {
-	vector<Container const *> fmt = Container::all ();
-	Config::instance()->set_default_container (fmt[_default_container->GetSelection()]);
+	vector<Ratio const *> ratio = Ratio::all ();
+	Config::instance()->set_default_container (ratio[_default_container->GetSelection()]);
 }
 
 void
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 75867d1d5..bddce18be 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -29,15 +29,14 @@
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
-#include "lib/format.h"
 #include "lib/film.h"
 #include "lib/transcode_job.h"
 #include "lib/exceptions.h"
 #include "lib/ab_transcode_job.h"
 #include "lib/job_manager.h"
 #include "lib/filter.h"
+#include "lib/ratio.h"
 #include "lib/config.h"
-#include "lib/ffmpeg_decoder.h"
 #include "lib/imagemagick_content.h"
 #include "lib/sndfile_content.h"
 #include "lib/dcp_content_type.h"
@@ -52,7 +51,6 @@
 #include "imagemagick_content_dialog.h"
 #include "timeline_dialog.h"
 #include "audio_mapping_view.h"
-#include "container.h"
 #include "timecode.h"
 
 using std::string;
@@ -86,7 +84,7 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 	make_dcp_panel ();
 	_main_notebook->AddPage (_dcp_panel, _("DCP"), false);
 	
-	setup_formats ();
+	setup_ratios ();
 
 	set_film (f);
 	connect_to_widgets ();
@@ -167,9 +165,9 @@ FilmEditor::make_dcp_panel ()
 		_scaler->Append (std_to_wx ((*i)->name()));
 	}
 
-	vector<Container const *> const co = Container::all ();
-	for (vector<Container const *>::const_iterator i = co.begin(); i != co.end(); ++i) {
-		_container->Append (std_to_wx ((*i)->name ()));
+	vector<Ratio const *> const ratio = Ratio::all ();
+	for (vector<Ratio const *>::const_iterator i = ratio.begin(); i != ratio.end(); ++i) {
+		_container->Append (std_to_wx ((*i)->nickname ()));
 	}
 
 	vector<DCPContentType const *> const ct = DCPContentType::all ();
@@ -259,8 +257,8 @@ FilmEditor::make_video_panel ()
 	++r;
 
 	add_label_to_grid_bag_sizer (grid, _video_panel, _("Scale to"), wxGBPosition (r, 0));
-	_format = new wxChoice (_video_panel, wxID_ANY);
-	grid->Add (_format, wxGBPosition (r, 1));
+	_ratio = new wxChoice (_video_panel, wxID_ANY);
+	grid->Add (_ratio, wxGBPosition (r, 1));
 	++r;
 
 	_scaling_description = new wxStaticText (_video_panel, wxID_ANY, wxT ("\n \n \n \n"), wxDefaultPosition, wxDefaultSize);
@@ -598,8 +596,8 @@ FilmEditor::film_changed (Film::Property p)
 		break;
 	case Film::CONTENT:
 		setup_content ();
-		setup_formats ();
-//		setup_format ();
+		setup_ratios ();
+//		setup_ratio ();
 		setup_subtitle_control_sensitivity ();
 		setup_show_audio_sensitivity ();
 		break;
@@ -765,14 +763,14 @@ void
 FilmEditor::setup_container ()
 {
 	int n = 0;
-	vector<Container const *> containers = Container::all ();
-	vector<Container const *>::iterator i = containers.begin ();
-	while (i != containers.end() && *i != _film->container ()) {
+	vector<Ratio const *> ratios = Ratio::all ();
+	vector<Ratio const *>::iterator i = ratios.begin ();
+	while (i != ratios.end() && *i != _film->container ()) {
 		++i;
 		++n;
 	}
 	
-	if (i == containers.end()) {
+	if (i == ratios.end()) {
 		checked_set (_container, -1);
 	} else {
 		checked_set (_container, n);
@@ -792,9 +790,9 @@ FilmEditor::container_changed (wxCommandEvent &)
 
 	int const n = _container->GetSelection ();
 	if (n >= 0) {
-		vector<Container const *> containers = Container::all ();
-		assert (n < int (containers.size()));
-		_film->set_container (containers[n]);
+		vector<Ratio const *> ratios = Ratio::all ();
+		assert (n < int (ratios.size()));
+		_film->set_container (ratios[n]);
 	}
 }
 
@@ -878,7 +876,7 @@ FilmEditor::set_things_sensitive (bool s)
 	_name->Enable (s);
 	_use_dci_name->Enable (s);
 	_edit_dci_button->Enable (s);
-	_format->Enable (s);
+	_ratio->Enable (s);
 	_content->Enable (s);
 	_left_crop->Enable (s);
 	_right_crop->Enable (s);
@@ -999,13 +997,13 @@ FilmEditor::audio_gain_calculate_button_clicked (wxCommandEvent &)
 }
 
 void
-FilmEditor::setup_formats ()
+FilmEditor::setup_ratios ()
 {
-	_formats = Format::all ();
+	_ratios = Ratio::all ();
 
-	_format->Clear ();
-	for (vector<Format const *>::iterator i = _formats.begin(); i != _formats.end(); ++i) {
-		_format->Append (std_to_wx ((*i)->name ()));
+	_ratio->Clear ();
+	for (vector<Ratio const *>::iterator i = _ratios.begin(); i != _ratios.end(); ++i) {
+		_ratio->Append (std_to_wx ((*i)->nickname ()));
 	}
 
 	_dcp_sizer->Layout ();
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index c34cd73e0..be1bf7c36 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -35,7 +35,7 @@ class Film;
 class AudioDialog;
 class TimelineDialog;
 class AudioMappingView;
-class Format;
+class Ratio;
 class Timecode;
 
 /** @class FilmEditor
@@ -102,7 +102,7 @@ private:
 	void film_content_changed (boost::weak_ptr<Content>, int);
 
 	void set_things_sensitive (bool);
-	void setup_formats ();
+	void setup_ratios ();
 	void setup_subtitle_control_sensitivity ();
 	void setup_dcp_name ();
 	void setup_show_audio_sensitivity ();
@@ -144,8 +144,8 @@ private:
 	wxCheckBox* _loop_content;
 	wxSpinCtrl* _loop_count;
 	wxButton* _edit_dci_button;
-	wxChoice* _format;
-	wxStaticText* _format_description;
+	wxChoice* _ratio;
+	wxStaticText* _ratio_description;
 	wxStaticText* _scaling_description;
 	wxSpinCtrl* _left_crop;
 	wxSpinCtrl* _right_crop;
@@ -173,7 +173,7 @@ private:
 	Timecode* _start;
 	Timecode* _length;
 
-	std::vector<Format const *> _formats;
+	std::vector<Ratio const *> _ratios;
 
 	bool _generally_sensitive;
 	AudioDialog* _audio_dialog;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 97185ca94..26f99db11 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -27,11 +27,9 @@
 #include <iomanip>
 #include <wx/tglbtn.h>
 #include "lib/film.h"
-#include "lib/container.h"
-#include "lib/format.h"
+#include "lib/ratio.h"
 #include "lib/util.h"
 #include "lib/job_manager.h"
-#include "lib/subtitle.h"
 #include "lib/image.h"
 #include "lib/scaler.h"
 #include "lib/exceptions.h"
@@ -166,7 +164,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 	   on and off without needing obtain a new Player.
 	*/
 	
-	_player->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3, _4));
+	_player->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
 	
 	_film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
 	_film->ContentChanged.connect (boost::bind (&FilmViewer::film_content_changed, this, _1, _2));
@@ -233,12 +231,6 @@ FilmViewer::paint_panel (wxPaintEvent &)
 	wxBitmap frame_bitmap (frame);
 	dc.DrawBitmap (frame_bitmap, _display_frame_x, 0);
 
-	if (_film->with_subtitles() && _display_sub) {
-		wxImage sub (_display_sub->size().width, _display_sub->size().height, _display_sub->data()[0], _display_sub->alpha(), true);
-		wxBitmap sub_bitmap (sub);
-		dc.DrawBitmap (sub_bitmap, _display_sub_position.x, _display_sub_position.y);
-	}
-
 	if (_out_size.width < _panel_size.width) {
 		wxPen p (GetBackgroundColour ());
 		wxBrush b (GetBackgroundColour ());
@@ -301,29 +293,7 @@ FilmViewer::raw_to_display ()
 	}
 
 	/* Get a compacted image as we have to feed it to wxWidgets */
-	_display_frame = _raw_frame->scale_and_convert_to_rgb (_film_size, 0, _film->scaler(), false);
-
-	if (_raw_sub) {
-
-		/* Our output is already cropped by the decoder, so we need to account for that
-		   when working out the scale that we are applying.
-		*/
-
-		/* XXX */
-		Size const cropped_size = _raw_frame->size ();//_film->cropped_size (_raw_frame->size ());
-
-		Rect tx = subtitle_transformed_area (
-			float (_film_size.width) / cropped_size.width,
-			float (_film_size.height) / cropped_size.height,
-			_raw_sub->area(), _film->subtitle_offset(), _film->subtitle_scale()
-			);
-		
-		_display_sub.reset (new RGBPlusAlphaImage (_raw_sub->image()->scale (tx.size(), _film->scaler(), false)));
-		_display_sub_position = tx.position();
-		_display_sub_position.x += _display_frame_x;
-	} else {
-		_display_sub.reset ();
-	}
+	_display_frame = _raw_frame->scale_and_convert_to_rgb (_film_size, _film->scaler(), false);
 }	
 
 void
@@ -333,7 +303,7 @@ FilmViewer::calculate_sizes ()
 		return;
 	}
 
-	Container const * container = _film->container ();
+	Ratio const * container = _film->container ();
 	
 	float const panel_ratio = static_cast<float> (_panel_size.width) / _panel_size.height;
 	float const film_ratio = container ? container->ratio () : 1.78;
@@ -386,10 +356,9 @@ FilmViewer::check_play_state ()
 }
 
 void
-FilmViewer::process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub, Time t)
+FilmViewer::process_video (shared_ptr<const Image> image, bool, Time t)
 {
 	_raw_frame = image;
-	_raw_sub = sub;
 
 	raw_to_display ();
 
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 68d51bfbd..39755ed35 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -28,7 +28,6 @@ class wxToggleButton;
 class FFmpegPlayer;
 class Image;
 class RGBPlusAlphaImage;
-class Subtitle;
 
 /** @class FilmViewer
  *  @brief A wx widget to view a preview of a Film.
@@ -38,14 +37,12 @@ class Subtitle;
  *  1.  get_frame() asks our _player to decode some data.  If it does, process_video()
  *      will be called.
  *
- *  2.  process_video() takes the image and subtitle from the decoder (_raw_frame and _raw_sub)
- *      and calls raw_to_display().
+ *  2.  process_video() takes the image from the decoder (_raw_frame) and calls raw_to_display().
  * 
  *  3.  raw_to_display() copies _raw_frame to _display_frame, processing it and scaling it.
  *
  *  4.  calling _panel->Refresh() and _panel->Update() results in paint_panel() being called;
- *      this creates frame_bitmap from _display_frame and blits it to the display.  It also
- *      blits the subtitle, if required.
+ *      this creates frame_bitmap from _display_frame and blits it to the display.
  *
  * update_from_decoder() asks the player to re-emit its current frame on the next pass(), and then
  * starts from step #1.
@@ -67,7 +64,7 @@ private:
 	void slider_moved (wxScrollEvent &);
 	void play_clicked (wxCommandEvent &);
 	void timer (wxTimerEvent &);
-	void process_video (boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, Time);
+	void process_video (boost::shared_ptr<const Image>, bool, Time);
 	void calculate_sizes ();
 	void check_play_state ();
 	void update_from_raw ();
@@ -92,14 +89,11 @@ private:
 	wxTimer _timer;
 
 	boost::shared_ptr<const Image> _raw_frame;
-	boost::shared_ptr<Subtitle> _raw_sub;
 	boost::shared_ptr<const Image> _display_frame;
 	/* The x offset at which we display the actual film content; this corresponds
 	   to the film's padding converted to our coordinates.
 	*/
 	int _display_frame_x;
-	boost::shared_ptr<RGBPlusAlphaImage> _display_sub;
-	Position _display_sub_position;
 	bool _got_frame;
 
 	/** Size of our output (including padding if we have any) */
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 9c4482d3c..51b52331a 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -63,12 +63,6 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 	shared_ptr<DCPVideoFrame> frame (
 		new DCPVideoFrame (
 			image,
-			subtitle,
-			libdcp::Size (1998, 1080),
-			0,
-			0,
-			1,
-			Scaler::from_id ("bicubic"),
 			0,
 			24,
 			0,
diff --git a/test/container_test.cc b/test/container_test.cc
deleted file mode 100644
index 825a8cdc4..000000000
--- a/test/container_test.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-using std::ostream;
-
-namespace libdcp {
-	
-ostream&
-operator<< (ostream& s, libdcp::Size const & t)
-{
-	s << t.width << "x" << t.height;
-	return s;
-}
-
-}
-
-BOOST_AUTO_TEST_CASE (container_test)
-{
-	Container::setup_containers ();
-
-	Container const * c = Container::from_id ("119");
-	BOOST_CHECK (c);
-	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1285, 1080));
-
-	c = Container::from_id ("133");
-	BOOST_CHECK (c);
-	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1436, 1080));
-
-	c = Container::from_id ("137");
-	BOOST_CHECK (c);
-	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1480, 1080));
-
-	c = Container::from_id ("138");
-	BOOST_CHECK (c);
-	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1485, 1080));
-
-	c = Container::from_id ("166");
-	BOOST_CHECK (c);
-	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1793, 1080));
-
-	c = Container::from_id ("178");
-	BOOST_CHECK (c);
-	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1920, 1080));
-
-	c = Container::from_id ("185");
-	BOOST_CHECK (c);
-	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (1998, 1080));
-
-	c = Container::from_id ("239");
-	BOOST_CHECK (c);
-	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (2048, 858));
-
-	c = Container::from_id ("full-frame");
-	BOOST_CHECK (c);
-	BOOST_CHECK_EQUAL (c->size(libdcp::Size (2048, 1080)), libdcp::Size (2048, 1080));
-}
-
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 795b4dfe3..cf31d674e 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_test)
 		dcpomatic_sleep (1);
 	}
 	
-	film->set_container (Container::from_id ("185"));
+	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
 	film->make_dcp ();
 	film->write_metadata ();
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 315461b22..397b9e43a 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 
 	f->set_name ("fred");
 	f->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
-	f->set_container (Container::from_id ("185"));
+	f->set_container (Ratio::from_id ("185"));
 	f->set_ab (true);
 	f->write_metadata ();
 
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 
 	BOOST_CHECK_EQUAL (g->name(), "fred");
 	BOOST_CHECK_EQUAL (g->dcp_content_type(), DCPContentType::from_pretty_name ("Short"));
-	BOOST_CHECK_EQUAL (g->container(), Container::from_id ("185"));
+	BOOST_CHECK_EQUAL (g->container(), Ratio::from_id ("185"));
 	BOOST_CHECK_EQUAL (g->ab(), true);
 	
 	g->write_metadata ();
diff --git a/test/format_test.cc b/test/format_test.cc
deleted file mode 100644
index 71bc00359..000000000
--- a/test/format_test.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-BOOST_AUTO_TEST_CASE (format_test)
-{
-	Format::setup_formats ();
-	
-	Format const * f = Format::from_nickname ("Flat");
-	BOOST_CHECK (f);
-	BOOST_CHECK_EQUAL (f->dcp_size().width, 1998);
-	BOOST_CHECK_EQUAL (f->dcp_size().height, 1080);
-	
-	f = Format::from_nickname ("Scope");
-	BOOST_CHECK (f);
-	BOOST_CHECK_EQUAL (f->dcp_size().width, 2048);
-	BOOST_CHECK_EQUAL (f->dcp_size().height, 858);
-}
diff --git a/test/make_black_test.cc b/test/make_black_test.cc
index 3c0b979ff..c70870915 100644
--- a/test/make_black_test.cc
+++ b/test/make_black_test.cc
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 	for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
 		boost::shared_ptr<Image> foo (new SimpleImage (*i, in_size, true));
 		foo->make_black ();
-		boost::shared_ptr<Image> bar = foo->scale_and_convert_to_rgb (out_size, 0, Scaler::from_id ("bicubic"), true);
+		boost::shared_ptr<Image> bar = foo->scale_and_convert_to_rgb (out_size, Scaler::from_id ("bicubic"), true);
 		
 		uint8_t* p = bar->data()[0];
 		for (int y = 0; y < bar->size().height; ++y) {
diff --git a/test/ratio_test.cc b/test/ratio_test.cc
new file mode 100644
index 000000000..6311976a3
--- /dev/null
+++ b/test/ratio_test.cc
@@ -0,0 +1,73 @@
+/*
+    Copyright (C) 2012 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+using std::ostream;
+
+namespace libdcp {
+	
+ostream&
+operator<< (ostream& s, libdcp::Size const & t)
+{
+	s << t.width << "x" << t.height;
+	return s;
+}
+
+}
+
+BOOST_AUTO_TEST_CASE (ratio_test)
+{
+	Ratio::setup_ratios ();
+
+	Ratio const * r = Ratio::from_id ("119");
+	BOOST_CHECK (r);
+	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1285, 1080));
+
+	r = Ratio::from_id ("133");
+	BOOST_CHECK (r);
+	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1436, 1080));
+
+	r = Ratio::from_id ("137");
+	BOOST_CHECK (r);
+	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1480, 1080));
+
+	r = Ratio::from_id ("138");
+	BOOST_CHECK (r);
+	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1485, 1080));
+
+	r = Ratio::from_id ("166");
+	BOOST_CHECK (r);
+	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1793, 1080));
+
+	r = Ratio::from_id ("178");
+	BOOST_CHECK (r);
+	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1920, 1080));
+
+	r = Ratio::from_id ("185");
+	BOOST_CHECK (r);
+	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (1998, 1080));
+
+	r = Ratio::from_id ("239");
+	BOOST_CHECK (r);
+	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (2048, 858));
+
+	r = Ratio::from_id ("full-frame");
+	BOOST_CHECK (r);
+	BOOST_CHECK_EQUAL (r->size(libdcp::Size (2048, 1080)), libdcp::Size (2048, 1080));
+}
+
diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index 60009f10b..dba611043 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -17,15 +17,56 @@
 
 */
 
+#include "imagemagick_content.h"
+
 /** @file test/scaling_test.cc
  *  @brief Test scaling and black-padding of images from a still-image source.
  */
 
 using boost::shared_ptr;
 
+static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> content, string image, string container)
+{
+	content->set_ratio (Ratio::from_id (image));
+	film->set_container (Ratio::from_id (container));
+	film->make_dcp ();
+
+	while (JobManager::instance()->work_to_do ());
+
+	BOOST_CHECK (!JobManager::instance()->errors());
+
+	boost::filesystem::path ref;
+	ref = "test";
+	ref /= "data";
+	ref /= "scaling_test_" + image + "_" + container;
+
+	boost::filesystem::path check;
+	check = "build";
+	check /= "test";
+	check /= "scaling_test";
+	check /= film->dcp_name();
+
+	check_dcp (ref.string(), check.string());
+}
+
 BOOST_AUTO_TEST_CASE (scaling_test)
 {
 	shared_ptr<Film> film = new_test_film ("scaling_test");
-	film->examine_and_add_content (shared_ptr<Content> (new ImageMagickContent ("test/data/simple_testcard_640x480.png")));
+	film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+	film->set_name ("scaling_test");
+	shared_ptr<ImageMagickContent> imc (new ImageMagickContent (film, "test/data/simple_testcard_640x480.png"));
+
+	film->examine_and_add_content (imc);
+	while (JobManager::instance()->work_to_do ());
 	
+	imc->set_video_length (1);
+
+	scaling_test_for (film, imc, "133", "185");
+	scaling_test_for (film, imc, "185", "185");
+	scaling_test_for (film, imc, "239", "185");
+
+	scaling_test_for (film, imc, "133", "239");
+	scaling_test_for (film, imc, "185", "239");
+	scaling_test_for (film, imc, "239", "239");
 }
+
diff --git a/test/test.cc b/test/test.cc
index 7d49bb66a..2837729c5 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -22,7 +22,8 @@
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/date_time.hpp>
-#include "format.h"
+#include <libdcp/dcp.h>
+#include "ratio.h"
 #include "film.h"
 #include "filter.h"
 #include "job_manager.h"
@@ -40,7 +41,6 @@
 #include "ffmpeg_decoder.h"
 #include "sndfile_decoder.h"
 #include "dcp_content_type.h"
-#include "container.h"
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
@@ -49,6 +49,8 @@ using std::string;
 using std::list;
 using std::stringstream;
 using std::vector;
+using std::min;
+using std::cout;
 using boost::shared_ptr;
 using boost::thread;
 using boost::dynamic_pointer_cast;
@@ -93,13 +95,67 @@ new_test_film (string name)
 	return f;
 }
 
+void
+check_file (string ref, string check)
+{
+	uintmax_t N = boost::filesystem::file_size (ref);
+	BOOST_CHECK_EQUAL (N, boost::filesystem::file_size(check));
+	FILE* ref_file = fopen (ref.c_str(), "rb");
+	BOOST_CHECK (ref_file);
+	FILE* check_file = fopen (check.c_str(), "rb");
+	BOOST_CHECK (check_file);
+	
+	int const buffer_size = 65536;
+	uint8_t* ref_buffer = new uint8_t[buffer_size];
+	uint8_t* check_buffer = new uint8_t[buffer_size];
+
+	while (N) {
+		uintmax_t this_time = min (uintmax_t (buffer_size), N);
+		size_t r = fread (ref_buffer, 1, this_time, ref_file);
+		BOOST_CHECK_EQUAL (r, this_time);
+		r = fread (check_buffer, 1, this_time, check_file);
+		BOOST_CHECK_EQUAL (r, this_time);
+
+		BOOST_CHECK_EQUAL (memcmp (ref_buffer, check_buffer, this_time), 0);
+		N -= this_time;
+	}
+
+	delete[] ref_buffer;
+	delete[] check_buffer;
+
+	fclose (ref_file);
+	fclose (check_file);
+}
+
+static void
+note (libdcp::NoteType, string n)
+{
+	cout << n << "\n";
+}
+
+void
+check_dcp (string ref, string check)
+{
+	libdcp::DCP ref_dcp (ref);
+	ref_dcp.read ();
+	libdcp::DCP check_dcp (check);
+	check_dcp.read ();
+
+	libdcp::EqualityOptions options;
+	options.max_mean_pixel_error = 5;
+	options.max_std_dev_pixel_error = 5;
+	options.max_audio_sample_error = 255;
+	
+	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
+}
+
+
 #include "scaling_test.cc"
-#include "container_test.cc"
+#include "ratio_test.cc"
 #include "pixel_formats_test.cc"
 #include "make_black_test.cc"
 #include "film_metadata_test.cc"
 #include "stream_test.cc"
-#include "format_test.cc"
 #include "util_test.cc"
 #include "dcp_test.cc"
 #include "frame_rate_test.cc"
-- 
cgit v1.2.3


From f676fdaf8823b884b96342ce35e06b76a06ca317 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 4 Jun 2013 11:45:45 +0100
Subject: Make it ok to call terminate_threads twice.

---
 src/lib/encoder.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 8549962ff..2c989452d 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -342,6 +342,8 @@ Encoder::terminate_threads ()
 		}
 		delete *i;
 	}
+
+	_threads.clear ();
 }
 
 void
-- 
cgit v1.2.3


From 50cb31af16240b248700dab1484d7f07656c66df Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 20 Jun 2013 17:34:23 +0100
Subject: Various fixes to make audio analysis sort-of work.

---
 src/lib/analyse_audio_job.cc   | 33 ++++++++++++++++++++---------
 src/lib/analyse_audio_job.h    |  6 ++++--
 src/lib/audio_analysis.cc      | 10 ++++-----
 src/lib/audio_analysis.h       |  5 +++--
 src/lib/audio_buffers.cc       |  6 ++++++
 src/lib/audio_content.cc       | 27 ++++++++++++++++++++++++
 src/lib/audio_content.h        |  5 +++--
 src/lib/audio_decoder.cc       |  5 ++---
 src/lib/content.h              |  2 --
 src/lib/encoder.cc             |  2 +-
 src/lib/encoder.h              |  4 ++--
 src/lib/examine_content_job.cc |  3 +--
 src/lib/examine_content_job.h  |  2 +-
 src/lib/ffmpeg_decoder.cc      |  6 +-----
 src/lib/film.cc                | 48 ++++++++++++++----------------------------
 src/lib/film.h                 |  9 ++------
 src/lib/job.cc                 |  2 +-
 src/lib/job.h                  |  4 ++--
 src/lib/player.cc              | 33 ++---------------------------
 src/lib/playlist.cc            | 23 --------------------
 src/lib/playlist.h             |  1 -
 src/lib/scp_dcp_job.cc         |  2 +-
 src/lib/scp_dcp_job.h          |  2 +-
 src/lib/transcode_job.cc       |  2 +-
 src/lib/transcode_job.h        |  2 +-
 src/lib/transcoder.cc          |  2 +-
 src/lib/transcoder.h           |  2 +-
 src/lib/writer.cc              |  2 +-
 src/lib/writer.h               |  4 ++--
 src/tools/dcpomatic.cc         |  9 --------
 src/wx/about_dialog.cc         |  4 ++--
 src/wx/audio_dialog.cc         | 32 +++++++++++-----------------
 src/wx/audio_dialog.h          |  9 ++++----
 src/wx/audio_plot.cc           | 10 +++++++--
 src/wx/film_editor.cc          | 36 +++++++++++++++----------------
 35 files changed, 155 insertions(+), 199 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 3a44a408f..2848c1ed7 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -33,8 +33,9 @@ using boost::shared_ptr;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
-AnalyseAudioJob::AnalyseAudioJob (shared_ptr<Film> f)
+AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<AudioContent> c)
 	: Job (f)
+	, _content (c)
 	, _done (0)
 	, _samples_per_point (1)
 {
@@ -44,13 +45,25 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<Film> f)
 string
 AnalyseAudioJob::name () const
 {
-	return String::compose (_("Analyse audio of %1"), _film->name());
+	shared_ptr<AudioContent> content = _content.lock ();
+	if (!content) {
+		return "";
+	}
+	
+	return String::compose (_("Analyse audio of %1"), content->file().filename());
 }
 
 void
 AnalyseAudioJob::run ()
 {
-	shared_ptr<Player> player = _film->player ();
+	shared_ptr<AudioContent> content = _content.lock ();
+	if (!content) {
+		return;
+	}
+
+	shared_ptr<Playlist> playlist (new Playlist);
+	playlist->add (content);
+	shared_ptr<Player> player (new Player (_film, playlist));
 	player->disable_video ();
 	
 	player->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1, _2));
@@ -61,18 +74,18 @@ AnalyseAudioJob::run ()
 	_analysis.reset (new AudioAnalysis (_film->dcp_audio_channels ()));
 
 	_done = 0;
-	while (player->pass ()) {
-		set_progress (double (_done) / _film->length ());
+	while (!player->pass ()) {
+		set_progress (double (_film->audio_frames_to_time (_done)) / _film->length ());
 	}
 
-	_analysis->write (_film->audio_analysis_path ());
+	_analysis->write (content->audio_analysis_path ());
 	
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
 
 void
-AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b, Time t)
+AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b, Time)
 {
 	for (int i = 0; i < b->frames(); ++i) {
 		for (int j = 0; j < b->channels(); ++j) {
@@ -88,12 +101,12 @@ AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b, Time t)
 			if ((_done % _samples_per_point) == 0) {
 				_current[j][AudioPoint::RMS] = sqrt (_current[j][AudioPoint::RMS] / _samples_per_point);
 				_analysis->add_point (j, _current[j]);
-				
+
 				_current[j] = AudioPoint ();
 			}
 		}
-	}
 
-	_done = t;
+		++_done;
+	}
 }
 
diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index a0786a017..3d4881983 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -22,11 +22,12 @@
 #include "types.h"
 
 class AudioBuffers;
+class AudioContent;
 
 class AnalyseAudioJob : public Job
 {
 public:
-	AnalyseAudioJob (boost::shared_ptr<Film> f);
+	AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<AudioContent>);
 
 	std::string name () const;
 	void run ();
@@ -34,7 +35,8 @@ public:
 private:
 	void audio (boost::shared_ptr<const AudioBuffers>, Time);
 
-	Time _done;
+	boost::weak_ptr<AudioContent> _content;
+	OutputAudioFrame _done;
 	int64_t _samples_per_point;
 	std::vector<AudioPoint> _current;
 
diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 9d708bbfd..e12516620 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -62,9 +62,9 @@ AudioAnalysis::AudioAnalysis (int channels)
 	_data.resize (channels);
 }
 
-AudioAnalysis::AudioAnalysis (string filename)
+AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
 {
-	ifstream f (filename.c_str ());
+	ifstream f (filename.string().c_str ());
 
 	int channels;
 	f >> channels;
@@ -107,10 +107,10 @@ AudioAnalysis::points (int c) const
 }
 
 void
-AudioAnalysis::write (string filename)
+AudioAnalysis::write (boost::filesystem::path filename)
 {
-	string tmp = filename + ".tmp";
-	
+	string tmp = filename.string() + ".tmp";
+
 	ofstream f (tmp.c_str ());
 	f << _data.size() << "\n";
 	for (vector<vector<AudioPoint> >::iterator i = _data.begin(); i != _data.end(); ++i) {
diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index ec6905105..d57eba90a 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <vector>
 #include <list>
+#include <boost/filesystem.hpp>
 
 class AudioPoint
 {
@@ -50,7 +51,7 @@ class AudioAnalysis
 {
 public:
 	AudioAnalysis (int c);
-	AudioAnalysis (std::string);
+	AudioAnalysis (boost::filesystem::path);
 
 	void add_point (int c, AudioPoint const & p);
 	
@@ -58,7 +59,7 @@ public:
 	int points (int c) const;
 	int channels () const;
 
-	void write (std::string);
+	void write (boost::filesystem::path);
 
 private:
 	std::vector<std::vector<AudioPoint> > _data;
diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc
index c3e89f130..403babaf7 100644
--- a/src/lib/audio_buffers.cc
+++ b/src/lib/audio_buffers.cc
@@ -206,6 +206,9 @@ AudioBuffers::accumulate_channel (AudioBuffers const * from, int from_channel, i
 	}
 }
 
+/** Ensure we have space for at least a certain number of frames.  If we extend
+ *  the buffers, fill the new space with silence.
+ */
 void
 AudioBuffers::ensure_size (int frames)
 {
@@ -218,6 +221,9 @@ AudioBuffers::ensure_size (int frames)
 		if (!_data[i]) {
 			throw bad_alloc ();
 		}
+		for (int j = _allocated_frames; j < frames; ++j) {
+			_data[i][j] = 0;
+		}
 	}
 
 	_allocated_frames = frames;
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 9940574f9..e93f348f4 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -19,11 +19,14 @@
 
 #include <libcxml/cxml.h>
 #include "audio_content.h"
+#include "analyse_audio_job.h"
+#include "job_manager.h"
 #include "film.h"
 
 using std::string;
 using boost::shared_ptr;
 using boost::lexical_cast;
+using boost::dynamic_pointer_cast;
 
 int const AudioContentProperty::AUDIO_CHANNELS = 200;
 int const AudioContentProperty::AUDIO_LENGTH = 201;
@@ -93,3 +96,27 @@ AudioContent::set_audio_delay (int d)
 	
 	signal_changed (AudioContentProperty::AUDIO_DELAY);
 }
+
+void
+AudioContent::analyse_audio (boost::function<void()> finished)
+{
+	shared_ptr<const Film> film = _film.lock ();
+	if (!film) {
+		return;
+	}
+	
+	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this())));
+	job->Finished.connect (finished);
+	JobManager::instance()->add (job);
+}
+
+boost::filesystem::path
+AudioContent::audio_analysis_path () const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	if (!film) {
+		return boost::filesystem::path ();
+	}
+
+	return film->audio_analysis_path (dynamic_pointer_cast<const AudioContent> (shared_from_this ()));
+}
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 8fc658a76..73a00ca7d 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -57,6 +55,9 @@ public:
 	virtual AudioMapping audio_mapping () const = 0;
 	virtual void set_audio_mapping (AudioMapping) = 0;
 
+	void analyse_audio (boost::function<void()>);
+	boost::filesystem::path audio_analysis_path () const;
+
 	void set_audio_gain (float);
 	void set_audio_delay (int);
 	
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index bbd4ced6c..a9e01908c 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -59,10 +59,10 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioCont
 
 		_swr_context = swr_alloc_set_opts (
 			0,
-			av_get_default_channel_layout (MAX_AUDIO_CHANNELS),
+			av_get_default_channel_layout (_audio_content->audio_channels ()),
 			AV_SAMPLE_FMT_FLTP,
 			_audio_content->output_audio_frame_rate(),
-			av_get_default_channel_layout (MAX_AUDIO_CHANNELS),
+			av_get_default_channel_layout (_audio_content->audio_channels ()),
 			AV_SAMPLE_FMT_FLTP,
 			_audio_content->content_audio_frame_rate(),
 			0, 0
@@ -152,7 +152,6 @@ AudioDecoder::audio (shared_ptr<const AudioBuffers> data, Time time)
 	}
 
 	Audio (dcp_mapped, time);
-	cout << "bumping n.a. by " << data->frames() << " ie " << film->audio_frames_to_time(data->frames()) << "\n";
 	_next_audio = time + film->audio_frames_to_time (data->frames());
 }
 
diff --git a/src/lib/content.h b/src/lib/content.h
index 5e8f98428..e33f517ab 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 4dff19ea6..8b2db0eb3 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -47,7 +47,7 @@ using boost::optional;
 int const Encoder::_history_size = 25;
 
 /** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Job> j)
+Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _film (f)
 	, _job (j)
 	, _video_frames_out (0)
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 8f724525c..3fe707b51 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -58,7 +58,7 @@ class Job;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-	Encoder (boost::shared_ptr<Film> f, boost::shared_ptr<Job>);
+	Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<Job>);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
@@ -87,7 +87,7 @@ private:
 	void terminate_threads ();
 
 	/** Film that we are encoding */
-	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<Job> _job;
 
 	/** Mutex for _time_history and _last_frame */
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index f68a1eea0..3cab9716d 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -28,7 +28,7 @@
 using std::string;
 using boost::shared_ptr;
 
-ExamineContentJob::ExamineContentJob (shared_ptr<Film> f, shared_ptr<Content> c)
+ExamineContentJob::ExamineContentJob (shared_ptr<const Film> f, shared_ptr<Content> c)
 	: Job (f)
 	, _content (c)
 {
@@ -49,7 +49,6 @@ void
 ExamineContentJob::run ()
 {
 	_content->examine (shared_from_this ());
-	_film->add_content (_content);
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h
index 86f1ab111..b6903b86b 100644
--- a/src/lib/examine_content_job.h
+++ b/src/lib/examine_content_job.h
@@ -26,7 +26,7 @@ class Log;
 class ExamineContentJob : public Job
 {
 public:
-	ExamineContentJob (boost::shared_ptr<Film>, boost::shared_ptr<Content>);
+	ExamineContentJob (boost::shared_ptr<const Film>, boost::shared_ptr<Content>);
 	~ExamineContentJob ();
 
 	std::string name () const;
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 36078a463..2e586b8f7 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -278,8 +276,6 @@ FFmpegDecoder::pass ()
 			}
 			avsubtitle_free (&sub);
 		}
-	} else {
-		cout << "[ffmpeg] other packet.\n";
 	}
 
 	av_free_packet (&_packet);
@@ -541,7 +537,7 @@ FFmpegDecoder::decode_audio_packet ()
 					);
 				
 				assert (_audio_codec_context->channels == _ffmpeg_content->audio_channels());
-				audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds);
+				audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds * TIME_HZ);
 			}
 			
 			copy_packet.data += decode_result;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index a29f6c331..ad565aca0 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -45,7 +45,6 @@
 #include "config.h"
 #include "version.h"
 #include "ui_signaller.h"
-#include "analyse_audio_job.h"
 #include "playlist.h"
 #include "player.h"
 #include "ffmpeg_content.h"
@@ -72,6 +71,7 @@ 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;
@@ -222,13 +222,12 @@ Film::filename_safe_name () const
 	return o;
 }
 
-string
-Film::audio_analysis_path () const
+boost::filesystem::path
+Film::audio_analysis_path (shared_ptr<const AudioContent> c) const
 {
-	boost::filesystem::path p;
-	p /= "analysis";
-	p /= _playlist->audio_digest();
-	return file (p.string ());
+	boost::filesystem::path p = dir ("analysis");
+	p /= c->digest();
+	return p;
 }
 
 /** Add suitable Jobs to the JobManager to create a DCP for this Film */
@@ -289,31 +288,6 @@ Film::make_dcp ()
 	JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this())));
 }
 
-/** Start a job to analyse the audio in our Playlist */
-void
-Film::analyse_audio ()
-{
-	if (_analyse_audio_job) {
-		return;
-	}
-
-	_analyse_audio_job.reset (new AnalyseAudioJob (shared_from_this()));
-	_analyse_audio_job->Finished.connect (bind (&Film::analyse_audio_finished, this));
-	JobManager::instance()->add (_analyse_audio_job);
-}
-
-void
-Film::analyse_audio_finished ()
-{
-	ensure_ui_thread ();
-
-	if (_analyse_audio_job->finished_ok ()) {
-		AudioAnalysisSucceeded ();
-	}
-	
-	_analyse_audio_job.reset ();
-}
-
 /** Start a job to send our DCP to the configured TMS */
 void
 Film::send_dcp_to_tms ()
@@ -782,9 +756,19 @@ void
 Film::examine_and_add_content (shared_ptr<Content> c)
 {
 	shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
+	j->Finished.connect (bind (&Film::add_content_weak, this, boost::weak_ptr<Content> (c)));
 	JobManager::instance()->add (j);
 }
 
+void
+Film::add_content_weak (weak_ptr<Content> c)
+{
+	shared_ptr<Content> content = c.lock ();
+	if (content) {
+		add_content (content);
+	}
+}
+
 void
 Film::add_content (shared_ptr<Content> c)
 {
diff --git a/src/lib/film.h b/src/lib/film.h
index 5f06a1dc7..5bb9acf29 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -63,12 +63,11 @@ public:
 	std::string info_path (int f) const;
 	std::string internal_video_mxf_dir () const;
 	std::string internal_video_mxf_filename () const;
-	std::string audio_analysis_path () const;
+	boost::filesystem::path audio_analysis_path (boost::shared_ptr<const AudioContent>) const;
 
 	std::string dcp_video_mxf_filename () const;
 	std::string dcp_audio_mxf_filename () const;
 
-	void analyse_audio ();
 	void send_dcp_to_tms ();
 	void make_dcp ();
 
@@ -244,24 +243,20 @@ public:
 	/** Emitted when some property of our content has changed */
 	mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
 
-	boost::signals2::signal<void ()> AudioAnalysisSucceeded;
-
 	/** Current version number of the state file */
 	static int const state_version;
 
 private:
 	
 	void signal_changed (Property);
-	void analyse_audio_finished ();
 	std::string video_state_identifier () const;
 	void playlist_changed ();
 	void playlist_content_changed (boost::weak_ptr<Content>, int);
 	std::string filename_safe_name () const;
+	void add_content_weak (boost::weak_ptr<Content>);
 
 	/** Log to write to */
 	boost::shared_ptr<Log> _log;
-	/** Any running AnalyseAudioJob, or 0 */
-	boost::shared_ptr<AnalyseAudioJob> _analyse_audio_job;
 	boost::shared_ptr<Playlist> _playlist;
 
 	/** Complete path to directory containing the film metadata;
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 2e6385d62..4969c4099 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -35,7 +35,7 @@ using std::list;
 using std::stringstream;
 using boost::shared_ptr;
 
-Job::Job (shared_ptr<Film> f)
+Job::Job (shared_ptr<const Film> f)
 	: _film (f)
 	, _thread (0)
 	, _state (NEW)
diff --git a/src/lib/job.h b/src/lib/job.h
index 40e90b73c..5a4775180 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -38,7 +38,7 @@ class Film;
 class Job : public boost::enable_shared_from_this<Job>
 {
 public:
-	Job (boost::shared_ptr<Film>);
+	Job (boost::shared_ptr<const Film>);
 	virtual ~Job() {}
 
 	/** @return user-readable name of this job */
@@ -91,7 +91,7 @@ protected:
 	void set_state (State);
 	void set_error (std::string s, std::string d);
 
-	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<const Film> _film;
 
 private:
 
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 60686e781..c05897c23 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -95,11 +95,6 @@ Player::pass ()
         shared_ptr<Piece> earliest;
 
 	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		cout << "check " << (*i)->content->file()
-		     << " start=" << (*i)->content->start()
-		     << ", position=" << (*i)->decoder->position()
-		     << ", end=" << (*i)->content->end() << "\n";
-		
 		if ((*i)->decoder->done ()) {
 			continue;
 		}
@@ -110,7 +105,6 @@ Player::pass ()
 		
 		Time const t = (*i)->content->start() + (*i)->decoder->position();
 		if (t < earliest_t) {
-			cout << "\t candidate; " << t << " " << (t / TIME_HZ) << ".\n";
 			earliest_t = t;
 			earliest = *i;
 		}
@@ -121,23 +115,8 @@ Player::pass ()
 		return true;
 	}
 
-	cout << "PASS:\n";
-	cout << "\tpass " << earliest->content->file() << " ";
-	if (dynamic_pointer_cast<FFmpegContent> (earliest->content)) {
-		cout << " FFmpeg.\n";
-	} else if (dynamic_pointer_cast<ImageMagickContent> (earliest->content)) {
-		cout << " ImageMagickContent.\n";
-	} else if (dynamic_pointer_cast<SndfileContent> (earliest->content)) {
-		cout << " SndfileContent.\n";
-	} else if (dynamic_pointer_cast<BlackDecoder> (earliest->decoder)) {
-		cout << " Black.\n";
-	} else if (dynamic_pointer_cast<SilenceDecoder> (earliest->decoder)) {
-		cout << " Silence.\n";
-	}
-	
 	earliest->decoder->pass ();
 	_position = earliest->content->start() + earliest->decoder->position ();
-	cout << "\tpassed to " << _position << " " << (_position / TIME_HZ) << "\n";
 
         return false;
 }
@@ -169,6 +148,8 @@ Player::process_audio (weak_ptr<Content> weak_content, shared_ptr<const AudioBuf
 
 	time += content->start ();
 
+	cout << "Player gets " << audio->frames() << " @ " << time << " cf " << _next_audio << "\n";
+
         if (time > _next_audio) {
                 /* We can emit some audio from our buffers */
                 OutputAudioFrame const N = _film->time_to_audio_frames (time - _next_audio);
@@ -216,13 +197,10 @@ Player::seek (Time t)
 		return;
 	}
 
-//	cout << "seek to " << t << " " << (t / TIME_HZ) << "\n";
-
 	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
 		Time s = t - (*i)->content->start ();
 		s = max (static_cast<Time> (0), s);
 		s = min ((*i)->content->length(), s);
-//		cout << "seek [" << (*i)->content->file() << "," << (*i)->content->start() << "," << (*i)->content->end() << "] to " << s << "\n";
 		(*i)->decoder->seek (s);
 	}
 
@@ -250,7 +228,6 @@ Player::add_black_piece (Time s, Time len)
 	shared_ptr<BlackDecoder> bd (new BlackDecoder (_film, nc));
 	bd->Video.connect (bind (&Player::process_video, this, nc, _1, _2, _3));
 	_pieces.push_back (shared_ptr<Piece> (new Piece (nc, bd)));
-	cout << "\tblack @ " << s << " -- " << (s + len) << "\n";
 }
 
 void
@@ -260,15 +237,12 @@ Player::add_silent_piece (Time s, Time len)
 	shared_ptr<SilenceDecoder> sd (new SilenceDecoder (_film, nc));
 	sd->Audio.connect (bind (&Player::process_audio, this, nc, _1, _2));
 	_pieces.push_back (shared_ptr<Piece> (new Piece (nc, sd)));
-	cout << "\tsilence @ " << s << " -- " << (s + len) << "\n";
 }
 
 
 void
 Player::setup_pieces ()
 {
-	cout << "----- Player SETUP PIECES.\n";
-
 	list<shared_ptr<Piece> > old_pieces = _pieces;
 
 	_pieces.clear ();
@@ -293,7 +267,6 @@ Player::setup_pieces ()
 			}
 
 			decoder = fd;
-			cout << "\tFFmpeg @ " << fc->start() << " -- " << fc->end() << "\n";
 		}
 		
 		shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
@@ -317,7 +290,6 @@ Player::setup_pieces ()
 			}
 
 			decoder = id;
-			cout << "\tImageMagick @ " << ic->start() << " -- " << ic->end() << "\n";
 		}
 
 		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
@@ -326,7 +298,6 @@ Player::setup_pieces ()
 			sd->Audio.connect (bind (&Player::process_audio, this, *i, _1, _2));
 
 			decoder = sd;
-			cout << "\tSndfile @ " << sc->start() << " -- " << sc->end() << "\n";
 		}
 
 		_pieces.push_back (shared_ptr<Piece> (new Piece (*i, decoder)));
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 5ee764a8e..9cc1789d1 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -93,29 +93,6 @@ Playlist::content_changed (weak_ptr<Content> c, int p)
 	ContentChanged (c, p);
 }
 
-string
-Playlist::audio_digest () const
-{
-	string t;
-	
-	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-		if (!dynamic_pointer_cast<const AudioContent> (*i)) {
-			continue;
-		}
-		
-		t += (*i)->digest ();
-
-		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
-		if (fc) {
-			t += lexical_cast<string> (fc->audio_stream()->id);
-		}
-	}
-
-	t += lexical_cast<string> (_loop);
-
-	return md5_digest (t.c_str(), t.length());
-}
-
 string
 Playlist::video_digest () const
 {
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 3a7ca73bf..e4f4c79f0 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -77,7 +77,6 @@ public:
 		return _content;
 	}
 
-	std::string audio_digest () const;
 	std::string video_digest () const;
 
 	int loop () const {
diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
index a9fdfefda..8cde44f02 100644
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -96,7 +96,7 @@ public:
 };
 
 
-SCPDCPJob::SCPDCPJob (shared_ptr<Film> f)
+SCPDCPJob::SCPDCPJob (shared_ptr<const Film> f)
 	: Job (f)
 	, _status (_("Waiting"))
 {
diff --git a/src/lib/scp_dcp_job.h b/src/lib/scp_dcp_job.h
index 8c16d53fb..bdc83af18 100644
--- a/src/lib/scp_dcp_job.h
+++ b/src/lib/scp_dcp_job.h
@@ -26,7 +26,7 @@
 class SCPDCPJob : public Job
 {
 public:
-	SCPDCPJob (boost::shared_ptr<Film>);
+	SCPDCPJob (boost::shared_ptr<const Film>);
 
 	std::string name () const;
 	void run ();
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index ce02fa57e..6d5edd7c0 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -38,7 +38,7 @@ using boost::shared_ptr;
 
 /** @param s Film to use.
  */
-TranscodeJob::TranscodeJob (shared_ptr<Film> f)
+TranscodeJob::TranscodeJob (shared_ptr<const Film> f)
 	: Job (f)
 {
 	
diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index 7880a925e..9128206d2 100644
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -32,7 +32,7 @@ class Transcoder;
 class TranscodeJob : public Job
 {
 public:
-	TranscodeJob (boost::shared_ptr<Film> f);
+	TranscodeJob (boost::shared_ptr<const Film> f);
 	
 	std::string name () const;
 	void run ();
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 847be2f1c..f4637a05c 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -43,7 +43,7 @@ using boost::dynamic_pointer_cast;
  *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _job (j)
 	, _player (f->player ())
 	, _encoder (new Encoder (f, j))
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index f7da3bd01..b3c8f888b 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -40,7 +40,7 @@ class Transcoder
 {
 public:
 	Transcoder (
-		boost::shared_ptr<Film> f,
+		boost::shared_ptr<const Film> f,
 		boost::shared_ptr<Job> j
 		);
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index e9f7ab582..35874581b 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -48,7 +48,7 @@ using boost::shared_ptr;
 
 int const Writer::_maximum_frames_in_memory = 8;
 
-Writer::Writer (shared_ptr<Film> f, shared_ptr<Job> j)
+Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _film (f)
 	, _job (j)
 	, _first_nonexistant_frame (0)
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 62714edf3..e56e12e75 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -64,7 +64,7 @@ bool operator== (QueueItem const & a, QueueItem const & b);
 class Writer : public ExceptionStore
 {
 public:
-	Writer (boost::shared_ptr<Film>, boost::shared_ptr<Job>);
+	Writer (boost::shared_ptr<const Film>, boost::shared_ptr<Job>);
 
 	bool can_fake_write (int) const;
 	
@@ -80,7 +80,7 @@ private:
 	void check_existing_picture_mxf ();
 
 	/** our Film */
-	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<Job> _job;
 	/** the first frame index that does not already exist in our MXF */
 	int _first_nonexistant_frame;
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 77800b5fd..683e60ceb 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -149,7 +149,6 @@ enum {
 	ID_jobs_make_dcp,
 	ID_jobs_send_dcp_to_tms,
 	ID_jobs_show_dcp,
-	ID_jobs_analyse_audio,
 };
 
 void
@@ -178,8 +177,6 @@ setup_menu (wxMenuBar* m)
 	add_item (jobs_menu, _("&Make DCP"), ID_jobs_make_dcp, NEEDS_FILM);
 	add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM);
 	add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM);
-	jobs_menu->AppendSeparator ();
-	add_item (jobs_menu, _("&Analyse audio"), ID_jobs_analyse_audio, NEEDS_FILM);
 
 	wxMenu* help = new wxMenu;
 #ifdef __WXOSX__	
@@ -222,7 +219,6 @@ public:
 		Connect (ID_jobs_make_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp));
 		Connect (ID_jobs_send_dcp_to_tms, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_send_dcp_to_tms));
 		Connect (ID_jobs_show_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_show_dcp));
-		Connect (ID_jobs_analyse_audio, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_analyse_audio));
 		Connect (wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about));
 
 		Connect (wxID_ANY, wxEVT_MENU_OPEN, wxMenuEventHandler (Frame::menu_opened));
@@ -399,11 +395,6 @@ private:
 #endif		
 	}
 
-	void jobs_analyse_audio (wxCommandEvent &)
-	{
-		film->analyse_audio ();
-	}
-	
 	void help_about (wxCommandEvent &)
 	{
 		AboutDialog* d = new AboutDialog (this);
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 7844180fa..0c56cf1be 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -62,8 +62,8 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
 	wxHyperlinkCtrl* h = new wxHyperlinkCtrl (
 		this, wxID_ANY,
-		wxT ("www.carlh.net/software/dcpomatic"),
-		wxT ("http://www.carlh.net/software/dcpomatic")
+		wxT ("dcpomatic.com"),
+		wxT ("http://dcpomatic.com")
 		);
 
 	sizer->Add (h, wxSizerFlags().Centre().Border());
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 1241b61fb..ea7cc60dd 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -85,20 +83,18 @@ AudioDialog::AudioDialog (wxWindow* parent)
 }
 
 void
-AudioDialog::set_film (shared_ptr<Film> f)
+AudioDialog::set_content (shared_ptr<AudioContent> c)
 {
-	_film_changed_connection.disconnect ();
-	_film_audio_analysis_succeeded_connection.disconnect ();
+	_content_changed_connection.disconnect ();
 	
-	_film = f;
+	_content = c;
 
 	try_to_load_analysis ();
-//	_plot->set_gain (_film->audio_gain ());
+	_plot->set_gain (_content->audio_gain ());
 
-	_film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
-	_film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this));
+	_content_changed_connection = _content->Changed.connect (bind (&AudioDialog::content_changed, this, _2));
 
-	SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_film->name()).data()));
+	SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_content->file().filename().string()).data()));
 }
 
 
@@ -107,11 +103,11 @@ AudioDialog::try_to_load_analysis ()
 {
 	shared_ptr<AudioAnalysis> a;
 
-	if (boost::filesystem::exists (_film->audio_analysis_path())) {
-		a.reset (new AudioAnalysis (_film->audio_analysis_path ()));
+	if (boost::filesystem::exists (_content->audio_analysis_path())) {
+		a.reset (new AudioAnalysis (_content->audio_analysis_path ()));
 	} else {
 		if (IsShown ()) {
-			_film->analyse_audio ();
+			_content->analyse_audio (bind (&AudioDialog::try_to_load_analysis, this));
 		}
 	}
 		
@@ -142,14 +138,10 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 }
 
 void
-AudioDialog::film_changed (Film::Property p)
+AudioDialog::content_changed (int p)
 {
-	switch (p) {
-//	case Film::AUDIO_GAIN:
-//		_plot->set_gain (_film->audio_gain ());
-		break;
-	default:
-		break;
+	if (p == AudioContentProperty::AUDIO_GAIN) {
+		_plot->set_gain (_content->audio_gain ());
 	}
 }
 
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index db1d74f30..c69baf282 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -31,20 +31,19 @@ class AudioDialog : public wxDialog
 public:
 	AudioDialog (wxWindow *);
 
-	void set_film (boost::shared_ptr<Film>);
+	void set_content (boost::shared_ptr<AudioContent>);
 
 private:
-	void film_changed (Film::Property);
+	void content_changed (int);
 	void channel_clicked (wxCommandEvent &);
 	void type_clicked (wxCommandEvent &);
 	void smoothing_changed (wxScrollEvent &);
 	void try_to_load_analysis ();
 
-	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<AudioContent> _content;
 	AudioPlot* _plot;
 	wxCheckBox* _channel_checkbox[MAX_AUDIO_CHANNELS];
 	wxCheckBox* _type_checkbox[AudioPoint::COUNT];
 	wxSlider* _smoothing;
-	boost::signals2::scoped_connection _film_changed_connection;
-	boost::signals2::scoped_connection _film_audio_analysis_succeeded_connection;
+	boost::signals2::scoped_connection _content_changed_connection;
 };
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index fb02fea7b..e2e2cdf76 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -193,6 +191,10 @@ AudioPlot::y_for_linear (float p) const
 void
 AudioPlot::plot_peak (wxGraphicsPath& path, int channel) const
 {
+	if (_analysis->points (channel) == 0) {
+		return;
+	}
+	
 	path.MoveToPoint (_db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::PEAK]));
 
 	float peak = 0;
@@ -213,6 +215,10 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel) const
 void
 AudioPlot::plot_rms (wxGraphicsPath& path, int channel) const
 {
+	if (_analysis->points (channel) == 0) {
+		return;
+	}
+	
 	path.MoveToPoint (_db_label_width, y_for_linear (_analysis->get_point(channel, 0)[AudioPoint::RMS]));
 
 	list<float> smoothing;
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 12b316dff..27803fb9a 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -848,10 +848,6 @@ FilmEditor::set_film (shared_ptr<Film> f)
 		FileChanged ("");
 	}
 
-	if (_audio_dialog) {
-		_audio_dialog->set_film (_film);
-	}
-	
 	film_changed (Film::NAME);
 	film_changed (Film::USE_DCI_NAME);
 	film_changed (Film::CONTENT);
@@ -867,19 +863,8 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::DCI_METADATA);
 	film_changed (Film::DCP_VIDEO_FRAME_RATE);
 
-	shared_ptr<Content> s = selected_content ();
-	film_content_changed (s, ContentProperty::START);
-	film_content_changed (s, ContentProperty::LENGTH);
-	film_content_changed (s, VideoContentProperty::VIDEO_CROP);
-	film_content_changed (s, VideoContentProperty::VIDEO_RATIO);
-	film_content_changed (s, AudioContentProperty::AUDIO_GAIN);
-	film_content_changed (s, AudioContentProperty::AUDIO_DELAY);
-	film_content_changed (s, AudioContentProperty::AUDIO_MAPPING);
-	film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAMS);
-	film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAM);
-	film_content_changed (s, FFmpegContentProperty::AUDIO_STREAMS);
-	film_content_changed (s, FFmpegContentProperty::AUDIO_STREAM);
-	film_content_changed (s, FFmpegContentProperty::FILTERS);
+	wxListEvent ev;
+	content_selection_changed (ev);
 }
 
 /** Updates the sensitivity of lots of widgets to a given value.
@@ -1106,10 +1091,20 @@ FilmEditor::show_audio_clicked (wxCommandEvent &)
 		_audio_dialog->Destroy ();
 		_audio_dialog = 0;
 	}
+
+	shared_ptr<Content> c = selected_content ();
+	if (!c) {
+		return;
+	}
+
+	shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (c);
+	if (!ac) {
+		return;
+	}
 	
 	_audio_dialog = new AudioDialog (this);
 	_audio_dialog->Show ();
-	_audio_dialog->set_film (_film);
+	_audio_dialog->set_content (ac);
 }
 
 void
@@ -1199,6 +1194,11 @@ FilmEditor::content_selection_changed (wxListEvent &)
 {
         setup_content_sensitivity ();
 	shared_ptr<Content> s = selected_content ();
+	
+	if (_audio_dialog && s && dynamic_pointer_cast<AudioContent> (s)) {
+		_audio_dialog->set_content (dynamic_pointer_cast<AudioContent> (s));
+	}
+	
 	film_content_changed (s, ContentProperty::START);
 	film_content_changed (s, ContentProperty::LENGTH);
 	film_content_changed (s, VideoContentProperty::VIDEO_CROP);
-- 
cgit v1.2.3


From 09a9ac376db005a40a351736bcff4077f098825d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 26 Jun 2013 01:21:21 +0100
Subject: Another try at sorting out the thorny question of timing.

---
 doc/design/timing.tex          |  42 +++++
 src/lib/audio_content.h        |   4 +-
 src/lib/audio_decoder.cc       | 101 +-----------
 src/lib/audio_decoder.h        |  25 ++-
 src/lib/audio_sink.h           |  32 ----
 src/lib/audio_source.cc        |  42 -----
 src/lib/audio_source.h         |  43 -----
 src/lib/black_decoder.cc       | 102 ------------
 src/lib/black_decoder.h        |  48 ------
 src/lib/combiner.cc            |  65 --------
 src/lib/combiner.h             |  43 -----
 src/lib/decoder.h              |  20 ---
 src/lib/encoder.cc             |   4 +-
 src/lib/encoder.h              |   8 +-
 src/lib/ffmpeg_content.cc      |  12 +-
 src/lib/ffmpeg_content.h       |   9 +-
 src/lib/ffmpeg_decoder.cc      | 144 ++++++++++-------
 src/lib/ffmpeg_decoder.h       |  12 +-
 src/lib/ffmpeg_examiner.cc     |  14 +-
 src/lib/ffmpeg_examiner.h      |   8 +-
 src/lib/image.cc               |   5 +-
 src/lib/imagemagick_content.cc |   2 +-
 src/lib/imagemagick_content.h  |   2 +-
 src/lib/imagemagick_decoder.cc |  41 ++---
 src/lib/imagemagick_decoder.h  |   4 +-
 src/lib/imagemagick_examiner.h |   2 +-
 src/lib/matcher.cc             | 224 --------------------------
 src/lib/matcher.h              |  77 ---------
 src/lib/null_content.cc        |  57 -------
 src/lib/null_content.h         |  67 --------
 src/lib/player.cc              | 346 ++++++++++++++++++++++++++---------------
 src/lib/player.h               |  47 ++++--
 src/lib/playlist.h             |   4 -
 src/lib/resampler.cc           |  61 ++++++++
 src/lib/resampler.h            |  21 +++
 src/lib/silence_decoder.cc     |  87 -----------
 src/lib/silence_decoder.h      |  37 -----
 src/lib/sndfile_content.cc     |   2 +-
 src/lib/sndfile_content.h      |   4 +-
 src/lib/sndfile_decoder.cc     |  12 +-
 src/lib/sndfile_decoder.h      |  10 +-
 src/lib/subtitle.cc            |   3 +-
 src/lib/transcoder.cc          |  23 ++-
 src/lib/types.h                |   2 -
 src/lib/util.cc                |   2 +-
 src/lib/util.h                 |   3 +-
 src/lib/video_content.cc       |   5 +-
 src/lib/video_content.h        |   9 +-
 src/lib/video_decoder.cc       | 107 +------------
 src/lib/video_decoder.h        |  35 ++---
 src/lib/video_examiner.h       |   3 +-
 src/lib/video_sink.h           |  39 -----
 src/lib/video_source.cc        |  44 ------
 src/lib/video_source.h         |  52 -------
 src/lib/writer.cc              |   1 -
 src/lib/wscript                |   7 +-
 src/wx/film_viewer.cc          |   5 +-
 test/ffmpeg_examiner_test.cc   |   4 +-
 test/ffmpeg_pts_offset.cc      |  39 +++++
 test/test.cc                   |   1 +
 60 files changed, 650 insertions(+), 1624 deletions(-)
 create mode 100644 doc/design/timing.tex
 delete mode 100644 src/lib/audio_sink.h
 delete mode 100644 src/lib/audio_source.cc
 delete mode 100644 src/lib/audio_source.h
 delete mode 100644 src/lib/black_decoder.cc
 delete mode 100644 src/lib/black_decoder.h
 delete mode 100644 src/lib/combiner.cc
 delete mode 100644 src/lib/combiner.h
 delete mode 100644 src/lib/matcher.cc
 delete mode 100644 src/lib/matcher.h
 delete mode 100644 src/lib/null_content.cc
 delete mode 100644 src/lib/null_content.h
 create mode 100644 src/lib/resampler.cc
 create mode 100644 src/lib/resampler.h
 delete mode 100644 src/lib/silence_decoder.cc
 delete mode 100644 src/lib/silence_decoder.h
 delete mode 100644 src/lib/video_sink.h
 delete mode 100644 src/lib/video_source.cc
 delete mode 100644 src/lib/video_source.h
 create mode 100644 test/ffmpeg_pts_offset.cc

(limited to 'src/lib/encoder.cc')

diff --git a/doc/design/timing.tex b/doc/design/timing.tex
new file mode 100644
index 000000000..567ba024f
--- /dev/null
+++ b/doc/design/timing.tex
@@ -0,0 +1,42 @@
+\documentclass{article}
+\begin{document}
+
+We are trying to implement full-ish playlist based content specification.  The timing is awkward.
+
+\section{Reference timing}
+
+Frame rates of things can vary a lot; content can be in pretty much
+anything, and DCP video and audio frame rates may change on a whim
+depending on what is best for a given set of content.  This suggests
+(albeit without strong justification) the need for a frame-rate-independent unit of time.
+
+So far we've been using a time type called \texttt{Time} expressed in
+$\mathtt{TIME\_HZ}^{-1}$; e.g. \texttt{TIME\_HZ} units is 1 second.
+\texttt{TIME\_HZ} is chosen to be divisible by lots of frame and
+sample rates.
+
+We express content start time as a \texttt{Time}.
+
+
+\section{Timing at different stages of the chain}
+
+Let's try this: decoders produce sequences of (perhaps) video frames
+and (perhaps) audio frames.  There are no gaps.  They are at the
+content's native frame rates and are synchronised (meaning that if
+they are played together, at the content's frame rates, they will be
+in sync).  The decoders give timestamps for each piece of their
+output, which are \emph{simple indices} (\texttt{ContentVideoFrame}
+and \texttt{ContentAudioFrame}).  Decoders know nothing of \texttt{Time}.
+
+
+\section{Split of stuff between decoders and player}
+
+In some ways it seems nice to have decoders which produce the rawest
+possible data and make the player sort it out (e.g.\ cropping and
+scaling video, resampling audio).  The resampling is awkward, though,
+as you really need one resampler per source.  So it might make more sense
+to put stuff in the decoder.  But then, what's one map of resamplers between friends?
+
+
+
+\end{document}
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 73a00ca7d..9bf53e0ab 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -41,6 +41,8 @@ public:
 class AudioContent : public virtual Content
 {
 public:
+	typedef int64_t Frame;
+	
 	AudioContent (boost::shared_ptr<const Film>, Time);
 	AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
 	AudioContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
@@ -49,7 +51,7 @@ public:
 	void as_xml (xmlpp::Node *) const;
 
         virtual int audio_channels () const = 0;
-        virtual ContentAudioFrame audio_length () const = 0;
+        virtual AudioContent::Frame audio_length () const = 0;
         virtual int content_audio_frame_rate () const = 0;
 	virtual int output_audio_frame_rate () const = 0;
 	virtual AudioMapping audio_mapping () const = 0;
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index a9e01908c..dc49a1846 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -31,57 +31,12 @@ using std::cout;
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> f, shared_ptr<const AudioContent> c)
+AudioDecoder::AudioDecoder (shared_ptr<const Film> f)
 	: Decoder (f)
-	, _next_audio (0)
-	, _audio_content (c)
+	, _audio_position (0)
 {
-	if (_audio_content->content_audio_frame_rate() != _audio_content->output_audio_frame_rate()) {
-
-		shared_ptr<const Film> film = _film.lock ();
-		assert (film);
-
-		stringstream s;
-		s << String::compose (
-			"Will resample audio from %1 to %2",
-			_audio_content->content_audio_frame_rate(), _audio_content->output_audio_frame_rate()
-			);
-		
-		film->log()->log (s.str ());
-
-		/* We will be using planar float data when we call the
-		   resampler.  As far as I can see, the audio channel
-		   layout is not necessary for our purposes; it seems
-		   only to be used get the number of channels and
-		   decide if rematrixing is needed.  It won't be, since
-		   input and output layouts are the same.
-		*/
-
-		_swr_context = swr_alloc_set_opts (
-			0,
-			av_get_default_channel_layout (_audio_content->audio_channels ()),
-			AV_SAMPLE_FMT_FLTP,
-			_audio_content->output_audio_frame_rate(),
-			av_get_default_channel_layout (_audio_content->audio_channels ()),
-			AV_SAMPLE_FMT_FLTP,
-			_audio_content->content_audio_frame_rate(),
-			0, 0
-			);
-		
-		swr_init (_swr_context);
-	} else {
-		_swr_context = 0;
-	}
 }
 
-AudioDecoder::~AudioDecoder ()
-{
-	if (_swr_context) {
-		swr_free (&_swr_context);
-	}
-}
-	
-
 #if 0
 void
 AudioDecoder::process_end ()
@@ -113,54 +68,8 @@ AudioDecoder::process_end ()
 #endif
 
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data, Time time)
-{
-	/* Maybe resample */
-	if (_swr_context) {
-
-		/* Compute the resampled frames count and add 32 for luck */
-		int const max_resampled_frames = ceil (
-			(int64_t) data->frames() * _audio_content->output_audio_frame_rate() / _audio_content->content_audio_frame_rate()
-			) + 32;
-
-		shared_ptr<AudioBuffers> resampled (new AudioBuffers (data->channels(), max_resampled_frames));
-
-		/* Resample audio */
-		int const resampled_frames = swr_convert (
-			_swr_context, (uint8_t **) resampled->data(), max_resampled_frames, (uint8_t const **) data->data(), data->frames()
-			);
-		
-		if (resampled_frames < 0) {
-			throw EncodeError (_("could not run sample-rate converter"));
-		}
-
-		resampled->set_frames (resampled_frames);
-		
-		/* And point our variables at the resampled audio */
-		data = resampled;
-	}
-
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	
-	/* Remap channels */
-	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (film->dcp_audio_channels(), data->frames()));
-	dcp_mapped->make_silent ();
-	list<pair<int, libdcp::Channel> > map = _audio_content->audio_mapping().content_to_dcp ();
-	for (list<pair<int, libdcp::Channel> >::iterator i = map.begin(); i != map.end(); ++i) {
-		dcp_mapped->accumulate_channel (data.get(), i->first, i->second);
-	}
-
-	Audio (dcp_mapped, time);
-	_next_audio = time + film->audio_frames_to_time (data->frames());
-}
-
-bool
-AudioDecoder::audio_done () const
+AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
 {
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	
-	return (_audio_content->length() - _next_audio) < film->audio_frames_to_time (1);
+	Audio (data, frame);
+	_audio_position = frame + data->frames ();
 }
-	
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 1da8a676f..ddfb296c9 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -24,33 +24,26 @@
 #ifndef DCPOMATIC_AUDIO_DECODER_H
 #define DCPOMATIC_AUDIO_DECODER_H
 
-#include "audio_source.h"
 #include "decoder.h"
-extern "C" {
-#include <libswresample/swresample.h>
-}
+#include "content.h"
 
-class AudioContent;
+class AudioBuffers;
 
 /** @class AudioDecoder.
  *  @brief Parent class for audio decoders.
  */
-class AudioDecoder : public AudioSource, public virtual Decoder
+class AudioDecoder : public virtual Decoder
 {
 public:
-	AudioDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const AudioContent>);
-	~AudioDecoder ();
+	AudioDecoder (boost::shared_ptr<const Film>);
 
-protected:
-
-	void audio (boost::shared_ptr<const AudioBuffers>, Time);
-	bool audio_done () const;
+	/** Emitted when some audio data is ready */
+	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame)> Audio;
 
-	Time _next_audio;
-	boost::shared_ptr<const AudioContent> _audio_content;
+protected:
 
-private:	
-	SwrContext* _swr_context;
+	void audio (boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
+	AudioContent::Frame _audio_position;
 };
 
 #endif
diff --git a/src/lib/audio_sink.h b/src/lib/audio_sink.h
deleted file mode 100644
index 1aad5edf9..000000000
--- a/src/lib/audio_sink.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef DCPOMATIC_AUDIO_SINK_H
-#define DCPOMATIC_AUDIO_SINK_H
-
-class AudioBuffers;
-
-class AudioSink
-{
-public:
-	/** Call with some audio data */
-	virtual void process_audio (boost::shared_ptr<const AudioBuffers>, Time) = 0;
-};
-
-#endif
diff --git a/src/lib/audio_source.cc b/src/lib/audio_source.cc
deleted file mode 100644
index e61721646..000000000
--- a/src/lib/audio_source.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "audio_source.h"
-#include "audio_sink.h"
-
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::bind;
-
-static void
-process_audio_proxy (weak_ptr<AudioSink> sink, shared_ptr<const AudioBuffers> audio, Time time)
-{
-	shared_ptr<AudioSink> p = sink.lock ();
-	if (p) {
-		p->process_audio (audio, time);
-	}
-}
-
-void
-AudioSource::connect_audio (shared_ptr<AudioSink> s)
-{
-	Audio.connect (bind (process_audio_proxy, weak_ptr<AudioSink> (s), _1, _2));
-}
-
-
diff --git a/src/lib/audio_source.h b/src/lib/audio_source.h
deleted file mode 100644
index ef47e969b..000000000
--- a/src/lib/audio_source.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file  src/audio_source.h
- *  @brief Parent class for classes which emit audio data.
- */
-
-#ifndef DCPOMATIC_AUDIO_SOURCE_H
-#define DCPOMATIC_AUDIO_SOURCE_H
-
-#include <boost/signals2.hpp>
-#include "types.h"
-
-class AudioBuffers;
-class AudioSink;
-
-/** A class that emits audio data */
-class AudioSource
-{
-public:
-	/** Emitted when some audio data is ready */
-	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, Time)> Audio;
-
-	void connect_audio (boost::shared_ptr<AudioSink>);
-};
-
-#endif
diff --git a/src/lib/black_decoder.cc b/src/lib/black_decoder.cc
deleted file mode 100644
index 0b231edd3..000000000
--- a/src/lib/black_decoder.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "black_decoder.h"
-#include "image.h"
-#include "null_content.h"
-
-using boost::shared_ptr;
-
-BlackDecoder::BlackDecoder (shared_ptr<const Film> f, shared_ptr<NullContent> c)
-	: Decoder (f)
-	, VideoDecoder (f, c)
-{
-
-}
-
-void
-BlackDecoder::pass ()
-{
-	if (!_image) {
-		_image.reset (new SimpleImage (AV_PIX_FMT_RGB24, video_size(), true));
-		_image->make_black ();
-		video (_image, false, _next_video);
-	} else {
-		video (_image, true, _next_video);
-	}
-}
-
-float
-BlackDecoder::video_frame_rate () const
-{
-	boost::shared_ptr<const Film> f = _film.lock ();
-	if (!f) {
-		return 24;
-	}
-
-	return f->dcp_video_frame_rate ();
-}
-
-ContentVideoFrame
-BlackDecoder::video_length () const
-{
-	return _video_content->length() * video_frame_rate() / TIME_HZ;
-}
-
-Time
-BlackDecoder::position () const
-{
-	return _next_video;
-}
-
-void
-BlackDecoder::seek (Time t)
-{
-	_next_video = t;
-}
-
-void
-BlackDecoder::seek_back ()
-{
-	boost::shared_ptr<const Film> f = _film.lock ();
-	if (!f) {
-		return;
-	}
-
-	_next_video -= f->video_frames_to_time (2);
-}
-
-void
-BlackDecoder::seek_forward ()
-{
-	boost::shared_ptr<const Film> f = _film.lock ();
-	if (!f) {
-		return;
-	}
-
-	_next_video += f->video_frames_to_time (1);
-}
-
-bool
-BlackDecoder::done () const
-{
-	return video_done ();
-}
-
-	
diff --git a/src/lib/black_decoder.h b/src/lib/black_decoder.h
deleted file mode 100644
index 4591881a1..000000000
--- a/src/lib/black_decoder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "video_decoder.h"
-
-class NullContent;
-
-class BlackDecoder : public VideoDecoder
-{
-public:
-	BlackDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<NullContent>);
-
-	/* Decoder */
-	
-	void pass ();
-	void seek (Time);
-	void seek_back ();
-	void seek_forward ();
-	Time position () const;
-	bool done () const;
-
-	/* VideoDecoder */
-
-	float video_frame_rate () const;
-	libdcp::Size video_size () const {
-		return libdcp::Size (256, 256);
-	}
-	ContentVideoFrame video_length () const;
-
-private:
-	boost::shared_ptr<Image> _image;
-};
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
deleted file mode 100644
index 44971d135..000000000
--- a/src/lib/combiner.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "combiner.h"
-#include "image.h"
-
-using boost::shared_ptr;
-
-Combiner::Combiner ()
-{
-
-}
-
-/** Process video for the left half of the frame.
- *  Subtitle parameter will be ignored.
- *  @param image Frame image.
- */
-void
-Combiner::process_video (shared_ptr<const Image> image, bool, Time)
-{
-	_image.reset (new SimpleImage (image, true));
-}
-
-/** Process video for the right half of the frame.
- *  @param image Frame image.
- *  @param sub Subtitle (which will be put onto the whole frame)
- */
-void
-Combiner::process_video_b (shared_ptr<const Image> image, bool, Time t)
-{
-	/* Copy the right half of this image into our _image */
-	/* XXX: this should probably be in the Image class */
-	for (int i = 0; i < image->components(); ++i) {
-		int const line_size = image->line_size()[i];
-		int const half_line_size = line_size / 2;
-
-		uint8_t* p = _image->data()[i];
-		uint8_t* q = image->data()[i];
-			
-		for (int j = 0; j < image->lines (i); ++j) {
-			memcpy (p + half_line_size, q + half_line_size, half_line_size);
-			p += _image->stride()[i];
-			q += image->stride()[i];
-		}
-	}
-
-	Video (_image, false, t);
-	_image.reset ();
-}
diff --git a/src/lib/combiner.h b/src/lib/combiner.h
deleted file mode 100644
index 46c90b4d8..000000000
--- a/src/lib/combiner.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file src/lib/combiner.h
- *  @brief Class for combining two video streams.
- */
-
-#include "video_source.h"
-#include "video_sink.h"
-
-/** @class Combiner
- *  @brief A class which can combine two video streams into one, with
- *  one image used for the left half of the screen and the other for
- *  the right.
- */
-class Combiner : public VideoSource, public VideoSink
-{
-public:
-	Combiner ();
-
-	void process_video (boost::shared_ptr<const Image> i, bool, Time);
-	void process_video_b (boost::shared_ptr<const Image> i, bool, Time);
-
-private:
-	/** The image that we are currently working on */
-	boost::shared_ptr<Image> _image;
-};
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 391b9d19a..cfca6867f 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -29,8 +29,6 @@
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
-#include "video_source.h"
-#include "audio_source.h"
 #include "film.h"
 
 class Image;
@@ -54,24 +52,6 @@ public:
 	 */
 	virtual void pass () = 0;
 
-	/** Seek this decoder to as close as possible to some time,
-	 *  expressed relative to our source's start.
-	 *  @param t Time.
-	 *  @param a true to try hard to be accurate, otherwise false.
-	 */
-	virtual void seek (Time) = 0;
-
-	/** Seek back one video frame */
-	virtual void seek_back () = 0;
-
-	/** Seek forward one video frame */
-	virtual void seek_forward () = 0;
-
-	/** @return Approximate time of the next content that we will emit,
-	 *  expressed relative to the start of our source.
-	 */
-	virtual Time position () const = 0;
-
 	virtual bool done () const = 0;
 
 protected:
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 8b2db0eb3..c3865d2c1 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -169,7 +169,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<const Image> image, bool same, Time)
+Encoder::process_video (shared_ptr<const Image> image, bool same)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
@@ -215,7 +215,7 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, Time)
 }
 
 void
-Encoder::process_audio (shared_ptr<const AudioBuffers> data, Time)
+Encoder::process_audio (shared_ptr<const AudioBuffers> data)
 {
 	_writer->write (data);
 }
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 3fe707b51..b5a641f50 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -36,8 +36,6 @@ extern "C" {
 #include <libswresample/swresample.h>
 }
 #include "util.h"
-#include "video_sink.h"
-#include "audio_sink.h"
 
 class Image;
 class AudioBuffers;
@@ -55,7 +53,7 @@ class Job;
  *  is supplied as uncompressed PCM in blocks of various sizes.
  */
 
-class Encoder : public VideoSink, public AudioSink
+class Encoder
 {
 public:
 	Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<Job>);
@@ -68,10 +66,10 @@ public:
 	 *  @param i Video frame image.
 	 *  @param same true if i is the same as the last time we were called.
 	 */
-	void process_video (boost::shared_ptr<const Image> i, bool same, Time);
+	void process_video (boost::shared_ptr<const Image> i, bool same);
 
 	/** Call with some audio data */
-	void process_audio (boost::shared_ptr<const AudioBuffers>, Time);
+	void process_audio (boost::shared_ptr<const AudioBuffers>);
 
 	/** Called when a processing run has finished */
 	void process_end ();
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 68132c5ab..1135cc9a3 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -139,7 +139,7 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
 	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
 
-	ContentVideoFrame video_length = 0;
+	VideoContent::Frame video_length = 0;
 	video_length = examiner->video_length ();
 	film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length));
 
@@ -214,12 +214,12 @@ FFmpegContent::set_audio_stream (shared_ptr<FFmpegAudioStream> s)
         signal_changed (FFmpegContentProperty::AUDIO_STREAM);
 }
 
-ContentAudioFrame
+AudioContent::Frame
 FFmpegContent::audio_length () const
 {
 	int const cafr = content_audio_frame_rate ();
 	int const vfr  = video_frame_rate ();
-	ContentVideoFrame const vl = video_length ();
+	VideoContent::Frame const vl = video_length ();
 
 	boost::mutex::scoped_lock lm (_mutex);
         if (!_audio_stream) {
@@ -296,7 +296,7 @@ FFmpegAudioStream::FFmpegAudioStream (shared_ptr<const cxml::Node> node)
 	frame_rate = node->number_child<int> ("FrameRate");
 	channels = node->number_child<int64_t> ("Channels");
 	mapping = AudioMapping (node->node_child ("Mapping"));
-	start = node->optional_number_child<Time> ("Start");
+	first_audio = node->optional_number_child<Time> ("FirstAudio");
 }
 
 void
@@ -306,8 +306,8 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const
 	root->add_child("Id")->add_child_text (lexical_cast<string> (id));
 	root->add_child("FrameRate")->add_child_text (lexical_cast<string> (frame_rate));
 	root->add_child("Channels")->add_child_text (lexical_cast<string> (channels));
-	if (start) {
-		root->add_child("Start")->add_child_text (lexical_cast<string> (start));
+	if (first_audio) {
+		root->add_child("FirstAudio")->add_child_text (lexical_cast<string> (first_audio));
 	}
 	mapping.as_xml (root->add_child("Mapping"));
 }
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 36c24c2b3..c5ccee77a 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -46,7 +46,7 @@ public:
         int frame_rate;
 	int channels;
 	AudioMapping mapping;
-	boost::optional<Time> start;
+	boost::optional<double> first_audio;
 };
 
 extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
@@ -99,7 +99,7 @@ public:
 
         /* AudioContent */
         int audio_channels () const;
-        ContentAudioFrame audio_length () const;
+        AudioContent::Frame audio_length () const;
         int content_audio_frame_rate () const;
         int output_audio_frame_rate () const;
 	AudioMapping audio_mapping () const;
@@ -134,6 +134,11 @@ public:
 
         void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
         void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
+
+	boost::optional<Time> first_video () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _first_video;
+	}
 	
 private:
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index f1d984ee1..2d1792390 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -59,15 +59,37 @@ using libdcp::Size;
 
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegContent> c, bool video, bool audio)
 	: Decoder (f)
-	, VideoDecoder (f, c)
-	, AudioDecoder (f, c)
+	, VideoDecoder (f)
+	, AudioDecoder (f)
 	, FFmpeg (c)
 	, _subtitle_codec_context (0)
 	, _subtitle_codec (0)
 	, _decode_video (video)
 	, _decode_audio (audio)
+	, _pts_offset (0)
 {
 	setup_subtitle ();
+
+	if (video && audio && c->audio_stream() && c->first_video() && c->audio_stream()->first_audio) {
+		_pts_offset = compute_pts_offset (c->first_video().get(), c->audio_stream()->first_audio.get(), c->video_frame_rate());
+	}
+}
+
+double
+FFmpegDecoder::compute_pts_offset (double first_video, double first_audio, float video_frame_rate)
+{
+	assert (first_video >= 0);
+	assert (first_audio >= 0);
+	
+	double const old_first_video = first_video;
+	
+	/* Round the first video to a frame boundary */
+	if (fabs (rint (first_video * video_frame_rate) - first_video * video_frame_rate) > 1e-6) {
+		first_video = ceil (first_video * video_frame_rate) / video_frame_rate;
+	}
+
+	/* Compute the required offset (also removing any common start delay) */
+	return first_video - old_first_video - min (first_video, first_audio);
 }
 
 FFmpegDecoder::~FFmpegDecoder ()
@@ -108,7 +130,8 @@ FFmpegDecoder::pass ()
 		}
 
 		/* Stop us being asked for any more data */
-		_next_video = _next_audio = _ffmpeg_content->length ();
+		_video_position = _ffmpeg_content->video_length ();
+		_audio_position = _ffmpeg_content->audio_length ();
 		return;
 	}
 
@@ -119,6 +142,7 @@ FFmpegDecoder::pass ()
 	} else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->id && _decode_audio) {
 		decode_audio_packet ();
 	} else if (_ffmpeg_content->subtitle_stream() && _packet.stream_index == _ffmpeg_content->subtitle_stream()->id) {
+#if 0		
 
 		int got_subtitle;
 		AVSubtitle sub;
@@ -138,6 +162,7 @@ FFmpegDecoder::pass ()
 			}
 			avsubtitle_free (&sub);
 		}
+#endif		
 	}
 
 	av_free_packet (&_packet);
@@ -256,38 +281,25 @@ FFmpegDecoder::bytes_per_audio_sample () const
 }
 
 void
-FFmpegDecoder::seek (Time t)
+FFmpegDecoder::seek (VideoContent::Frame frame)
 {
-	do_seek (t, false, false);
-	VideoDecoder::seek (t);
+	do_seek (frame, false, false);
 }
 
 void
 FFmpegDecoder::seek_back ()
 {
-	if (position() < (2.5 * TIME_HZ / _ffmpeg_content->video_frame_rate())) {
-		return;
-	}
-	
-	do_seek (position() - 2.5 * TIME_HZ / _ffmpeg_content->video_frame_rate(), true, true);
-	VideoDecoder::seek_back ();
-}
-
-void
-FFmpegDecoder::seek_forward ()
-{
-	if (position() >= (_ffmpeg_content->length() - 0.5 * TIME_HZ / _ffmpeg_content->video_frame_rate())) {
+	if (_video_position == 0) {
 		return;
 	}
 	
-	do_seek (position() - 0.5 * TIME_HZ / _ffmpeg_content->video_frame_rate(), true, true);
-	VideoDecoder::seek_forward ();
+	do_seek (_video_position - 1, true, true);
 }
 
 void
-FFmpegDecoder::do_seek (Time t, bool backwards, bool accurate)
+FFmpegDecoder::do_seek (VideoContent::Frame frame, bool backwards, bool accurate)
 {
-	int64_t const vt = t / (av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ);
+	int64_t const vt = frame * _ffmpeg_content->video_frame_rate() / av_q2d (_format_context->streams[_video_stream]->time_base);
 	av_seek_frame (_format_context, _video_stream, vt, backwards ? AVSEEK_FLAG_BACKWARD : 0);
 
 	avcodec_flush_buffers (video_codec_context());
@@ -337,17 +349,33 @@ FFmpegDecoder::decode_audio_packet ()
 		int const decode_result = avcodec_decode_audio4 (audio_codec_context(), _frame, &frame_finished, &copy_packet);
 		if (decode_result >= 0) {
 			if (frame_finished) {
-			
-				/* Where we are in the source, in seconds */
-				double const source_pts_seconds = av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
-					* av_frame_get_best_effort_timestamp(_frame);
+
+				if (_audio_position == 0) {
+					/* Where we are in the source, in seconds */
+					double const pts = av_q2d (_format_context->streams[copy_packet.stream_index]->time_base)
+						* av_frame_get_best_effort_timestamp(_frame) - _pts_offset;
+
+					if (pts > 0) {
+						/* Emit some silence */
+						shared_ptr<AudioBuffers> silence (
+							new AudioBuffers (
+								_ffmpeg_content->audio_channels(),
+								pts * _ffmpeg_content->content_audio_frame_rate()
+								)
+							);
+						
+						silence->make_silent ();
+						audio (silence, _audio_position);
+					}
+				}
+					
 				
 				int const data_size = av_samples_get_buffer_size (
 					0, audio_codec_context()->channels, _frame->nb_samples, audio_sample_format (), 1
 					);
 				
 				assert (audio_codec_context()->channels == _ffmpeg_content->audio_channels());
-				audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds * TIME_HZ);
+				audio (deinterleave_audio (_frame->data, data_size), _audio_position);
 			}
 			
 			copy_packet.data += decode_result;
@@ -398,11 +426,33 @@ FFmpegDecoder::decode_video_packet ()
 		
 		int64_t const bet = av_frame_get_best_effort_timestamp (_frame);
 		if (bet != AV_NOPTS_VALUE) {
-			/* XXX: may need to insert extra frames / remove frames here ...
-			   (as per old Matcher)
-			*/
-			Time const t = bet * av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ;
-			video (image, false, t);
+
+			double const pts = bet * av_q2d (_format_context->streams[_video_stream]->time_base) - _pts_offset;
+			double const next = _video_position / _ffmpeg_content->video_frame_rate();
+			double const one_frame = 1 / _ffmpeg_content->video_frame_rate ();
+			double delta = pts - next;
+
+			while (delta > one_frame) {
+				/* This PTS is more than one frame forward in time of where we think we should be; emit
+				   a black frame.
+				*/
+				boost::shared_ptr<Image> black (
+					new SimpleImage (
+						static_cast<AVPixelFormat> (_frame->format),
+						libdcp::Size (video_codec_context()->width, video_codec_context()->height),
+						true
+						)
+					);
+				
+				black->make_black ();
+				video (image, false, _video_position);
+				delta -= one_frame;
+			}
+
+			if (delta > -one_frame) {
+				/* This PTS is within a frame of being right; emit this (otherwise it will be dropped) */
+				video (image, false, _video_position);
+			}
 		} else {
 			shared_ptr<const Film> film = _film.lock ();
 			assert (film);
@@ -413,27 +463,6 @@ FFmpegDecoder::decode_video_packet ()
 	return true;
 }
 
-Time
-FFmpegDecoder::position () const
-{
-	if (_decode_video && _decode_audio && _ffmpeg_content->audio_stream()) {
-		return min (_next_video, _next_audio);
-	}
-
-	if (_decode_audio && _ffmpeg_content->audio_stream()) {
-		return _next_audio;
-	}
-
-	return _next_video;
-}
-
-bool
-FFmpegDecoder::done () const
-{
-	bool const ad = !_decode_audio || !_ffmpeg_content->audio_stream() || audio_done();
-	bool const vd = !_decode_video || video_done();
-	return ad && vd;
-}
 	
 void
 FFmpegDecoder::setup_subtitle ()
@@ -455,3 +484,12 @@ FFmpegDecoder::setup_subtitle ()
 		throw DecodeError (N_("could not open subtitle decoder"));
 	}
 }
+
+bool
+FFmpegDecoder::done () const
+{
+	bool const vd = !_decode_video || (_video_position >= _ffmpeg_content->video_length());
+	bool const ad = !_decode_audio || !_ffmpeg_content->audio_stream() || (_audio_position >= _ffmpeg_content->audio_length());
+	return vd && ad;
+}
+	
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 331d9be70..8f0482aad 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -38,6 +38,7 @@ extern "C" {
 #include "ffmpeg.h"
 
 class Film;
+class ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
@@ -49,23 +50,24 @@ public:
 	~FFmpegDecoder ();
 
 	void pass ();
-	void seek (Time);
+	void seek (VideoContent::Frame);
 	void seek_back ();
-	void seek_forward ();
-	Time position () const;
 	bool done () const;
 
 private:
+	friend class ::ffmpeg_pts_offset_test;
 
 	/* No copy construction */
 	FFmpegDecoder (FFmpegDecoder const &);
 	FFmpegDecoder& operator= (FFmpegDecoder const &);
 
+	static double compute_pts_offset (double, double, float);
+
 	void setup_subtitle ();
 
 	AVSampleFormat audio_sample_format () const;
 	int bytes_per_audio_sample () const;
-	void do_seek (Time, bool, bool);
+	void do_seek (VideoContent::Frame, bool, bool);
 
 	bool decode_video_packet ();
 	void decode_audio_packet ();
@@ -81,4 +83,6 @@ private:
 
 	bool _decode_video;
 	bool _decode_audio;
+
+	double _pts_offset;
 };
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index c09395e76..f45b0fe52 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -79,9 +79,9 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
 			}
 		} else {
 			for (size_t i = 0; i < _audio_streams.size(); ++i) {
-				if (_packet.stream_index == _audio_streams[i]->id && !_audio_streams[i]->start) {
+				if (_packet.stream_index == _audio_streams[i]->id && !_audio_streams[i]->first_audio) {
 					if (avcodec_decode_audio4 (context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
-						_audio_streams[i]->start = frame_time (_audio_streams[i]->id);
+						_audio_streams[i]->first_audio = frame_time (_audio_streams[i]->id);
 					}
 				}
 			}
@@ -90,7 +90,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
 		bool have_all_audio = true;
 		size_t i = 0;
 		while (i < _audio_streams.size() && have_all_audio) {
-			have_all_audio = _audio_streams[i]->start;
+			have_all_audio = _audio_streams[i]->first_audio;
 			++i;
 		}
 
@@ -102,14 +102,14 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
 	}
 }
 
-optional<Time>
+optional<double>
 FFmpegExaminer::frame_time (int stream) const
 {
-	optional<Time> t;
+	optional<double> t;
 	
 	int64_t const bet = av_frame_get_best_effort_timestamp (_frame);
 	if (bet != AV_NOPTS_VALUE) {
-		t = bet * av_q2d (_format_context->streams[stream]->time_base) * TIME_HZ;
+		t = bet * av_q2d (_format_context->streams[stream]->time_base);
 	}
 
 	return t;
@@ -134,7 +134,7 @@ FFmpegExaminer::video_size () const
 }
 
 /** @return Length (in video frames) according to our content's header */
-ContentVideoFrame
+VideoContent::Frame
 FFmpegExaminer::video_length () const
 {
 	return (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate();
diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 57b7775d4..ec84865ed 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -31,7 +31,7 @@ public:
 	
 	float video_frame_rate () const;
 	libdcp::Size video_size () const;
-	ContentVideoFrame video_length () const;
+	VideoContent::Frame video_length () const;
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
 		return _subtitle_streams;
@@ -41,15 +41,15 @@ public:
 		return _audio_streams;
 	}
 
-	boost::optional<Time> first_video () const {
+	boost::optional<double> first_video () const {
 		return _first_video;
 	}
 	
 private:
 	std::string stream_name (AVStream* s) const;
-	boost::optional<Time> frame_time (int) const;
+	boost::optional<double> frame_time (int) const;
 	
         std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
         std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
-	boost::optional<Time> _first_video;
+	boost::optional<double> _first_video;
 };
diff --git a/src/lib/image.cc b/src/lib/image.cc
index 0bff1a7cc..722ff5d3c 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -43,8 +43,9 @@ extern "C" {
 
 #include "i18n.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::min;
+using boost::shared_ptr;
 using libdcp::Size;
 
 void
diff --git a/src/lib/imagemagick_content.cc b/src/lib/imagemagick_content.cc
index f9ee8cc84..2fd65ffa0 100644
--- a/src/lib/imagemagick_content.cc
+++ b/src/lib/imagemagick_content.cc
@@ -87,7 +87,7 @@ ImageMagickContent::clone () const
 }
 
 void
-ImageMagickContent::set_video_length (ContentVideoFrame len)
+ImageMagickContent::set_video_length (VideoContent::Frame len)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
diff --git a/src/lib/imagemagick_content.h b/src/lib/imagemagick_content.h
index d7673d870..04425af08 100644
--- a/src/lib/imagemagick_content.h
+++ b/src/lib/imagemagick_content.h
@@ -43,7 +43,7 @@ public:
 	boost::shared_ptr<Content> clone () const;
 	Time length () const;
 
-	void set_video_length (ContentVideoFrame);
+	void set_video_length (VideoContent::Frame);
 
 	static bool valid_file (boost::filesystem::path);
 };
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index c9123c77c..04d3d9df7 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -34,7 +34,7 @@ using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
 	: Decoder (f)
-	, VideoDecoder (f, c)
+	, VideoDecoder (f)
 	, ImageMagick (c)
 {
 
@@ -43,12 +43,12 @@ ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<con
 void
 ImageMagickDecoder::pass ()
 {
-	if (_next_video >= _imagemagick_content->length ()) {
+	if (_video_position >= _imagemagick_content->video_length ()) {
 		return;
 	}
 
 	if (_image) {
-		video (_image, true, _next_video);
+		video (_image, true, _video_position);
 		return;
 	}
 
@@ -71,48 +71,25 @@ ImageMagickDecoder::pass ()
 
 	delete magick_image;
 
-	_image = _image->crop (_imagemagick_content->crop(), true);
-	video (_image, false, _next_video);
+	video (_image, false, _video_position);
 }
 
 void
-ImageMagickDecoder::seek (Time t)
+ImageMagickDecoder::seek (VideoContent::Frame frame)
 {
-	_next_video = t;
+	_video_position = frame;
 }
 
 void
 ImageMagickDecoder::seek_back ()
 {
-	boost::shared_ptr<const Film> f = _film.lock ();
-	if (!f) {
-		return;
-	}
-	
-	_next_video -= f->video_frames_to_time (2);
-}
-
-void
-ImageMagickDecoder::seek_forward ()
-{
-	boost::shared_ptr<const Film> f = _film.lock ();
-	if (!f) {
-		return;
+	if (_video_position > 0) {
+		_video_position--;
 	}
-	
-	_next_video += f->video_frames_to_time (1);
 }
 
-Time
-ImageMagickDecoder::position () const
-{
-	return _next_video;
-}
-
-
 bool
 ImageMagickDecoder::done () const
 {
-	return video_done ();
+	return _video_position >= _imagemagick_content->video_length ();
 }
-	
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index e169f9bc3..286f47337 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -34,10 +34,8 @@ public:
 	/* Decoder */
 
 	void pass ();
-	void seek (Time);
+	void seek (VideoContent::Frame);
 	void seek_back ();
-	void seek_forward ();
-	Time position () const;
 	bool done () const;
 
 private:
diff --git a/src/lib/imagemagick_examiner.h b/src/lib/imagemagick_examiner.h
index 827dad67e..801ede442 100644
--- a/src/lib/imagemagick_examiner.h
+++ b/src/lib/imagemagick_examiner.h
@@ -33,7 +33,7 @@ public:
 
 	float video_frame_rate () const;
 	libdcp::Size video_size () const;
-	ContentVideoFrame video_length () const;
+	VideoContent::Frame video_length () const;
 
 private:
 	boost::weak_ptr<const Film> _film;
diff --git a/src/lib/matcher.cc b/src/lib/matcher.cc
deleted file mode 100644
index 4acb82afa..000000000
--- a/src/lib/matcher.cc
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "matcher.h"
-#include "image.h"
-#include "log.h"
-
-#include "i18n.h"
-
-using std::min;
-using std::cout;
-using std::list;
-using boost::shared_ptr;
-
-Matcher::Matcher (shared_ptr<Log> log, int sample_rate, float frames_per_second)
-	: Processor (log)
-	, _sample_rate (sample_rate)
-	, _frames_per_second (frames_per_second)
-	, _video_frames (0)
-	, _audio_frames (0)
-	, _had_first_video (false)
-	, _had_first_audio (false)
-{
-
-}
-
-void
-Matcher::process_video (boost::shared_ptr<const Image> image, bool same, boost::shared_ptr<Subtitle> sub, double t)
-{
-	_pixel_format = image->pixel_format ();
-	_size = image->size ();
-
-	_log->log(String::compose("Matcher video @ %1 [audio=%2, video=%3, pending_audio=%4]", t, _audio_frames, _video_frames, _pending_audio.size()));
-
-	if (!_first_input || t < _first_input.get()) {
-		_first_input = t;
-	}
-
-	bool const this_is_first_video = !_had_first_video;
-	_had_first_video = true;
-
-	if (!_had_first_audio) {
-		/* No audio yet; we must postpone these data until we have some */
-		_pending_video.push_back (VideoRecord (image, same, sub, t));
-	} else if (this_is_first_video && _had_first_audio) {
-		/* First video since we got audio */
-		_pending_video.push_back (VideoRecord (image, same, sub, t));
-		fix_start ();
-	} else {
-		/* Normal running */
-
-		/* Difference between where this video is and where it should be */
-		double const delta = t - _first_input.get() - _video_frames / _frames_per_second;
-		double const one_frame = 1 / _frames_per_second;
-		
-		if (delta > one_frame) {
-			/* Insert frames to make up the difference */
-			int const extra = rint (delta / one_frame);
-			for (int i = 0; i < extra; ++i) {
-				repeat_last_video ();
-				_log->log (String::compose ("Extra video frame inserted at %1s", _video_frames / _frames_per_second));
-			}
-		}
-		
-		if (delta > -one_frame) {
-			Video (image, same, sub);
-			++_video_frames;
-		} else {
-			/* We are omitting a frame to keep things right */
-			_log->log (String::compose ("Frame removed at %1s; delta %2; first input was at %3", t, delta, _first_input.get()));
-		}
-		
-		_last_image = image;
-		_last_subtitle = sub;
-	}
-}
-
-void
-Matcher::process_audio (boost::shared_ptr<const AudioBuffers> b, double t)
-{
-	_channels = b->channels ();
-
-	_log->log (String::compose (
-			   "Matcher audio (%1 frames) @ %2 [video=%3, audio=%4, pending_video=%5, pending_audio=%6]",
-			   b->frames(), t, _video_frames, _audio_frames, _pending_video.size(), _pending_audio.size()
-			   )
-		);
-
-	if (!_first_input || t < _first_input.get()) {
-		_first_input = t;
-	}
-
-	bool const this_is_first_audio = !_had_first_audio;
-	_had_first_audio = true;
-	
-	if (!_had_first_video) {
-		/* No video yet; we must postpone these data until we have some */
-		_pending_audio.push_back (AudioRecord (b, t));
-	} else if (this_is_first_audio && _had_first_video) {
-		/* First audio since we got video */
-		_pending_audio.push_back (AudioRecord (b, t));
-		fix_start ();
-	} else {
-		/* Normal running.  We assume audio time stamps are consecutive, so there's no equivalent of
-		   the checking / insertion of repeat frames that there is for video.
-		*/
-		Audio (b);
-		_audio_frames += b->frames ();
-	}
-}
-
-void
-Matcher::process_end ()
-{
-	if (_audio_frames == 0 || !_pixel_format || !_size || !_channels) {
-		/* We won't do anything */
-		return;
-	}
-
-	_log->log (String::compose ("Matcher has seen %1 video frames (which equals %2 audio frames) and %3 audio frames",
-				    _video_frames, video_frames_to_audio_frames (_video_frames, _sample_rate, _frames_per_second), _audio_frames));
-	
-	match ((double (_audio_frames) / _sample_rate) - (double (_video_frames) / _frames_per_second));
-}
-
-void
-Matcher::fix_start ()
-{
-	assert (!_pending_video.empty ());
-	assert (!_pending_audio.empty ());
-	
-	_log->log (String::compose ("Fixing start; video at %1, audio at %2", _pending_video.front().time, _pending_audio.front().time));
-
-	match (_pending_video.front().time - _pending_audio.front().time);
-
-	for (list<VideoRecord>::iterator i = _pending_video.begin(); i != _pending_video.end(); ++i) {
-		process_video (i->image, i->same, i->subtitle, i->time);
-	}
-
-	_pending_video.clear ();
-
-	for (list<AudioRecord>::iterator i = _pending_audio.begin(); i != _pending_audio.end(); ++i) {
-		process_audio (i->audio, i->time);
-	}
-	
-	_pending_audio.clear ();
-}
-
-void
-Matcher::match (double extra_video_needed)
-{
-	_log->log (String::compose ("Match %1", extra_video_needed));
-	
-	if (extra_video_needed > 0) {
-
-		/* Emit black video frames */
-		
-		int const black_video_frames = ceil (extra_video_needed * _frames_per_second);
-
-		_log->log (String::compose (N_("Emitting %1 frames of black video"), black_video_frames));
-
-		shared_ptr<Image> black (new SimpleImage (_pixel_format.get(), _size.get(), true));
-		black->make_black ();
-		for (int i = 0; i < black_video_frames; ++i) {
-			Video (black, i != 0, shared_ptr<Subtitle>());
-			++_video_frames;
-		}
-
-		extra_video_needed -= black_video_frames / _frames_per_second;
-	}
-
-	if (extra_video_needed < 0) {
-		
-		/* Emit silence */
-		
-		int64_t to_do = -extra_video_needed * _sample_rate;
-		_log->log (String::compose (N_("Emitting %1 frames of silence"), to_do));
-
-		/* Do things in half second blocks as I think there may be limits
-		   to what FFmpeg (and in particular the resampler) can cope with.
-		*/
-		int64_t const block = _sample_rate / 2;
-		shared_ptr<AudioBuffers> b (new AudioBuffers (_channels.get(), block));
-		b->make_silent ();
-		
-		while (to_do > 0) {
-			int64_t const this_time = min (to_do, block);
-			b->set_frames (this_time);
-			Audio (b);
-			_audio_frames += b->frames ();
-			to_do -= this_time;
-		}
-	}
-}
-
-void
-Matcher::repeat_last_video ()
-{
-	if (!_last_image) {
-		shared_ptr<Image> im (new SimpleImage (_pixel_format.get(), _size.get(), true));
-		im->make_black ();
-		_last_image = im;
-	}
-
-	Video (_last_image, true, _last_subtitle);
-	++_video_frames;
-}
-
diff --git a/src/lib/matcher.h b/src/lib/matcher.h
deleted file mode 100644
index 61fd81436..000000000
--- a/src/lib/matcher.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <boost/optional.hpp>
-#include "processor.h"
-
-class Matcher : public Processor, public TimedAudioSink, public TimedVideoSink, public AudioSource, public VideoSource 
-{
-public:
-	Matcher (boost::shared_ptr<Log> log, int sample_rate, float frames_per_second);
-	void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
-	void process_audio (boost::shared_ptr<const AudioBuffers>, double);
-	void process_end ();
-
-private:
-	void fix_start ();
-	void match (double);
-	void repeat_last_video ();
-	
-	int _sample_rate;
-	float _frames_per_second;
-	int _video_frames;
-	int64_t _audio_frames;
-	boost::optional<AVPixelFormat> _pixel_format;
-	boost::optional<libdcp::Size> _size;
-	boost::optional<int> _channels;
-
-	struct VideoRecord {
-		VideoRecord (boost::shared_ptr<const Image> i, bool s, boost::shared_ptr<Subtitle> u, double t)
-			: image (i)
-			, same (s)
-			, subtitle (u)
-			, time (t)
-		{}
-
-		boost::shared_ptr<const Image> image;
-		bool same;
-		boost::shared_ptr<Subtitle> subtitle;
-		double time;
-	};
-
-	struct AudioRecord {
-		AudioRecord (boost::shared_ptr<const AudioBuffers> a, double t)
-			: audio (a)
-			, time (t)
-		{}
-		
-		boost::shared_ptr<const AudioBuffers> audio;
-		double time;
-	};
-
-	std::list<VideoRecord> _pending_video;
-	std::list<AudioRecord> _pending_audio;
-
-	boost::optional<double> _first_input;
-	boost::shared_ptr<const Image> _last_image;
-	boost::shared_ptr<Subtitle> _last_subtitle;
-
-	bool _had_first_video;
-	bool _had_first_audio;
-};
diff --git a/src/lib/null_content.cc b/src/lib/null_content.cc
deleted file mode 100644
index 3bbda92da..000000000
--- a/src/lib/null_content.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "null_content.h"
-#include "film.h"
-
-using boost::shared_ptr;
-
-NullContent::NullContent (shared_ptr<const Film> f, Time s, Time len)
-	: Content (f, s)
-	, VideoContent (f, s, f->time_to_video_frames (len))
-	, AudioContent (f, s)
-	, _audio_length (f->time_to_audio_frames (len))
-	, _length (len)
-{
-
-}
-
-int
-NullContent::content_audio_frame_rate () const
-{
-	return output_audio_frame_rate ();
-}
-	
-
-int
-NullContent::output_audio_frame_rate () const
-{
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	return film->dcp_audio_frame_rate ();
-}
-
-int
-NullContent::audio_channels () const
-{
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	return film->dcp_audio_channels ();
-}
-	
diff --git a/src/lib/null_content.h b/src/lib/null_content.h
deleted file mode 100644
index 889ff7a0d..000000000
--- a/src/lib/null_content.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include "video_content.h"
-#include "audio_content.h"
-
-class NullContent : public VideoContent, public AudioContent
-{
-public:
-	NullContent (boost::shared_ptr<const Film>, Time, Time);
-
-	std::string summary () const {
-		return "";
-	}
-	
-	std::string information () const {
-		return "";
-	}
-
-	void as_xml (xmlpp::Node *) const {}
-	
-	boost::shared_ptr<Content> clone () const {
-		return boost::shared_ptr<Content> ();
-	}
-
-        int audio_channels () const;
-	
-        ContentAudioFrame audio_length () const {
-		return _audio_length;
-	}
-	
-        int content_audio_frame_rate () const;
-	
-	int output_audio_frame_rate () const;
-	
-	AudioMapping audio_mapping () const {
-		return AudioMapping ();
-	}
-
-	void set_audio_mapping (AudioMapping) {}
-	
-	Time length () const {
-		return _length;
-	}
-
-private:
-	ContentAudioFrame _audio_length;
-	Time _length;
-};
diff --git a/src/lib/player.cc b/src/lib/player.cc
index cd1c54d5b..9969fbf9e 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -29,43 +29,48 @@
 #include "playlist.h"
 #include "job.h"
 #include "image.h"
-#include "null_content.h"
-#include "black_decoder.h"
-#include "silence_decoder.h"
+#include "ratio.h"
+#include "resampler.h"
 
 using std::list;
 using std::cout;
 using std::min;
 using std::max;
 using std::vector;
+using std::pair;
+using std::map;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
 #define DEBUG_PLAYER 1
 
-struct Piece
+class Piece
 {
+public:
+	Piece (shared_ptr<Content> c)
+		: content (c)
+		, video_position (c->start ())
+		, audio_position (c->start ())
+	{}
+	
 	Piece (shared_ptr<Content> c, shared_ptr<Decoder> d)
 		: content (c)
 		, decoder (d)
+		, video_position (c->start ())
+		, audio_position (c->start ())
 	{}
 	
 	shared_ptr<Content> content;
 	shared_ptr<Decoder> decoder;
+	Time video_position;
+	Time audio_position;
 };
-	
 
 #ifdef DEBUG_PLAYER
 std::ostream& operator<<(std::ostream& s, Piece const & p)
 {
-	if (dynamic_pointer_cast<NullContent> (p.content)) {
-		if (dynamic_pointer_cast<SilenceDecoder> (p.decoder)) {
-			s << "\tsilence    ";
-		} else {
-			s << "\tblack      ";
-		}
-	} else if (dynamic_pointer_cast<FFmpegContent> (p.content)) {
+	if (dynamic_pointer_cast<FFmpegContent> (p.content)) {
 		s << "\tffmpeg     ";
 	} else if (dynamic_pointer_cast<ImageMagickContent> (p.content)) {
 		s << "\timagemagick";
@@ -85,12 +90,13 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	, _video (true)
 	, _audio (true)
 	, _have_valid_pieces (false)
-	, _position (0)
+	, _video_position (0)
+	, _audio_position (0)
 	, _audio_buffers (f->dcp_audio_channels(), 0)
-	, _next_audio (0)
 {
 	_playlist->Changed.connect (bind (&Player::playlist_changed, this));
 	_playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2));
+	set_video_container_size (_film->container()->size (_film->full_frame ()));
 }
 
 void
@@ -113,77 +119,186 @@ Player::pass ()
 		_have_valid_pieces = true;
 	}
 
-        /* Here we are just finding the active decoder with the earliest last emission time, then
-           calling pass on it.
-        */
+#ifdef DEBUG_PLAYER
+	cout << "= PASS\n";
+#endif	
 
         Time earliest_t = TIME_MAX;
         shared_ptr<Piece> earliest;
+	enum {
+		VIDEO,
+		AUDIO
+	} type = VIDEO;
 
 	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
 		if ((*i)->decoder->done ()) {
 			continue;
 		}
 
-		if (!_audio && dynamic_pointer_cast<AudioDecoder> ((*i)->decoder) && !dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
-			continue;
+		if (dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
+			if ((*i)->video_position < earliest_t) {
+				earliest_t = (*i)->video_position;
+				earliest = *i;
+				type = VIDEO;
+			}
 		}
-		
-		Time const t = (*i)->content->start() + (*i)->decoder->position();
-		if (t < earliest_t) {
-			earliest_t = t;
-			earliest = *i;
+
+		if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
+			if ((*i)->audio_position < earliest_t) {
+				earliest_t = (*i)->audio_position;
+				earliest = *i;
+				type = AUDIO;
+			}
 		}
 	}
 
 	if (!earliest) {
+#ifdef DEBUG_PLAYER
+		cout << "no earliest piece.\n";
+#endif		
+		
 		flush ();
 		return true;
 	}
 
-	earliest->decoder->pass ();
-	_position = earliest->content->start() + earliest->decoder->position ();
+	switch (type) {
+	case VIDEO:
+		if (earliest_t > _video_position) {
+#ifdef DEBUG_PLAYER
+			cout << "no video here; emitting black frame.\n";
+#endif
+			emit_black ();
+		} else {
+#ifdef DEBUG_PLAYER
+			cout << "Pass " << *earliest << "\n";
+#endif			
+			earliest->decoder->pass ();
+		}
+		break;
+
+	case AUDIO:
+		if (earliest_t > _audio_position) {
+#ifdef DEBUG_PLAYER
+			cout << "no audio here; emitting silence.\n";
+#endif
+			emit_silence (_film->time_to_audio_frames (earliest_t - _audio_position));
+		} else {
+#ifdef DEBUG_PLAYER
+			cout << "Pass " << *earliest << "\n";
+#endif			
+			earliest->decoder->pass ();
+		}
+		break;
+	}
+
+#ifdef DEBUG_PLAYER
+	cout << "\tpost pass " << _video_position << " " << _audio_position << "\n";
+#endif	
 
         return false;
 }
 
 void
-Player::process_video (weak_ptr<Content> weak_content, shared_ptr<const Image> image, bool same, Time time)
+Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
 {
-	shared_ptr<Content> content = weak_content.lock ();
-	if (!content) {
+	shared_ptr<Piece> piece = weak_piece.lock ();
+	if (!piece) {
 		return;
 	}
+
+	shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content);
+	assert (content);
+
+	FrameRateConversion frc (content->video_frame_rate(), _film->dcp_video_frame_rate());
+	if (frc.skip && (frame % 2) == 1) {
+		return;
+	}
+
+	image = image->crop (content->crop(), true);
+
+	libdcp::Size const image_size = content->ratio()->size (_video_container_size);
 	
-	time += content->start ();
+	image = image->scale_and_convert_to_rgb (image_size, _film->scaler(), true);
+
+#if 0	
+	if (film->with_subtitles ()) {
+		shared_ptr<Subtitle> sub;
+		if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
+			sub = _timed_subtitle->subtitle ();
+		}
+		
+		if (sub) {
+			dcpomatic::Rect const tx = subtitle_transformed_area (
+				float (image_size.width) / content->video_size().width,
+				float (image_size.height) / content->video_size().height,
+				sub->area(), film->subtitle_offset(), film->subtitle_scale()
+				);
+			
+			shared_ptr<Image> im = sub->image()->scale (tx.size(), film->scaler(), true);
+			image->alpha_blend (im, tx.position());
+		}
+	}
+#endif	
+
+	if (image_size != _video_container_size) {
+		assert (image_size.width <= _video_container_size.width);
+		assert (image_size.height <= _video_container_size.height);
+		shared_ptr<Image> im (new SimpleImage (PIX_FMT_RGB24, _video_container_size, true));
+		im->make_black ();
+		im->copy (image, Position ((_video_container_size.width - image_size.width) / 2, (_video_container_size.height - image_size.height) / 2));
+		image = im;
+	}
+
+	Time time = content->start() + (frame * frc.factor() * TIME_HZ / _film->dcp_video_frame_rate());
 	
         Video (image, same, time);
+	time += TIME_HZ / _film->dcp_video_frame_rate();
+
+	if (frc.repeat) {
+		Video (image, true, time);
+		time += TIME_HZ / _film->dcp_video_frame_rate();
+	}
+
+	_video_position = piece->video_position = time;
 }
 
 void
-Player::process_audio (weak_ptr<Content> weak_content, shared_ptr<const AudioBuffers> audio, Time time)
+Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers> audio, AudioContent::Frame frame)
 {
-	shared_ptr<Content> content = weak_content.lock ();
-	if (!content) {
+	shared_ptr<Piece> piece = weak_piece.lock ();
+	if (!piece) {
 		return;
 	}
-	
+
+	shared_ptr<AudioContent> content = dynamic_pointer_cast<AudioContent> (piece->content);
+	assert (content);
+
+	if (content->content_audio_frame_rate() != content->output_audio_frame_rate()) {
+		audio = resampler(content)->run (audio);
+	}
+
+	/* Remap channels */
+	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->dcp_audio_channels(), audio->frames()));
+	dcp_mapped->make_silent ();
+	list<pair<int, libdcp::Channel> > map = content->audio_mapping().content_to_dcp ();
+	for (list<pair<int, libdcp::Channel> >::iterator i = map.begin(); i != map.end(); ++i) {
+		dcp_mapped->accumulate_channel (audio.get(), i->first, i->second);
+	}
+
         /* The time of this audio may indicate that some of our buffered audio is not going to
            be added to any more, so it can be emitted.
         */
 
-	time += content->start ();
+	Time const time = content->start() + (frame * TIME_HZ / _film->dcp_audio_frame_rate());
 
-	cout << "Player gets " << audio->frames() << " @ " << time << " cf " << _next_audio << "\n";
-
-        if (time > _next_audio) {
+        if (time > _audio_position) {
                 /* We can emit some audio from our buffers */
-                OutputAudioFrame const N = _film->time_to_audio_frames (time - _next_audio);
+                OutputAudioFrame const N = _film->time_to_audio_frames (time - _audio_position);
 		assert (N <= _audio_buffers.frames());
                 shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), N));
                 emit->copy_from (&_audio_buffers, N, 0, 0);
-                Audio (emit, _next_audio);
-                _next_audio += _film->audio_frames_to_time (N);
+                Audio (emit, _audio_position);
+                _audio_position = piece->audio_position = time + _film->audio_frames_to_time (N);
 
                 /* And remove it from our buffers */
                 if (_audio_buffers.frames() > N) {
@@ -204,10 +319,19 @@ Player::flush ()
 	if (_audio_buffers.frames() > 0) {
 		shared_ptr<AudioBuffers> emit (new AudioBuffers (_audio_buffers.channels(), _audio_buffers.frames()));
 		emit->copy_from (&_audio_buffers, _audio_buffers.frames(), 0, 0);
-		Audio (emit, _next_audio);
-		_next_audio += _film->audio_frames_to_time (_audio_buffers.frames ());
+		Audio (emit, _audio_position);
+		_audio_position += _film->audio_frames_to_time (_audio_buffers.frames ());
 		_audio_buffers.set_frames (0);
 	}
+
+	while (_video_position < _audio_position) {
+		emit_black ();
+	}
+
+	while (_audio_position < _video_position) {
+		emit_silence (_film->time_to_audio_frames (_video_position - _audio_position));
+	}
+	
 }
 
 /** @return true on error */
@@ -224,10 +348,18 @@ Player::seek (Time t)
 	}
 
 	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		Time s = t - (*i)->content->start ();
+		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> ((*i)->content);
+		if (!vc) {
+			continue;
+		}
+		
+		Time s = t - vc->start ();
 		s = max (static_cast<Time> (0), s);
-		s = min ((*i)->content->length(), s);
-		(*i)->decoder->seek (s);
+		s = min (vc->length(), s);
+
+		FrameRateConversion frc (vc->video_frame_rate(), _film->dcp_video_frame_rate());
+		VideoContent::Frame f = s * _film->dcp_video_frame_rate() / (frc.factor() * TIME_HZ);
+		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (f);
 	}
 
 	/* XXX: don't seek audio because we don't need to... */
@@ -240,32 +372,6 @@ Player::seek_back ()
 
 }
 
-void
-Player::seek_forward ()
-{
-
-}
-
-void
-Player::add_black_piece (Time s, Time len)
-{
-	shared_ptr<NullContent> nc (new NullContent (_film, s, len));
-	nc->set_ratio (_film->container ());
-	shared_ptr<BlackDecoder> bd (new BlackDecoder (_film, nc));
-	bd->Video.connect (bind (&Player::process_video, this, nc, _1, _2, _3));
-	_pieces.push_back (shared_ptr<Piece> (new Piece (nc, bd)));
-}
-
-void
-Player::add_silent_piece (Time s, Time len)
-{
-	shared_ptr<NullContent> nc (new NullContent (_film, s, len));
-	shared_ptr<SilenceDecoder> sd (new SilenceDecoder (_film, nc));
-	sd->Audio.connect (bind (&Player::process_audio, this, nc, _1, _2));
-	_pieces.push_back (shared_ptr<Piece> (new Piece (nc, sd)));
-}
-
-
 void
 Player::setup_pieces ()
 {
@@ -278,21 +384,18 @@ Player::setup_pieces ()
 	
 	for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 
-		shared_ptr<Decoder> decoder;
-		
+		shared_ptr<Piece> piece (new Piece (*i));
+
                 /* XXX: into content? */
 
 		shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
 		if (fc) {
 			shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio));
 			
-			fd->Video.connect (bind (&Player::process_video, this, *i, _1, _2, _3));
-			fd->Audio.connect (bind (&Player::process_audio, this, *i, _1, _2));
-			if (_video_container_size) {
-				fd->set_video_container_size (_video_container_size.get ());
-			}
+			fd->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3));
+			fd->Audio.connect (bind (&Player::process_audio, this, piece, _1, _2));
 
-			decoder = fd;
+			piece->decoder = fd;
 		}
 		
 		shared_ptr<const ImageMagickContent> ic = dynamic_pointer_cast<const ImageMagickContent> (*i);
@@ -309,54 +412,21 @@ Player::setup_pieces ()
 
 			if (!id) {
 				id.reset (new ImageMagickDecoder (_film, ic));
-				id->Video.connect (bind (&Player::process_video, this, *i, _1, _2, _3));
-				if (_video_container_size) {
-					id->set_video_container_size (_video_container_size.get ());
-				}
+				id->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3));
 			}
 
-			decoder = id;
+			piece->decoder = id;
 		}
 
 		shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
 		if (sc) {
 			shared_ptr<AudioDecoder> sd (new SndfileDecoder (_film, sc));
-			sd->Audio.connect (bind (&Player::process_audio, this, *i, _1, _2));
+			sd->Audio.connect (bind (&Player::process_audio, this, piece, _1, _2));
 
-			decoder = sd;
+			piece->decoder = sd;
 		}
 
-		_pieces.push_back (shared_ptr<Piece> (new Piece (*i, decoder)));
-	}
-
-	/* Fill in visual gaps with black and audio gaps with silence */
-
-	Time video_pos = 0;
-	Time audio_pos = 0;
-	list<shared_ptr<Piece> > pieces_copy = _pieces;
-	for (list<shared_ptr<Piece> >::iterator i = pieces_copy.begin(); i != pieces_copy.end(); ++i) {
-		if (dynamic_pointer_cast<VideoContent> ((*i)->content)) {
-			Time const diff = (*i)->content->start() - video_pos;
-			if (diff > 0) {
-				add_black_piece (video_pos, diff);
-			}
-			video_pos = (*i)->content->end();
-		}
-
-		shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> ((*i)->content);
-		if (ac && ac->audio_channels()) {
-			Time const diff = (*i)->content->start() - audio_pos;
-			if (diff > 0) {
-				add_silent_piece (video_pos, diff);
-			}
-			audio_pos = (*i)->content->end();
-		}
-	}
-
-	if (video_pos < audio_pos) {
-		add_black_piece (video_pos, audio_pos - video_pos);
-	} else if (audio_pos < video_pos) {
-		add_silent_piece (audio_pos, video_pos - audio_pos);
+		_pieces.push_back (piece);
 	}
 
 #ifdef DEBUG_PLAYER
@@ -390,10 +460,40 @@ void
 Player::set_video_container_size (libdcp::Size s)
 {
 	_video_container_size = s;
-	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-		shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> ((*i)->decoder);
-		if (vd) {
-			vd->set_video_container_size (s);
-		}
+	_black_frame.reset (new SimpleImage (PIX_FMT_RGB24, _video_container_size, true));
+	_black_frame->make_black ();
+}
+
+shared_ptr<Resampler>
+Player::resampler (shared_ptr<AudioContent> c)
+{
+	map<shared_ptr<AudioContent>, shared_ptr<Resampler> >::iterator i = _resamplers.find (c);
+	if (i != _resamplers.end ()) {
+		return i->second;
 	}
+	
+	shared_ptr<Resampler> r (new Resampler (c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()));
+	_resamplers[c] = r;
+	return r;
 }
+
+void
+Player::emit_black ()
+{
+	/* XXX: use same here */
+	Video (_black_frame, false, _video_position);
+	_video_position += _film->video_frames_to_time (1);
+}
+
+void
+Player::emit_silence (OutputAudioFrame most)
+{
+	OutputAudioFrame N = min (most, _film->dcp_audio_frame_rate() / 2);
+	shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->dcp_audio_channels(), N));
+	silence->make_silent ();
+	Audio (silence, _audio_position);
+	_audio_position += _film->audio_frames_to_time (N);
+}
+
+	
+	
diff --git a/src/lib/player.h b/src/lib/player.h
index e4fb83220..bbdb14ec2 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -23,24 +23,23 @@
 #include <list>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include "video_source.h"
-#include "audio_source.h"
-#include "video_sink.h"
-#include "audio_sink.h"
 #include "playlist.h"
 #include "audio_buffers.h"
+#include "content.h"
 
 class Job;
 class Film;
 class Playlist;
 class AudioContent;
 class Piece;
+class Image;
+class Resampler;
 
 /** @class Player
  *  @brief A class which can `play' a Playlist; emitting its audio and video.
  */
  
-class Player : public VideoSource, public AudioSource, public boost::enable_shared_from_this<Player>
+class Player : public boost::enable_shared_from_this<Player>
 {
 public:
 	Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
@@ -51,26 +50,35 @@ public:
 	bool pass ();
 	void seek (Time);
 	void seek_back ();
-	void seek_forward ();
 
-	/** @return position that we are at; ie the time of the next thing we will emit on pass() */
-	Time position () const {
-		return _position;
+	Time video_position () const {
+		return _video_position;
 	}
 
 	void set_video_container_size (libdcp::Size);
 
+	/** Emitted when a video frame is ready.
+	 *  First parameter is the video image.
+	 *  Second parameter is true if the image is the same as the last one that was emitted.
+	 *  Third parameter is the time.
+	 */
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, Time)> Video;
+	
+	/** Emitted when some audio data is ready */
+	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, Time)> Audio;
+
 private:
 
-	void process_video (boost::weak_ptr<Content>, boost::shared_ptr<const Image>, bool, Time);
-	void process_audio (boost::weak_ptr<Content>, boost::shared_ptr<const AudioBuffers>, Time);
+	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, bool, VideoContent::Frame);
+	void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
 	void setup_pieces ();
 	void playlist_changed ();
 	void content_changed (boost::weak_ptr<Content>, int);
 	void do_seek (Time, bool);
-	void add_black_piece (Time, Time);
-	void add_silent_piece (Time, Time);
 	void flush ();
+	void emit_black ();
+	void emit_silence (OutputAudioFrame);
+	boost::shared_ptr<Resampler> resampler (boost::shared_ptr<AudioContent>);
 
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<const Playlist> _playlist;
@@ -81,10 +89,17 @@ private:
 	/** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */
 	bool _have_valid_pieces;
 	std::list<boost::shared_ptr<Piece> > _pieces;
-	Time _position;
+
+	/** The time after the last video that we emitted */
+	Time _video_position;
+	/** The time after the last audio that we emitted */
+	Time _audio_position;
+
 	AudioBuffers _audio_buffers;
-	Time _next_audio;
-	boost::optional<libdcp::Size> _video_container_size;
+
+	libdcp::Size _video_container_size;
+	boost::shared_ptr<Image> _black_frame;
+	std::map<boost::shared_ptr<AudioContent>, boost::shared_ptr<Resampler> > _resamplers;
 };
 
 #endif
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index e4f4c79f0..2d243fe8f 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -23,10 +23,6 @@
 #include <list>
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include "video_source.h"
-#include "audio_source.h"
-#include "video_sink.h"
-#include "audio_sink.h"
 #include "ffmpeg_content.h"
 #include "audio_mapping.h"
 
diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
new file mode 100644
index 000000000..1235b9038
--- /dev/null
+++ b/src/lib/resampler.cc
@@ -0,0 +1,61 @@
+extern "C" {
+#include "libavutil/channel_layout.h"
+}	
+#include "resampler.h"
+#include "audio_buffers.h"
+#include "exceptions.h"
+
+#include "i18n.h"
+
+using boost::shared_ptr;
+
+Resampler::Resampler (int in, int out, int channels)
+	: _in_rate (in)
+	, _out_rate (out)
+	, _channels (channels)
+{
+	/* We will be using planar float data when we call the
+	   resampler.  As far as I can see, the audio channel
+	   layout is not necessary for our purposes; it seems
+	   only to be used get the number of channels and
+	   decide if rematrixing is needed.  It won't be, since
+	   input and output layouts are the same.
+	*/
+
+	_swr_context = swr_alloc_set_opts (
+		0,
+		av_get_default_channel_layout (_channels),
+		AV_SAMPLE_FMT_FLTP,
+		_out_rate,
+		av_get_default_channel_layout (_channels),
+		AV_SAMPLE_FMT_FLTP,
+		_in_rate,
+		0, 0
+		);
+	
+	swr_init (_swr_context);
+}
+
+Resampler::~Resampler ()
+{
+	swr_free (&_swr_context);
+}
+
+shared_ptr<const AudioBuffers>
+Resampler::run (shared_ptr<const AudioBuffers> in)
+{
+	/* Compute the resampled frames count and add 32 for luck */
+	int const max_resampled_frames = ceil ((double) in->frames() * _out_rate / _in_rate) + 32;
+	shared_ptr<AudioBuffers> resampled (new AudioBuffers (_channels, max_resampled_frames));
+
+	int const resampled_frames = swr_convert (
+		_swr_context, (uint8_t **) resampled->data(), max_resampled_frames, (uint8_t const **) in->data(), in->frames()
+		);
+	
+	if (resampled_frames < 0) {
+		throw EncodeError (_("could not run sample-rate converter"));
+	}
+	
+	resampled->set_frames (resampled_frames);
+	return resampled;
+}	
diff --git a/src/lib/resampler.h b/src/lib/resampler.h
new file mode 100644
index 000000000..cda718934
--- /dev/null
+++ b/src/lib/resampler.h
@@ -0,0 +1,21 @@
+#include <boost/shared_ptr.hpp>
+extern "C" {
+#include <libswresample/swresample.h>
+}
+
+class AudioBuffers;
+
+class Resampler
+{
+public:
+	Resampler (int, int, int);
+	~Resampler ();
+
+	boost::shared_ptr<const AudioBuffers> run (boost::shared_ptr<const AudioBuffers>);
+
+private:	
+	SwrContext* _swr_context;
+	int _in_rate;
+	int _out_rate;
+	int _channels;
+};
diff --git a/src/lib/silence_decoder.cc b/src/lib/silence_decoder.cc
deleted file mode 100644
index 0380117ce..000000000
--- a/src/lib/silence_decoder.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "silence_decoder.h"
-#include "null_content.h"
-#include "audio_buffers.h"
-
-using std::min;
-using std::cout;
-using boost::shared_ptr;
-
-SilenceDecoder::SilenceDecoder (shared_ptr<const Film> f, shared_ptr<NullContent> c)
-	: Decoder (f)
-	, AudioDecoder (f, c)
-{
-	
-}
-
-void
-SilenceDecoder::pass ()
-{
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-
-	Time const this_time = min (_audio_content->length() - _next_audio, TIME_HZ / 2);
-	cout << "silence emit " << this_time << " from " << _audio_content->length() << "\n";
-	shared_ptr<AudioBuffers> data (new AudioBuffers (film->dcp_audio_channels(), film->time_to_audio_frames (this_time)));
-	data->make_silent ();
-	audio (data, _next_audio);
-}
-
-void
-SilenceDecoder::seek (Time t)
-{
-	_next_audio = t;
-}
-
-void
-SilenceDecoder::seek_back ()
-{
-	boost::shared_ptr<const Film> f = _film.lock ();
-	if (!f) {
-		return;
-	}
-
-	_next_audio -= f->video_frames_to_time (2);
-}
-
-void
-SilenceDecoder::seek_forward ()
-{
-	boost::shared_ptr<const Film> f = _film.lock ();
-	if (!f) {
-		return;
-	}
-
-	_next_audio += f->video_frames_to_time (1);
-}
-
-Time
-SilenceDecoder::position () const
-{
-	return _next_audio;
-}
-
-bool
-SilenceDecoder::done () const
-{
-	return audio_done ();
-}
-
diff --git a/src/lib/silence_decoder.h b/src/lib/silence_decoder.h
deleted file mode 100644
index a8a335d39..000000000
--- a/src/lib/silence_decoder.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <boost/shared_ptr.hpp>
-#include "audio_decoder.h"
-
-class Film;
-class NullContent;
-
-class SilenceDecoder : public AudioDecoder
-{
-public:
-	SilenceDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<NullContent>);
-
-	void pass ();
-	void seek (Time);
-	void seek_back ();
-	void seek_forward ();
-	Time position () const;
-	bool done () const;
-};
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 8eede89f4..beee7cd9d 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -46,7 +46,7 @@ SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml:
 	, AudioContent (f, node)
 {
 	_audio_channels = node->number_child<int> ("AudioChannels");
-	_audio_length = node->number_child<ContentAudioFrame> ("AudioLength");
+	_audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
 	_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
 	_audio_mapping = AudioMapping (node->node_child ("AudioMapping"));
 }
diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 30eb23a4e..876d66088 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -49,7 +49,7 @@ public:
 		return _audio_channels;
 	}
 	
-        ContentAudioFrame audio_length () const {
+        AudioContent::Frame audio_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _audio_length;
 	}
@@ -72,7 +72,7 @@ public:
 
 private:
 	int _audio_channels;
-	ContentAudioFrame _audio_length;
+	AudioContent::Frame _audio_length;
 	int _audio_frame_rate;
 	AudioMapping _audio_mapping;
 };
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index ff56f1062..80a6afd2b 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -35,7 +35,7 @@ using boost::shared_ptr;
 
 SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
 	: Decoder (f)
-	, AudioDecoder (f, c)
+	, AudioDecoder (f)
 	, _sndfile_content (c)
 	, _deinterleave_buffer (0)
 {
@@ -100,7 +100,7 @@ SndfileDecoder::audio_channels () const
 	return _info.channels;
 }
 
-ContentAudioFrame
+AudioContent::Frame
 SndfileDecoder::audio_length () const
 {
 	return _info.frames;
@@ -112,14 +112,8 @@ SndfileDecoder::audio_frame_rate () const
 	return _info.samplerate;
 }
 
-Time
-SndfileDecoder::position () const
-{
-	return _next_audio;
-}
-
 bool
 SndfileDecoder::done () const
 {
-	return audio_done ();
+	return _audio_position >= _sndfile_content->audio_length ();
 }
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index e904340b3..77fa6d177 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -30,21 +30,17 @@ public:
 	~SndfileDecoder ();
 
 	void pass ();
-	void seek (Time) {}
-	void seek_back () {}
-	void seek_forward () {}
-	Time position () const;
 	bool done () const;
 
 	int audio_channels () const;
-	ContentAudioFrame audio_length () const;
+	AudioContent::Frame audio_length () const;
 	int audio_frame_rate () const;
 
 private:
 	boost::shared_ptr<const SndfileContent> _sndfile_content;
 	SNDFILE* _sndfile;
 	SF_INFO _info;
-	ContentAudioFrame _done;
-	ContentAudioFrame _remaining;
+	AudioContent::Frame _done;
+	AudioContent::Frame _remaining;
 	float* _deinterleave_buffer;
 };
diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
index 5e719f977..7013f1d7d 100644
--- a/src/lib/subtitle.cc
+++ b/src/lib/subtitle.cc
@@ -27,8 +27,7 @@
 
 #include "i18n.h"
 
-using namespace std;
-using namespace boost;
+using boost::shared_ptr;
 using libdcp::Size;
 
 /** Construct a TimedSubtitle.  This is a subtitle image, position,
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index f4637a05c..f4a52639a 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -36,8 +36,27 @@
 
 using std::string;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
+static void
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<const Image> image, bool same)
+{
+	shared_ptr<Encoder> e = encoder.lock ();
+	if (e) {
+		e->process_video (image, same);
+	}
+}
+
+static void
+audio_proxy (weak_ptr<Encoder> encoder, shared_ptr<const AudioBuffers> audio)
+{
+	shared_ptr<Encoder> e = encoder.lock ();
+	if (e) {
+		e->process_audio (audio);
+	}
+}
+
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
  *  @param f Film that we are transcoding.
  *  @param j Job that we are running under, or 0.
@@ -48,8 +67,8 @@ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	, _player (f->player ())
 	, _encoder (new Encoder (f, j))
 {
-	_player->connect_video (_encoder);
-	_player->connect_audio (_encoder);
+	_player->Video.connect (bind (video_proxy, _encoder, _1, _2));
+	_player->Audio.connect (bind (audio_proxy, _encoder, _1));
 }
 
 void
diff --git a/src/lib/types.h b/src/lib/types.h
index 70262afb0..33f8239d8 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -27,8 +27,6 @@
 
 class Content;
 
-typedef int64_t ContentAudioFrame;
-typedef int     ContentVideoFrame;
 typedef int64_t Time;
 #define TIME_MAX INT64_MAX
 #define TIME_HZ  ((Time) 96000)
diff --git a/src/lib/util.cc b/src/lib/util.cc
index eda0d0236..d425fc8fe 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -710,7 +710,7 @@ ensure_ui_thread ()
  *  @return Equivalent number of audio frames for `v'.
  */
 int64_t
-video_frames_to_audio_frames (ContentVideoFrame v, float audio_sample_rate, float frames_per_second)
+video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second)
 {
 	return ((int64_t) v * audio_sample_rate / frames_per_second);
 }
diff --git a/src/lib/util.h b/src/lib/util.h
index 42514a12c..c68bb4f16 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -38,6 +38,7 @@ extern "C" {
 }
 #include "compose.hpp"
 #include "types.h"
+#include "video_content.h"
 
 #ifdef DCPOMATIC_DEBUG
 #define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
@@ -152,7 +153,7 @@ private:
 	int _timeout;
 };
 
-extern int64_t video_frames_to_audio_frames (ContentVideoFrame v, float audio_sample_rate, float frames_per_second);
+extern int64_t video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second);
 
 class LocaleGuard
 {
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index f9de6aa21..3818fa792 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -22,6 +22,7 @@
 #include "video_content.h"
 #include "video_examiner.h"
 #include "ratio.h"
+#include "compose.hpp"
 
 #include "i18n.h"
 
@@ -37,7 +38,7 @@ using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::optional;
 
-VideoContent::VideoContent (shared_ptr<const Film> f, Time s, ContentVideoFrame len)
+VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Frame len)
 	: Content (f, s)
 	, _video_length (len)
 	, _video_frame_rate (0)
@@ -58,7 +59,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
 	: Content (f, node)
 {
-	_video_length = node->number_child<ContentVideoFrame> ("VideoLength");
+	_video_length = node->number_child<VideoContent::Frame> ("VideoLength");
 	_video_size.width = node->number_child<int> ("VideoWidth");
 	_video_size.height = node->number_child<int> ("VideoHeight");
 	_video_frame_rate = node->number_child<float> ("VideoFrameRate");
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 23bcaa89b..372cab3bd 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -21,7 +21,6 @@
 #define DCPOMATIC_VIDEO_CONTENT_H
 
 #include "content.h"
-#include "util.h"
 
 class VideoExaminer;
 class Ratio;
@@ -38,7 +37,9 @@ public:
 class VideoContent : public virtual Content
 {
 public:
-	VideoContent (boost::shared_ptr<const Film>, Time, ContentVideoFrame);
+	typedef int Frame;
+
+	VideoContent (boost::shared_ptr<const Film>, Time, VideoContent::Frame);
 	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
 	VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
 	VideoContent (VideoContent const &);
@@ -46,7 +47,7 @@ public:
 	void as_xml (xmlpp::Node *) const;
 	virtual std::string information () const;
 
-	ContentVideoFrame video_length () const {
+	VideoContent::Frame video_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_length;
 	}
@@ -82,7 +83,7 @@ public:
 protected:
 	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-	ContentVideoFrame _video_length;
+	VideoContent::Frame _video_length;
 
 private:
 	libdcp::Size _video_size;
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index fcc0ccf41..f61e63d4d 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -28,78 +28,22 @@
 using std::cout;
 using boost::shared_ptr;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
 	: Decoder (f)
-	, _next_video (0)
-	, _video_content (c)
-	, _frame_rate_conversion (c->video_frame_rate(), f->dcp_video_frame_rate())
-	, _odd (false)
+	, _video_position (0)
 {
 
 }
 
-/** Called by subclasses when some video is ready.
- *  @param image frame to emit.
- *  @param same true if this frame is the same as the last one passed to this call.
- *  @param t Time of the frame within the source.
- */
 void
-VideoDecoder::video (shared_ptr<Image> image, bool same, Time t)
+VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
 {
-	if (_frame_rate_conversion.skip && _odd) {
-		_odd = !_odd;
-		return;
-	}
-
-	image = image->crop (_video_content->crop(), true);
-
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	
-	libdcp::Size const container_size = _video_container_size.get_value_or (film->container()->size (film->full_frame ()));
-	libdcp::Size const image_size = _video_content->ratio()->size (container_size);
-	
-	shared_ptr<Image> out = image->scale_and_convert_to_rgb (image_size, film->scaler(), true);
-
-	if (film->with_subtitles ()) {
-		shared_ptr<Subtitle> sub;
-		if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
-			sub = _timed_subtitle->subtitle ();
-		}
-		
-		if (sub) {
-			dcpomatic::Rect const tx = subtitle_transformed_area (
-				float (image_size.width) / _video_content->video_size().width,
-				float (image_size.height) / _video_content->video_size().height,
-				sub->area(), film->subtitle_offset(), film->subtitle_scale()
-				);
-			
-			shared_ptr<Image> im = sub->image()->scale (tx.size(), film->scaler(), true);
-			out->alpha_blend (im, tx.position());
-		}
-	}
-
-	if (image_size != container_size) {
-		assert (image_size.width <= container_size.width);
-		assert (image_size.height <= container_size.height);
-		shared_ptr<Image> im (new SimpleImage (PIX_FMT_RGB24, container_size, true));
-		im->make_black ();
-		im->copy (out, Position ((container_size.width - image_size.width) / 2, (container_size.height - image_size.height) / 2));
-		out = im;
-	}
-		
-	Video (out, same, t);
-
-	if (_frame_rate_conversion.repeat) {
-		Video (image, true, t + film->video_frames_to_time (1));
-		_next_video = t + film->video_frames_to_time (2);
-	} else {
-		_next_video = t + film->video_frames_to_time (1);
-	}
-
-	_odd = !_odd;
+        Video (image, same, frame);
+	_video_position = frame + 1;
 }
 
+#if 0
+
 /** Called by subclasses when a subtitle is ready.
  *  s may be 0 to say that there is no current subtitle.
  *  @param s New current subtitle, or 0.
@@ -114,40 +58,5 @@ VideoDecoder::subtitle (shared_ptr<TimedSubtitle> s)
 		_timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top));
 	}
 }
+#endif
 
-bool
-VideoDecoder::video_done () const
-{
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	
-	return (_video_content->length() - _next_video) < film->video_frames_to_time (1);
-}
-
-void
-VideoDecoder::seek (Time t)
-{
-	_next_video = t;
-}
-
-void
-VideoDecoder::seek_back ()
-{
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	_next_video -= film->video_frames_to_time (1);
-}
-
-void
-VideoDecoder::seek_forward ()
-{
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	_next_video += film->video_frames_to_time (1);
-}
-
-void
-VideoDecoder::set_video_container_size (libdcp::Size s)
-{
-	_video_container_size = s;
-}
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 8de76c10f..d24219d95 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -20,37 +20,30 @@
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
-#include "video_source.h"
 #include "decoder.h"
 #include "util.h"
 
 class VideoContent;
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+	VideoDecoder (boost::shared_ptr<const Film>);
 
-	virtual void seek (Time);
-	virtual void seek_back ();
-	virtual void seek_forward ();
-	
-	void set_video_container_size (libdcp::Size);
+	virtual void seek (VideoContent::Frame) = 0;
+	virtual void seek_back () = 0;
 
-protected:
+	/** Emitted when a video frame is ready.
+	 *  First parameter is the video image.
+	 *  Second parameter is true if the image is the same as the last one that was emitted.
+	 *  Third parameter is the frame within our source.
+	 */
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, VideoContent::Frame)> Video;
 	
-	void video (boost::shared_ptr<Image>, bool, Time);
-	void subtitle (boost::shared_ptr<TimedSubtitle>);
-	bool video_done () const;
-
-	Time _next_video;
-	boost::shared_ptr<const VideoContent> _video_content;
-
-private:
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-	FrameRateConversion _frame_rate_conversion;
-	bool _odd;
-	boost::optional<libdcp::Size> _video_container_size;
+protected:
+
+	void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
+	VideoContent::Frame _video_position;
 };
 
 #endif
diff --git a/src/lib/video_examiner.h b/src/lib/video_examiner.h
index 2f713291b..72f6ccc12 100644
--- a/src/lib/video_examiner.h
+++ b/src/lib/video_examiner.h
@@ -19,11 +19,12 @@
 
 #include <libdcp/types.h>
 #include "types.h"
+#include "video_content.h"
 
 class VideoExaminer
 {
 public:
 	virtual float video_frame_rate () const = 0;
 	virtual libdcp::Size video_size () const = 0;
-	virtual ContentVideoFrame video_length () const = 0;
+	virtual VideoContent::Frame video_length () const = 0;
 };
diff --git a/src/lib/video_sink.h b/src/lib/video_sink.h
deleted file mode 100644
index 957aeb4b4..000000000
--- a/src/lib/video_sink.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef DCPOMATIC_VIDEO_SINK_H
-#define DCPOMATIC_VIDEO_SINK_H
-
-#include <boost/shared_ptr.hpp>
-#include "util.h"
-
-class Subtitle;
-class Image;
-
-class VideoSink
-{
-public:
-	/** Call with a frame of video.
-	 *  @param i Video frame image.
-	 *  @param same true if i is the same as last time we were called.
-	 */
-	virtual void process_video (boost::shared_ptr<const Image> i, bool same, Time) = 0;
-};
-
-#endif
diff --git a/src/lib/video_source.cc b/src/lib/video_source.cc
deleted file mode 100644
index 824587bcb..000000000
--- a/src/lib/video_source.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "video_source.h"
-#include "video_sink.h"
-
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::bind;
-
-static void
-process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<const Image> image, bool same, Time time)
-{
-	shared_ptr<VideoSink> p = sink.lock ();
-	if (p) {
-		p->process_video (image, same, time);
-	}
-}
-
-void
-VideoSource::connect_video (shared_ptr<VideoSink> s)
-{
-	/* If we bind, say, a Player (as the VideoSink) to a Decoder (which is owned
-	   by the Player) we create a cycle.  Use a weak_ptr to break it.
-	*/
-	Video.connect (bind (process_video_proxy, weak_ptr<VideoSink> (s), _1, _2, _3));
-}
-
diff --git a/src/lib/video_source.h b/src/lib/video_source.h
deleted file mode 100644
index 9242af444..000000000
--- a/src/lib/video_source.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file  src/video_source.h
- *  @brief Parent class for classes which emit video data.
- */
-
-#ifndef DCPOMATIC_VIDEO_SOURCE_H
-#define DCPOMATIC_VIDEO_SOURCE_H
-
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include "util.h"
-
-class VideoSink;
-class Subtitle;
-class Image;
-
-/** @class VideoSource
- *  @param A class that emits video data.
- */
-class VideoSource
-{
-public:
-
-	/** Emitted when a video frame is ready.
-	 *  First parameter is the video image.
-	 *  Second parameter is true if the image is the same as the last one that was emitted.
-	 *  Third parameter is the time relative to the start of this source's content.
-	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, Time)> Video;
-
-	void connect_video (boost::shared_ptr<VideoSink>);
-};
-
-#endif
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 35874581b..cf81d5b70 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -133,7 +133,6 @@ Writer::fake_write (int frame)
 void
 Writer::write (shared_ptr<const AudioBuffers> audio)
 {
-	cout << "W: audio " << audio->frames() << "\n";
 	_sound_asset_writer->write (audio->data(), audio->frames());
 }
 
diff --git a/src/lib/wscript b/src/lib/wscript
index d0f102998..3e7f2e33b 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -8,10 +8,7 @@ sources = """
           audio_content.cc
           audio_decoder.cc
           audio_mapping.cc
-          audio_source.cc
-          black_decoder.cc
           config.cc
-          combiner.cc
           content.cc
           cross.cc
           dci_metadata.cc
@@ -37,14 +34,13 @@ sources = """
           job_manager.cc
           log.cc
           lut.cc
-          null_content.cc
           player.cc
           playlist.cc
           ratio.cc
+          resampler.cc
           scp_dcp_job.cc
           scaler.cc
           server.cc
-          silence_decoder.cc
           sndfile_content.cc
           sndfile_decoder.cc
           sound_processor.cc
@@ -57,7 +53,6 @@ sources = """
           util.cc
           video_content.cc
           video_decoder.cc
-          video_source.cc
           writer.cc
           """
 
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index db2ab9dfe..8ef64d509 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -181,7 +181,7 @@ FilmViewer::update_from_decoder ()
 		return;
 	}
 
-	_player->seek (_player->position() - _film->video_frames_to_time (1));
+	_player->seek (_player->video_position() - _film->video_frames_to_time (1));
 	get_frame ();
 	_panel->Refresh ();
 	_panel->Update ();
@@ -197,7 +197,7 @@ FilmViewer::timer (wxTimerEvent &)
 	get_frame ();
 
 	if (_film->length()) {
-		int const new_slider_position = 4096 * _player->position() / _film->length();
+		int const new_slider_position = 4096 * _player->video_position() / _film->length();
 		if (new_slider_position != _slider->GetValue()) {
 			_slider->SetValue (new_slider_position);
 		}
@@ -445,7 +445,6 @@ FilmViewer::forward_clicked (wxCommandEvent &)
 		return;
 	}
 
-	_player->seek_forward ();
 	get_frame ();
 	_panel->Refresh ();
 	_panel->Update ();
diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 6e73038f1..296444ba7 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -25,7 +25,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
 	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd24.m2ts"));
 	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (content));
 
-	BOOST_CHECK_EQUAL (examiner->first_video().get(), 57604000);
+	BOOST_CHECK_EQUAL (examiner->first_video().get(), 600.04166666666674);
 	BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1);
-	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->start.get(), 57600000);
+	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get(), 600);
 }
diff --git a/test/ffmpeg_pts_offset.cc b/test/ffmpeg_pts_offset.cc
new file mode 100644
index 000000000..15c2b38e1
--- /dev/null
+++ b/test/ffmpeg_pts_offset.cc
@@ -0,0 +1,39 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
+{
+	/* Sound == video so no offset required */
+	BOOST_CHECK_EQUAL (FFmpegDecoder::compute_pts_offset (0, 0, 24), 0);
+
+	/* Common offset should be removed */
+	BOOST_CHECK_CLOSE (FFmpegDecoder::compute_pts_offset (42, 42, 24), -42, 1e-9);
+
+	/* Video is on a frame boundary */
+	BOOST_CHECK_EQUAL (FFmpegDecoder::compute_pts_offset (1.0 / 24.0, 0, 24), 0);
+
+	/* Again, video is on a frame boundary */
+	BOOST_CHECK_EQUAL (FFmpegDecoder::compute_pts_offset (1.0 / 23.97, 0, 23.97), 0);
+
+	/* And again, video is on a frame boundary */
+	BOOST_CHECK_EQUAL (FFmpegDecoder::compute_pts_offset (3.0 / 23.97, 0, 23.97), 0);
+
+	/* Off a frame boundary */
+	BOOST_CHECK_CLOSE (FFmpegDecoder::compute_pts_offset (1.0 / 24.0 - 0.0215, 0, 24), 0.0215, 1e-9);
+}
diff --git a/test/test.cc b/test/test.cc
index 3434a3f09..4494540a2 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -154,6 +154,7 @@ check_dcp (string ref, string check)
 	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
 }
 
+#include "ffmpeg_pts_offset.cc"
 #include "ffmpeg_examiner_test.cc"
 #include "black_fill_test.cc"
 #include "scaling_test.cc"
-- 
cgit v1.2.3


From aabf54736d7401437af7f066c51fee91be64e809 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 4 Jul 2013 22:29:47 +0100
Subject: Pad silence for things that already have at least some audio.

---
 src/lib/encoder.cc     |  4 ++--
 src/lib/film.cc        | 15 ++++++++++++++
 src/lib/film.h         | 10 ++++++++-
 src/lib/transcoder.cc  |  2 +-
 src/lib/util.cc        | 20 +++++++++++++++---
 src/lib/util.h         |  6 +++++-
 src/lib/writer.cc      |  2 +-
 src/tools/dvdomatic.cc |  2 +-
 src/wx/audio_dialog.cc |  6 +++---
 src/wx/film_editor.cc  | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/wx/film_editor.h   |  5 +++++
 11 files changed, 114 insertions(+), 13 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 2c989452d..6a99132fd 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -433,10 +433,10 @@ Encoder::encoder_thread (ServerDescription* server)
 void
 Encoder::write_audio (shared_ptr<const AudioBuffers> data)
 {
-	AudioMapping m (_film->audio_channels ());
+	AudioMapping m (_film);
 	if (m.dcp_channels() != _film->audio_channels()) {
 
-		/* Remap (currently just for mono -> 5.1) */
+		/* Remap and pad with silence */
 
 		shared_ptr<AudioBuffers> b (new AudioBuffers (m.dcp_channels(), data->frames ()));
 		for (int i = 0; i < m.dcp_channels(); ++i) {
diff --git a/src/lib/film.cc b/src/lib/film.cc
index d92d7a977..ce555ac8b 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -108,6 +108,7 @@ Film::Film (string d, bool must_exist)
 	, _j2k_bandwidth (200000000)
 	, _dci_metadata (Config::instance()->default_dci_metadata ())
 	, _dcp_frame_rate (0)
+	, _minimum_audio_channels (0)
 	, _source_frame_rate (0)
 	, _dirty (false)
 {
@@ -185,6 +186,7 @@ Film::Film (Film const & o)
 	, _dci_metadata      (o._dci_metadata)
 	, _dci_date          (o._dci_date)
 	, _dcp_frame_rate    (o._dcp_frame_rate)
+	, _minimum_audio_channels (o._minimum_audio_channels)
 	, _size              (o._size)
 	, _length            (o._length)
 	, _content_digest    (o._content_digest)
@@ -506,6 +508,7 @@ Film::write_metadata () const
 	_dci_metadata.write (f);
 	f << "dci_date " << boost::gregorian::to_iso_string (_dci_date) << endl;
 	f << "dcp_frame_rate " << _dcp_frame_rate << endl;
+	f << "minimum_audio_channels " << _minimum_audio_channels << endl;
 	f << "width " << _size.width << endl;
 	f << "height " << _size.height << endl;
 	f << "length " << _length.get_value_or(0) << endl;
@@ -642,6 +645,8 @@ Film::read_metadata ()
 			_dci_date = boost::gregorian::from_undelimited_string (v);
 		} else if (k == "dcp_frame_rate") {
 			_dcp_frame_rate = atoi (v.c_str ());
+		} else if (k == "minimum_audio_channels") {
+			_minimum_audio_channels = atoi (v.c_str ());
 		}
 
 		_dci_metadata.read (k, v);
@@ -1323,6 +1328,16 @@ Film::set_dcp_frame_rate (int f)
 	signal_changed (DCP_FRAME_RATE);
 }
 
+void
+Film::set_minimum_audio_channels (int c)
+{
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_minimum_audio_channels = c;
+	}
+	signal_changed (MINIMUM_AUDIO_CHANNELS);
+}
+			
 void
 Film::set_size (libdcp::Size s)
 {
diff --git a/src/lib/film.h b/src/lib/film.h
index dd0a83d94..ca9bd57f4 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -153,7 +153,8 @@ public:
 		CONTENT_AUDIO_STREAMS,
 		SUBTITLE_STREAMS,
 		SOURCE_FRAME_RATE,
-		DCP_FRAME_RATE
+		DCP_FRAME_RATE,
+		MINIMUM_AUDIO_CHANNELS
 	};
 
 
@@ -335,6 +336,11 @@ public:
 		return _source_frame_rate;
 	}
 
+	int minimum_audio_channels () const {
+		boost::mutex::scoped_lock lm (_state_mutex);
+		return _minimum_audio_channels;
+	}
+
 	boost::shared_ptr<AudioStream> audio_stream () const;
 	bool has_audio () const;
 	
@@ -379,6 +385,7 @@ public:
 	void set_content_audio_streams (std::vector<boost::shared_ptr<AudioStream> >);
 	void set_subtitle_streams (std::vector<boost::shared_ptr<SubtitleStream> >);
 	void set_source_frame_rate (float);
+	void set_minimum_audio_channels (int);
 
 	/** Emitted when some property has changed */
 	mutable boost::signals2::signal<void (Property)> Changed;
@@ -481,6 +488,7 @@ private:
 	boost::gregorian::date _dci_date;
 	/** Frames per second to run our DCP at */
 	int _dcp_frame_rate;
+	int _minimum_audio_channels;
 
 	/* Data which are cached to speed things up */
 
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 48cf402d7..a202d440c 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -73,7 +73,7 @@ Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<
 	/* Set up the decoder to use the film's set streams */
 	_decoders.video->set_subtitle_stream (f->subtitle_stream ());
 	if (f->audio_stream ()) {
-	    _decoders.audio->set_audio_stream (f->audio_stream ());
+		_decoders.audio->set_audio_stream (f->audio_stream ());
 	}
 
 	_decoders.video->connect_video (_delay_line);
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 4cf57368a..83980f828 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -61,6 +61,7 @@ extern "C" {
 #include "filter.h"
 #include "sound_processor.h"
 #include "config.h"
+#include "film.h"
 #ifdef DVDOMATIC_WINDOWS
 #include "stack.hpp"
 #endif
@@ -962,8 +963,9 @@ audio_channel_name (int c)
 	return channels[c];
 }
 
-AudioMapping::AudioMapping (int c)
-	: _source_channels (c)
+AudioMapping::AudioMapping (shared_ptr<const Film> f)
+	: _source_channels (f->audio_stream() ? f->audio_stream()->channels() : 0)
+	, _minimum_channels (f->minimum_audio_channels ())
 {
 
 }
@@ -1001,8 +1003,11 @@ AudioMapping::dcp_to_source (libdcp::Channel c) const
 	return static_cast<int> (c);
 }
 
+/** @return minimum number of DCP channels that we can allow in this
+    DCP, given the nature of the source.
+*/
 int
-AudioMapping::dcp_channels () const
+AudioMapping::minimum_dcp_channels () const
 {
 	if (_source_channels == 1) {
 		/* The source is mono, so to put the mono channel into
@@ -1014,6 +1019,15 @@ AudioMapping::dcp_channels () const
 	return _source_channels;
 }
 
+/** @return number of channels that there should be in the DCP, including
+ *  any silent padded ones.
+ */
+int
+AudioMapping::dcp_channels () const
+{
+	return max (_source_channels, _minimum_channels);
+}
+
 FrameRateConversion::FrameRateConversion (float source, int dcp)
 	: skip (false)
 	, repeat (false)
diff --git a/src/lib/util.h b/src/lib/util.h
index 0d745e50c..c9e5bef16 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -50,6 +50,7 @@ extern "C" {
 #define MAX_AUDIO_CHANNELS 6
 
 class Scaler;
+class Film;
 
 extern std::string seconds_to_hms (int);
 extern std::string seconds_to_approximate_hms (int);
@@ -287,14 +288,17 @@ private:
 class AudioMapping
 {
 public:
-	AudioMapping (int);
+	AudioMapping (boost::shared_ptr<const Film>);
 
 	boost::optional<libdcp::Channel> source_to_dcp (int c) const;
 	boost::optional<int> dcp_to_source (libdcp::Channel c) const;
+
+	int minimum_dcp_channels () const;
 	int dcp_channels () const;
 
 private:
 	int _source_channels;
+	int _minimum_channels;
 };
 
 extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second);
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 1a6daa1db..cff0b5be2 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -77,7 +77,7 @@ Writer::Writer (shared_ptr<Film> f)
 
 	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
 
-	AudioMapping m (_film->audio_channels ());
+	AudioMapping m (_film);
 	
 	if (m.dcp_channels() > 0) {
 		_sound_asset.reset (
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index de94d0a2f..e0629bb98 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -166,7 +166,7 @@ setup_menu (wxMenuBar* m)
 	add_item (file, _("&Properties..."), ID_file_properties, NEEDS_FILM);
 #ifndef __WXOSX__	
 	file->AppendSeparator ();
-#endif	
+#endif
 	add_item (file, _("&Exit"), wxID_EXIT, ALWAYS);
 
 #ifdef __WXOSX__	
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index d12b5516f..21e4e5940 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -108,7 +108,7 @@ AudioDialog::setup_channels ()
 		return;
 	}
 
-	AudioMapping m (_film->audio_stream()->channels ());
+	AudioMapping m (_film);
 	
 	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
 		if (m.dcp_to_source(static_cast<libdcp::Channel>(i))) {
@@ -134,7 +134,7 @@ AudioDialog::try_to_load_analysis ()
 		
 	_plot->set_analysis (a);
 
-	AudioMapping m (_film->audio_stream()->channels ());
+	AudioMapping m (_film);
 	optional<libdcp::Channel> c = m.source_to_dcp (0);
 	if (c) {
 		_channel_checkbox[c.get()]->SetValue (true);
@@ -157,7 +157,7 @@ AudioDialog::channel_clicked (wxCommandEvent& ev)
 
 	assert (c < MAX_AUDIO_CHANNELS);
 
-	AudioMapping m (_film->audio_stream()->channels ());
+	AudioMapping m (_film);
 	optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (c));
 	if (s) {
 		_plot->set_channel_visible (s.get(), _channel_checkbox[c]->GetValue ());
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index dd952e22a..13bef5a24 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -232,6 +232,8 @@ FilmEditor::connect_to_widgets ()
 	_dcp_content_type->Connect     (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
 	_dcp_frame_rate->Connect       (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this);
 	_best_dcp_frame_rate->Connect  (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this);
+	_pad_with_silence->Connect     (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::pad_with_silence_toggled), 0, this);
+	_minimum_audio_channels->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,   wxCommandEventHandler (FilmEditor::minimum_audio_channels_changed), 0, this);
 	_dcp_ab->Connect               (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::dcp_ab_toggled), 0, this);
 	_still_duration->Connect       (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::still_duration_changed), 0, this);
 	_trim_start->Connect           (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::trim_start_changed), 0, this);
@@ -392,6 +394,16 @@ FilmEditor::make_audio_panel ()
 		grid->Add (s);
 	}
 
+	{
+		_pad_with_silence = new wxCheckBox (_audio_panel, wxID_ANY, _("Pad with silence to"));
+		grid->Add (_pad_with_silence);
+		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_minimum_audio_channels = new wxSpinCtrl (_audio_panel);
+		s->Add (_minimum_audio_channels, 1);
+		add_label_to_sizer (s, _audio_panel, _("channels"));
+		grid->Add (s);
+	}
+
 	{
 		_use_content_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use content's audio"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
 		grid->Add (video_control (_use_content_audio));
@@ -415,6 +427,7 @@ FilmEditor::make_audio_panel ()
 
 	_audio_gain->SetRange (-60, 60);
 	_audio_delay->SetRange (-1000, 1000);
+	_minimum_audio_channels->SetRange (0, MAX_AUDIO_CHANNELS);
 }
 
 void
@@ -628,6 +641,7 @@ FilmEditor::film_changed (Film::Property p)
 		setup_streams ();
 		setup_show_audio_sensitivity ();
 		setup_frame_rate_description ();
+		setup_minimum_audio_channels ();
 		break;
 	case Film::TRUST_CONTENT_HEADER:
 		checked_set (_trust_content_header, _film->trust_content_header ());
@@ -640,6 +654,7 @@ FilmEditor::film_changed (Film::Property p)
 		setup_streams ();
 		setup_show_audio_sensitivity ();
 		setup_frame_rate_description ();
+		setup_minimum_audio_channels ();
 		break;
 	case Film::FORMAT:
 	{
@@ -764,6 +779,7 @@ FilmEditor::film_changed (Film::Property p)
 		setup_audio_control_sensitivity ();
 		setup_show_audio_sensitivity ();
 		setup_frame_rate_description ();
+		setup_minimum_audio_channels ();
 		break;
 	case Film::USE_CONTENT_AUDIO:
 		_film->log()->log (String::compose ("Film::USE_CONTENT_AUDIO changed; setting GUI using %1", _film->use_content_audio ()));
@@ -774,6 +790,7 @@ FilmEditor::film_changed (Film::Property p)
 		setup_audio_control_sensitivity ();
 		setup_show_audio_sensitivity ();
 		setup_frame_rate_description ();
+		setup_minimum_audio_channels ();
 		break;
 	case Film::SUBTITLE_STREAM:
 		if (_film->subtitle_stream()) {
@@ -789,6 +806,7 @@ FilmEditor::film_changed (Film::Property p)
 		setup_audio_details ();
 		setup_show_audio_sensitivity ();
 		setup_frame_rate_description ();
+		setup_minimum_audio_channels ();
 		break;
 	}
 	case Film::DCP_FRAME_RATE:
@@ -808,6 +826,10 @@ FilmEditor::film_changed (Film::Property p)
 		}
 
 		setup_frame_rate_description ();
+	case Film::MINIMUM_AUDIO_CHANNELS:
+		checked_set (_minimum_audio_channels, _film->minimum_audio_channels ());
+		setup_minimum_audio_channels ();
+		break;
 	}
 }
 
@@ -1185,6 +1207,9 @@ FilmEditor::setup_audio_control_sensitivity ()
 	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
 		_external_audio[i]->Enable (external);
 	}
+
+	_pad_with_silence->Enable (_generally_sensitive && _film && _film->audio_stream() && _film->audio_stream()->channels() < MAX_AUDIO_CHANNELS);
+	_minimum_audio_channels->Enable (_generally_sensitive && _pad_with_silence->GetValue ());
 }
 
 void
@@ -1411,3 +1436,33 @@ FilmEditor::trim_type_changed (wxCommandEvent &)
 {
 	_film->set_trim_type (_trim_type->GetSelection () == 0 ? Film::CPL : Film::ENCODE);
 }
+
+void
+FilmEditor::setup_minimum_audio_channels ()
+{
+	if (!_film || !_film->audio_stream ()) {
+		_pad_with_silence->SetValue (false);
+		return;
+	}
+
+	_pad_with_silence->SetValue (_film->audio_stream()->channels() < _film->minimum_audio_channels());
+
+	AudioMapping m (_film);
+	_minimum_audio_channels->SetRange (m.minimum_dcp_channels(), MAX_AUDIO_CHANNELS);
+}
+
+void
+FilmEditor::pad_with_silence_toggled (wxCommandEvent &)
+{
+	setup_audio_control_sensitivity ();
+}
+
+void
+FilmEditor::minimum_audio_channels_changed (wxCommandEvent &)
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_minimum_audio_channels (_minimum_audio_channels->GetValue ());
+}
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index e2a4d5836..c2d064ca2 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -85,6 +85,8 @@ private:
 	void external_audio_changed (wxCommandEvent &);
 	void dcp_frame_rate_changed (wxCommandEvent &);
 	void best_dcp_frame_rate_clicked (wxCommandEvent &);
+	void pad_with_silence_toggled (wxCommandEvent &);
+	void minimum_audio_channels_changed (wxCommandEvent &);
 
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
@@ -103,6 +105,7 @@ private:
 	void setup_scaling_description ();
 	void setup_notebook_size ();
 	void setup_frame_rate_description ();
+	void setup_minimum_audio_channels ();
 	
 	wxControl* video_control (wxControl *);
 	wxControl* still_control (wxControl *);
@@ -169,6 +172,8 @@ private:
 	wxStaticText* _source_frame_rate;
 	wxChoice* _dcp_frame_rate;
 	wxButton* _best_dcp_frame_rate;
+	wxCheckBox* _pad_with_silence;
+	wxSpinCtrl* _minimum_audio_channels;
 	wxStaticText* _frame_rate_description;
 	/** The Film's length */
 	wxStaticText* _length;
-- 
cgit v1.2.3


From a43aa6de965cb95fd85425cf5a7dfbdb6f878e22 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 4 Jul 2013 22:38:43 +0100
Subject: Put in silence where there was none.

---
 src/lib/encoder.cc | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 6a99132fd..ebe72b6cd 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -47,6 +47,7 @@ using std::stringstream;
 using std::vector;
 using std::list;
 using std::cout;
+using std::min;
 using std::make_pair;
 using namespace boost;
 
@@ -149,6 +150,20 @@ Encoder::process_end ()
 	}
 #endif
 
+	if (_film->audio_channels() == 0 && _film->minimum_audio_channels() > 0) {
+		/* Put audio in where there is none at all */
+		int64_t af = video_frames_to_audio_frames (_video_frames_out, 48000, _film->dcp_frame_rate ());
+		while (af) {
+			int64_t const this_time = min (af, 24000L);
+			shared_ptr<AudioBuffers> out (new AudioBuffers (_film->minimum_audio_channels(), this_time));
+			out->make_silent ();
+			out->set_frames (this_time);
+			write_audio (out);
+
+			af -= this_time;
+		}
+	}
+
 	boost::mutex::scoped_lock lock (_mutex);
 
 	_film->log()->log (String::compose (N_("Clearing queue of %1"), _queue.size ()));
-- 
cgit v1.2.3


From 4453965c2ab322122ffa5b51a9fc6efc0f896425 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 6 Jul 2013 11:23:56 +0100
Subject: Try to fix build.

---
 src/lib/encoder.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index ebe72b6cd..0ac32d3bf 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -154,7 +154,7 @@ Encoder::process_end ()
 		/* Put audio in where there is none at all */
 		int64_t af = video_frames_to_audio_frames (_video_frames_out, 48000, _film->dcp_frame_rate ());
 		while (af) {
-			int64_t const this_time = min (af, 24000L);
+			int64_t const this_time = min (af, static_cast<int64_t> (24000));
 			shared_ptr<AudioBuffers> out (new AudioBuffers (_film->minimum_audio_channels(), this_time));
 			out->make_silent ();
 			out->set_frames (this_time);
-- 
cgit v1.2.3


From e18ebfab7383efc601d3024687f9761419006184 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 10 Jul 2013 13:35:36 +0100
Subject: Remove erroneous trimmer.cc; use copy for FFMpeg filter passthrough.

---
 src/lib/encoder.cc      |   1 -
 src/lib/filter_graph.cc |   7 +--
 src/lib/trimmer.cc      | 123 ------------------------------------------------
 src/lib/util.cc         |  14 +-----
 src/lib/util.h          |   1 -
 src/wx/wx_util.cc       |   8 ++++
 6 files changed, 11 insertions(+), 143 deletions(-)
 delete mode 100644 src/lib/trimmer.cc

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index d3181acd9..ed14f2755 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -200,7 +200,6 @@ Encoder::process_video (shared_ptr<const Image> image, bool same)
 	} else {
 		/* Queue this new frame for encoding */
 		TIMING ("adding to queue of %1", _queue.size ());
-		/* XXX: padding */
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
 						  image, _video_frames_out, _film->dcp_video_frame_rate(),
diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 275c46909..cc16b279d 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -58,13 +58,10 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
 	_frame = av_frame_alloc ();
 	
 	string filters = Filter::ffmpeg_strings (content->filters()).first;
-	if (!filters.empty ()) {
-		filters += ",";
+	if (filters.empty ()) {
+		filters = "copy";
 	}
 
-	/* XXX; remove */
-	filters += crop_string (Position (), _size);
-
 	AVFilterGraph* graph = avfilter_graph_alloc();
 	if (graph == 0) {
 		throw DecodeError (N_("could not create filter graph."));
diff --git a/src/lib/trimmer.cc b/src/lib/trimmer.cc
deleted file mode 100644
index 99f04793f..000000000
--- a/src/lib/trimmer.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <boost/shared_ptr.hpp>
-#include <stdint.h>
-#include "trimmer.h"
-
-using std::cout;
-using std::max;
-using boost::shared_ptr;
-
-/** @param audio_sample_rate Audio sampling rate, or 0 if there is no audio */
-Trimmer::Trimmer (
-	shared_ptr<Log> log,
-	int video_trim_start,
-	int video_trim_end,
-	int video_length,
-	int audio_sample_rate,
-	float frames_per_second,
-	int dcp_frames_per_second
-	)
-	: AudioVideoProcessor (log)
-	, _video_start (video_trim_start)
-	, _video_end (video_length - video_trim_end)
-	, _video_in (0)
-	, _audio_in (0)
-{
-	FrameRateConversion frc (frames_per_second, dcp_frames_per_second);
-
-	if (frc.skip) {
-		_video_start /= 2;
-		_video_end /= 2;
-	} else if (frc.repeat) {
-		_video_start *= 2;
-		_video_end *= 2;
-	}
-
-	if (audio_sample_rate) {
-		_audio_start = video_frames_to_audio_frames (_video_start, audio_sample_rate, frames_per_second);
-		_audio_end = video_frames_to_audio_frames (_video_end, audio_sample_rate, frames_per_second);
-	}
-
-	/* XXX: this is a hack; if there is no trim at the end, set
-	   the audio end point to infinity so that
-	   shorter-video-than-audio does not trim audio (which breaks
-	   the current set of regression tests).  This could be
-	   removed if a) the regression tests are regenerated and b) I
-	   can work out what DCP length should be.
-
-	   There is also a problem whereby black video frames inserted
-	   at the start of the output by the matcher are not taken into account,
-	   so if black frames are inserted it means more gets trimmed off the
-	   end than should be.  Hack around this in similar fashion with the
-	   _video_end = INT_MAX line.
-	*/
-	if (video_trim_end == 0) {
-		_video_end = INT_MAX;
-		_audio_end = INT64_MAX;
-	}
-}
-
-void
-Trimmer::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub)
-{
-	if (_video_in >= _video_start && _video_in < _video_end) {
-		Video (image, same, sub);
-	}
-	
-	++_video_in;
-}
-
-void
-Trimmer::process_audio (shared_ptr<const AudioBuffers> audio)
-{
-	int64_t offset = _audio_start - _audio_in;
-	if (offset > audio->frames()) {
-		/* we haven't reached the start of the untrimmed section yet */
-		_audio_in += audio->frames ();
-		return;
-	}
-
-	if (offset < 0) {
-		offset = 0;
-	}
-
-	int64_t length = _audio_end - max (_audio_in, _audio_start);
-	if (length < 0) {
-		_audio_in += audio->frames ();
-		return;
-	}
-
-	if (length > (audio->frames() - offset)) {
-		length = audio->frames () - offset;
-	}
-
-	_audio_in += audio->frames ();
-	
-	if (offset != 0 || length != audio->frames ()) {
-		shared_ptr<AudioBuffers> copy (new AudioBuffers (audio));
-		copy->move (offset, 0, length);
-		copy->set_frames (length);
-		audio = copy;
-	}
-	
-	Audio (audio);
-}
-
diff --git a/src/lib/util.cc b/src/lib/util.cc
index d425fc8fe..2e4abe64d 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -270,7 +270,7 @@ LONG WINAPI exception_handler(struct _EXCEPTION_POINTERS *)
 }
 #endif
 
-/** Call the required functions to set up DVD-o-matic's static arrays, etc.
+/** Call the required functions to set up DCP-o-matic's static arrays, etc.
  *  Must be called from the UI thread, if there is one.
  */
 void
@@ -338,18 +338,6 @@ dcpomatic_setup_gettext_i18n (string lang)
 #endif
 }
 
-/** @param start Start position for the crop within the image.
- *  @param size Size of the cropped area.
- *  @return FFmpeg crop filter string.
- */
-string
-crop_string (Position start, libdcp::Size size)
-{
-	stringstream s;
-	s << N_("crop=") << size.width << N_(":") << size.height << N_(":") << start.x << N_(":") << start.y;
-	return s.str ();
-}
-
 /** @param s A string.
  *  @return Parts of the string split at spaces, except when a space is within quotation marks.
  */
diff --git a/src/lib/util.h b/src/lib/util.h
index 7af8ffedf..57dc0f783 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -106,7 +106,6 @@ struct FrameRateConversion
 	std::string description;
 };
 
-extern std::string crop_string (Position, libdcp::Size);
 extern int dcp_audio_frame_rate (int);
 extern std::string colour_lut_index_to_name (int index);
 extern int stride_round_up (int, int const *, int);
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index c5887e17d..1a15b0e98 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -40,7 +40,11 @@ using namespace boost;
  *  @param prop Proportion to pass when calling Add() on the wxSizer.
  */
 wxStaticText *
+#ifdef __WXOSX__
 add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop)
+#else
+add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool, int prop)
+#endif
 {
 	int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
 #ifdef __WXOSX__
@@ -55,7 +59,11 @@ add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop)
 }
 
 wxStaticText *
+#ifdef __WXOSX__
 add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
+#else
+add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span)
+#endif
 {
 	int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
 #ifdef __WXOSX__
-- 
cgit v1.2.3


From 5f1046a2164fff00a6fc74aecf4cacbca531d415 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 12 Jul 2013 23:12:41 +0100
Subject: Remove entirely untested colour LUT options.

---
 src/lib/dcp_video_frame.cc | 21 +++++----------------
 src/lib/dcp_video_frame.h  |  3 +--
 src/lib/encoder.cc         |  2 +-
 src/lib/film.cc            | 17 +----------------
 src/lib/film.h             | 12 ------------
 src/lib/server.cc          |  6 +-----
 src/lib/util.cc            | 17 -----------------
 src/lib/util.h             |  1 -
 src/wx/film_editor.cc      | 25 -------------------------
 src/wx/film_editor.h       |  2 --
 test/client_server_test.cc |  1 -
 11 files changed, 9 insertions(+), 98 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 39334d3c7..22a7c5795 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -73,17 +73,15 @@ using libdcp::Size;
 /** Construct a DCP video frame.
  *  @param input Input image.
  *  @param f Index of the frame within the DCP.
- *  @param clut Colour look-up table to use (see Config::colour_lut_index ())
  *  @param bw J2K bandwidth to use (see Config::j2k_bandwidth ())
  *  @param l Log to write to.
  */
 DCPVideoFrame::DCPVideoFrame (
-	shared_ptr<const Image> image, int f, int dcp_fps, int clut, int bw, shared_ptr<Log> l
+	shared_ptr<const Image> image, int f, int dcp_fps, int bw, shared_ptr<Log> l
 	)
 	: _image (image)
 	, _frame (f)
 	, _frames_per_second (dcp_fps)
-	, _colour_lut (clut)
 	, _j2k_bandwidth (bw)
 	, _log (l)
 	, _parameters (0)
@@ -116,19 +114,11 @@ DCPVideoFrame::~DCPVideoFrame ()
 shared_ptr<EncodedData>
 DCPVideoFrame::encode_locally ()
 {
-	/* In sRGB / Rec709 gamma LUT */
-	shared_ptr<libdcp::LUT> lut_in;
-	if (_colour_lut == 0) {
-		lut_in = libdcp::SRGBLinearisedGammaLUT::cache.get (12, 2.4);
-	} else {
-		lut_in = libdcp::Rec709LinearisedGammaLUT::cache.get (12, 1 / 0.45);
-	}
-
-	/* Out DCI gamma LUT */
-	shared_ptr<libdcp::LUT> lut_out = libdcp::GammaLUT::cache.get (16, 1 / 2.6);
-
 	shared_ptr<libdcp::XYZFrame> xyz = libdcp::rgb_to_xyz (
-		_image, lut_in, lut_out, _colour_lut == 0 ? libdcp::colour_matrix::srgb_to_xyz : libdcp::colour_matrix::rec709_to_xyz
+		_image,
+		libdcp::SRGBLinearisedGammaLUT::cache.get (12, 2.4),
+		libdcp::GammaLUT::cache.get (16, 1 / 2.6),
+		libdcp::colour_matrix::srgb_to_xyz
 		);
 		
 	/* Set the max image and component sizes based on frame_rate */
@@ -234,7 +224,6 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
 	  << N_("height ") << _image->size().height << N_("\n")
 	  << N_("frame ") << _frame << N_("\n")
 	  << N_("frames_per_second ") << _frames_per_second << N_("\n")
-	  << N_("colour_lut ") << _colour_lut << N_("\n")
 	  << N_("j2k_bandwidth ") << _j2k_bandwidth << N_("\n");
 
 	_log->log (String::compose (
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index b0b662e5b..25a3e9926 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -105,7 +105,7 @@ public:
 class DCPVideoFrame
 {
 public:
-	DCPVideoFrame (boost::shared_ptr<const Image>, int, int, int, int, boost::shared_ptr<Log>);
+	DCPVideoFrame (boost::shared_ptr<const Image>, int, int, int, boost::shared_ptr<Log>);
 	~DCPVideoFrame ();
 
 	boost::shared_ptr<EncodedData> encode_locally ();
@@ -119,7 +119,6 @@ private:
 	boost::shared_ptr<const Image> _image;
 	int _frame;                      ///< frame index within the DCP's intrinsic duration
 	int _frames_per_second;          ///< Frames per second that we will use for the DCP
-	int _colour_lut;                 ///< Colour look-up table to use
 	int _j2k_bandwidth;              ///< J2K bandwidth to use
 
 	boost::shared_ptr<Log> _log; ///< log
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index ed14f2755..718ae55a4 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -203,7 +203,7 @@ Encoder::process_video (shared_ptr<const Image> image, bool same)
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
 						  image, _video_frames_out, _film->dcp_video_frame_rate(),
-						  _film->colour_lut(), _film->j2k_bandwidth(), _film->log()
+						  _film->j2k_bandwidth(), _film->log()
 						  )
 					  ));
 		
diff --git a/src/lib/film.cc b/src/lib/film.cc
index a49e549a7..f306006c9 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -94,7 +94,6 @@ Film::Film (string d)
 	, _container (Config::instance()->default_container ())
 	, _scaler (Scaler::from_id ("bicubic"))
 	, _with_subtitles (false)
-	, _colour_lut (0)
 	, _j2k_bandwidth (200000000)
 	, _dci_metadata (Config::instance()->default_dci_metadata ())
 	, _dcp_video_frame_rate (24)
@@ -140,7 +139,6 @@ Film::Film (Film const & o)
 	, _container         (o._container)
 	, _scaler            (o._scaler)
 	, _with_subtitles    (o._with_subtitles)
-	, _colour_lut        (o._colour_lut)
 	, _j2k_bandwidth     (o._j2k_bandwidth)
 	, _dci_metadata      (o._dci_metadata)
 	, _dcp_video_frame_rate (o._dcp_video_frame_rate)
@@ -161,8 +159,7 @@ Film::video_identifier () const
 	  << "_" << _playlist->video_identifier()
 	  << "_" << _dcp_video_frame_rate
 	  << "_" << scaler()->id()
-	  << "_" << j2k_bandwidth()
-	  << "_" << lexical_cast<int> (colour_lut());
+	  << "_" << j2k_bandwidth();
 
 	return s.str ();
 }
@@ -344,7 +341,6 @@ Film::write_metadata () const
 
 	root->add_child("Scaler")->add_child_text (_scaler->id ());
 	root->add_child("WithSubtitles")->add_child_text (_with_subtitles ? "1" : "0");
-	root->add_child("ColourLUT")->add_child_text (lexical_cast<string> (_colour_lut));
 	root->add_child("J2KBandwidth")->add_child_text (lexical_cast<string> (_j2k_bandwidth));
 	_dci_metadata.as_xml (root->add_child ("DCIMetadata"));
 	root->add_child("DCPVideoFrameRate")->add_child_text (lexical_cast<string> (_dcp_video_frame_rate));
@@ -389,7 +385,6 @@ Film::read_metadata ()
 
 	_scaler = Scaler::from_id (f.string_child ("Scaler"));
 	_with_subtitles = f.bool_child ("WithSubtitles");
-	_colour_lut = f.number_child<int> ("ColourLUT");
 	_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
 	_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
 	_dcp_video_frame_rate = f.number_child<int> ("DCPVideoFrameRate");
@@ -585,16 +580,6 @@ Film::set_with_subtitles (bool w)
 	signal_changed (WITH_SUBTITLES);
 }
 
-void
-Film::set_colour_lut (int i)
-{
-	{
-		boost::mutex::scoped_lock lm (_state_mutex);
-		_colour_lut = i;
-	}
-	signal_changed (COLOUR_LUT);
-}
-
 void
 Film::set_j2k_bandwidth (int b)
 {
diff --git a/src/lib/film.h b/src/lib/film.h
index c107541a0..bf89c6f2c 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -135,7 +135,6 @@ public:
 		CONTAINER,
 		SCALER,
 		WITH_SUBTITLES,
-		COLOUR_LUT,
 		J2K_BANDWIDTH,
 		DCI_METADATA,
 		DCP_VIDEO_FRAME_RATE,
@@ -180,11 +179,6 @@ public:
 		return _with_subtitles;
 	}
 
-	int colour_lut () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _colour_lut;
-	}
-
 	int j2k_bandwidth () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _j2k_bandwidth;
@@ -218,7 +212,6 @@ public:
 	void set_container (Ratio const *);
 	void set_scaler (Scaler const *);
 	void set_with_subtitles (bool);
-	void set_colour_lut (int);
 	void set_j2k_bandwidth (int);
 	void set_dci_metadata (DCIMetadata);
 	void set_dcp_video_frame_rate (int);
@@ -266,11 +259,6 @@ private:
 	Scaler const * _scaler;
 	/** True if subtitles should be shown for this film */
 	bool _with_subtitles;
-	/** index of colour LUT to use when converting RGB to XYZ.
-	 *  0: sRGB
-	 *  1: Rec 709
-	 */
-	int _colour_lut;
 	/** bandwidth for J2K files in bits per second */
 	int _j2k_bandwidth;
 	/** DCI naming stuff */
diff --git a/src/lib/server.cc b/src/lib/server.cc
index b38e82a07..9af0883a7 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -104,18 +104,14 @@ Server::process (shared_ptr<Socket> socket)
 	libdcp::Size size (get_required_int (kv, "width"), get_required_int (kv, "height"));
 	int frame = get_required_int (kv, "frame");
 	int frames_per_second = get_required_int (kv, "frames_per_second");
-	int colour_lut_index = get_required_int (kv, "colour_lut");
 	int j2k_bandwidth = get_required_int (kv, "j2k_bandwidth");
 
-	/* This checks that colour_lut_index is within range */
-	colour_lut_index_to_name (colour_lut_index);
-
 	shared_ptr<Image> image (new Image (PIX_FMT_RGB24, size, true));
 
 	image->read_from_socket (socket);
 
 	DCPVideoFrame dcp_video_frame (
-		image, frame, frames_per_second, colour_lut_index, j2k_bandwidth, _log
+		image, frame, frames_per_second, j2k_bandwidth, _log
 		);
 	
 	shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 53c457898..305aae4f8 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -457,23 +457,6 @@ dcp_audio_frame_rate (int fs)
 	return 96000;
 }
 
-/** @param index Colour LUT index.
- *  @return Human-readable name.
- */
-string
-colour_lut_index_to_name (int index)
-{
-	switch (index) {
-	case 0:
-		return _("sRGB");
-	case 1:
-		return _("Rec 709");
-	}
-
-	assert (false);
-	return N_("");
-}
-
 Socket::Socket (int timeout)
 	: _deadline (_io_service)
 	, _socket (_io_service)
diff --git a/src/lib/util.h b/src/lib/util.h
index 57dc0f783..d9c88293e 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -107,7 +107,6 @@ struct FrameRateConversion
 };
 
 extern int dcp_audio_frame_rate (int);
-extern std::string colour_lut_index_to_name (int index);
 extern int stride_round_up (int, int const *, int);
 extern int stride_lookup (int c, int const * stride);
 extern std::multimap<std::string, std::string> read_key_value (std::istream& s);
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 65497859c..0828d5b79 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -221,7 +221,6 @@ FilmEditor::connect_to_widgets ()
 	_with_subtitles->Connect         (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
 	_subtitle_offset->Connect        (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
 	_subtitle_scale->Connect         (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);
-	_colour_lut->Connect             (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::colour_lut_changed), 0, this);
 	_j2k_bandwidth->Connect          (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
 	_audio_gain->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this);
 	_audio_gain_calculate_button->Connect (
@@ -292,15 +291,6 @@ FilmEditor::make_video_panel ()
 	}
 	++r;
 
-	add_label_to_grid_bag_sizer (grid, _video_panel, _("Colour look-up table"), true, wxGBPosition (r, 0));
-	_colour_lut = new wxChoice (_video_panel, wxID_ANY);
-	for (int i = 0; i < 2; ++i) {
-		_colour_lut->Append (std_to_wx (colour_lut_index_to_name (i)));
-	}
-	_colour_lut->SetSelection (0);
-	grid->Add (_colour_lut, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
-	++r;
-
 	_left_crop->SetRange (0, 1024);
 	_top_crop->SetRange (0, 1024);
 	_right_crop->SetRange (0, 1024);
@@ -554,16 +544,6 @@ FilmEditor::subtitle_scale_changed (wxCommandEvent &)
 	c->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0);
 }
 
-void
-FilmEditor::colour_lut_changed (wxCommandEvent &)
-{
-	if (!_film) {
-		return;
-	}
-	
-	_film->set_colour_lut (_colour_lut->GetSelection ());
-}
-
 void
 FilmEditor::j2k_bandwidth_changed (wxCommandEvent &)
 {
@@ -646,9 +626,6 @@ FilmEditor::film_changed (Film::Property p)
 		setup_subtitle_control_sensitivity ();
 		setup_dcp_name ();
 		break;
-	case Film::COLOUR_LUT:
-		checked_set (_colour_lut, _film->colour_lut ());
-		break;
 	case Film::J2K_BANDWIDTH:
 		checked_set (_j2k_bandwidth, double (_film->j2k_bandwidth()) / 1e6);
 		break;
@@ -885,7 +862,6 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::CONTAINER);
 	film_changed (Film::SCALER);
 	film_changed (Film::WITH_SUBTITLES);
-	film_changed (Film::COLOUR_LUT);
 	film_changed (Film::J2K_BANDWIDTH);
 	film_changed (Film::DCI_METADATA);
 	film_changed (Film::DCP_VIDEO_FRAME_RATE);
@@ -917,7 +893,6 @@ FilmEditor::set_things_sensitive (bool s)
 	_dcp_content_type->Enable (s);
 	_dcp_frame_rate->Enable (s);
 	_dcp_audio_channels->Enable (s);
-	_colour_lut->Enable (s);
 	_j2k_bandwidth->Enable (s);
 	_audio_gain->Enable (s);
 	_audio_gain_calculate_button->Enable (s);
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 100e47b5b..f2aaae04d 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -83,7 +83,6 @@ private:
 	void with_subtitles_toggled (wxCommandEvent &);
 	void subtitle_offset_changed (wxCommandEvent &);
 	void subtitle_scale_changed (wxCommandEvent &);
-	void colour_lut_changed (wxCommandEvent &);
 	void j2k_bandwidth_changed (wxCommandEvent &);
 	void dcp_frame_rate_changed (wxCommandEvent &);
 	void best_dcp_frame_rate_clicked (wxCommandEvent &);
@@ -164,7 +163,6 @@ private:
 	wxCheckBox* _with_subtitles;
 	wxSpinCtrl* _subtitle_offset;
 	wxSpinCtrl* _subtitle_scale;
-	wxChoice* _colour_lut;
 	wxSpinCtrl* _j2k_bandwidth;
 	wxChoice* _dcp_content_type;
 	wxChoice* _dcp_frame_rate;
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 50add352f..f3d72c2fc 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -65,7 +65,6 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 			image,
 			0,
 			24,
-			0,
 			200000000,
 			log
 			)
-- 
cgit v1.2.3


From 8349f0c97d98c0b7550ff4c76ad25f8f06270d6a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 22 Jul 2013 16:23:23 +0100
Subject: Basics of front-end 3D (as far as viewer, at least).

---
 src/lib/dcp_video_frame.cc     |  32 +++++++------
 src/lib/dcp_video_frame.h      |  11 +++--
 src/lib/encoder.cc             |  23 ++++-----
 src/lib/encoder.h              |   4 +-
 src/lib/ffmpeg_decoder.cc      |   2 +-
 src/lib/film.cc                |  48 +++++++++++++++++--
 src/lib/film.h                 |  18 +++++--
 src/lib/player.cc              |  15 +++---
 src/lib/player.h               |   9 ++--
 src/lib/server.cc              |   3 +-
 src/lib/still_image_decoder.cc |   2 +-
 src/lib/transcoder.cc          |   6 +--
 src/lib/types.h                |   9 ++++
 src/lib/video_content.cc       |   3 +-
 src/lib/video_decoder.cc       |  17 ++++++-
 src/lib/video_decoder.h        |  10 ++--
 src/lib/writer.cc              | 103 ++++++++++++++++++++++++++++-------------
 src/lib/writer.h               |  11 +++--
 src/wx/audio_mapping_view.cc   |   4 --
 src/wx/film_editor.cc          |  20 ++++++++
 src/wx/film_editor.h           |   2 +
 src/wx/film_viewer.cc          |  10 ++--
 src/wx/film_viewer.h           |   2 +-
 src/wx/video_panel.cc          |   5 +-
 test/client_server_test.cc     |   1 +
 25 files changed, 266 insertions(+), 104 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index ef8db7d23..10f1e4ad1 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -77,10 +77,11 @@ using libdcp::Size;
  *  @param l Log to write to.
  */
 DCPVideoFrame::DCPVideoFrame (
-	shared_ptr<const Image> image, int f, int dcp_fps, int bw, shared_ptr<Log> l
+	shared_ptr<const Image> image, int f, Eyes eyes, int dcp_fps, int bw, shared_ptr<Log> l
 	)
 	: _image (image)
 	, _frame (f)
+	, _eyes (eyes)
 	, _frames_per_second (dcp_fps)
 	, _j2k_bandwidth (bw)
 	, _log (l)
@@ -102,7 +103,11 @@ DCPVideoFrame::encode_locally ()
 		);
 		
 	/* Set the max image and component sizes based on frame_rate */
-	int const max_cs_len = ((float) _j2k_bandwidth) / 8 / _frames_per_second;
+	int max_cs_len = ((float) _j2k_bandwidth) / 8 / _frames_per_second;
+	if (_eyes == EYES_LEFT || _eyes == EYES_RIGHT) {
+		/* In 3D we have only half the normal bandwidth per eye */
+		max_cs_len /= 2;
+	}
 	int const max_comp_size = max_cs_len / 1.25;
 
 	/* get a J2K compressor handle */
@@ -208,12 +213,13 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv)
 	socket->connect (*endpoint_iterator);
 
 	stringstream s;
-	s << N_("encode please\n")
-	  << N_("width ") << _image->size().width << N_("\n")
-	  << N_("height ") << _image->size().height << N_("\n")
-	  << N_("frame ") << _frame << N_("\n")
-	  << N_("frames_per_second ") << _frames_per_second << N_("\n")
-	  << N_("j2k_bandwidth ") << _j2k_bandwidth << N_("\n");
+	s << "encode please\n"
+	  << "width " << _image->size().width << "\n"
+	  << "height " << _image->size().height << "\n"
+	  << "eyes " << static_cast<int> (_eyes) << "\n"
+	  << "frame " << _frame << "\n"
+	  << "frames_per_second " << _frames_per_second << "\n"
+	  << "j2k_bandwidth " << _j2k_bandwidth << "\n";
 
 	_log->log (String::compose (
 			   N_("Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)"),
@@ -272,9 +278,9 @@ EncodedData::~EncodedData ()
  *  @param frame DCP frame index.
  */
 void
-EncodedData::write (shared_ptr<const Film> film, int frame) const
+EncodedData::write (shared_ptr<const Film> film, int frame, Eyes eyes) const
 {
-	string const tmp_j2c = film->j2c_path (frame, true);
+	string const tmp_j2c = film->j2c_path (frame, eyes, true);
 
 	FILE* f = fopen (tmp_j2c.c_str (), N_("wb"));
 	
@@ -285,16 +291,16 @@ EncodedData::write (shared_ptr<const Film> film, int frame) const
 	fwrite (_data, 1, _size, f);
 	fclose (f);
 
-	string const real_j2c = film->j2c_path (frame, false);
+	string const real_j2c = film->j2c_path (frame, eyes, false);
 
 	/* Rename the file from foo.j2c.tmp to foo.j2c now that it is complete */
 	boost::filesystem::rename (tmp_j2c, real_j2c);
 }
 
 void
-EncodedData::write_info (shared_ptr<const Film> film, int frame, libdcp::FrameInfo fin) const
+EncodedData::write_info (shared_ptr<const Film> film, int frame, Eyes eyes, libdcp::FrameInfo fin) const
 {
-	string const info = film->info_path (frame);
+	string const info = film->info_path (frame, eyes);
 	ofstream h (info.c_str());
 	fin.write (h);
 }
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 4c545b6ef..e786d9b61 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -47,8 +47,8 @@ public:
 	virtual ~EncodedData ();
 
 	void send (boost::shared_ptr<Socket> socket);
-	void write (boost::shared_ptr<const Film>, int) const;
-	void write_info (boost::shared_ptr<const Film>, int, libdcp::FrameInfo) const;
+	void write (boost::shared_ptr<const Film>, int, Eyes) const;
+	void write_info (boost::shared_ptr<const Film>, int, Eyes, libdcp::FrameInfo) const;
 
 	/** @return data */
 	uint8_t* data () const {
@@ -101,11 +101,15 @@ public:
 class DCPVideoFrame : public boost::noncopyable
 {
 public:
-	DCPVideoFrame (boost::shared_ptr<const Image>, int, int, int, boost::shared_ptr<Log>);
+	DCPVideoFrame (boost::shared_ptr<const Image>, int, Eyes, int, int, boost::shared_ptr<Log>);
 
 	boost::shared_ptr<EncodedData> encode_locally ();
 	boost::shared_ptr<EncodedData> encode_remotely (ServerDescription const *);
 
+	Eyes eyes () const {
+		return _eyes;
+	}
+	
 	int frame () const {
 		return _frame;
 	}
@@ -113,6 +117,7 @@ public:
 private:
 	boost::shared_ptr<const Image> _image;
 	int _frame;			 ///< frame index within the DCP's intrinsic duration
+	Eyes _eyes;
 	int _frames_per_second;		 ///< Frames per second that we will use for the DCP
 	int _j2k_bandwidth;		 ///< J2K bandwidth to use
 
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 718ae55a4..8e61a0d60 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -52,10 +52,11 @@ Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _film (f)
 	, _job (j)
 	, _video_frames_out (0)
-	, _have_a_real_frame (false)
 	, _terminate (false)
 {
-	
+	_have_a_real_frame[EYES_BOTH] = false;
+	_have_a_real_frame[EYES_LEFT] = false;
+	_have_a_real_frame[EYES_RIGHT] = false;
 }
 
 Encoder::~Encoder ()
@@ -117,7 +118,7 @@ Encoder::process_end ()
 	for (list<shared_ptr<DCPVideoFrame> >::iterator i = _queue.begin(); i != _queue.end(); ++i) {
 		_film->log()->log (String::compose (N_("Encode left-over frame %1"), (*i)->frame ()));
 		try {
-			_writer->write ((*i)->encode_locally(), (*i)->frame ());
+			_writer->write ((*i)->encode_locally(), (*i)->frame (), (*i)->eyes ());
 			frame_done ();
 		} catch (std::exception& e) {
 			_film->log()->log (String::compose (N_("Local encode failed (%1)"), e.what ()));
@@ -170,7 +171,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<const Image> image, bool same)
+Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, bool same)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
@@ -190,25 +191,25 @@ Encoder::process_video (shared_ptr<const Image> image, bool same)
 	}
 
 	if (_writer->can_fake_write (_video_frames_out)) {
-		_writer->fake_write (_video_frames_out);
-		_have_a_real_frame = false;
+		_writer->fake_write (_video_frames_out, eyes);
+		_have_a_real_frame[eyes] = false;
 		frame_done ();
-	} else if (same && _have_a_real_frame) {
+	} else if (same && _have_a_real_frame[eyes]) {
 		/* Use the last frame that we encoded. */
-		_writer->repeat (_video_frames_out);
+		_writer->repeat (_video_frames_out, eyes);
 		frame_done ();
 	} else {
 		/* Queue this new frame for encoding */
 		TIMING ("adding to queue of %1", _queue.size ());
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, _video_frames_out, _film->dcp_video_frame_rate(),
+						  image, _video_frames_out, eyes, _film->dcp_video_frame_rate(),
 						  _film->j2k_bandwidth(), _film->log()
 						  )
 					  ));
 		
 		_condition.notify_all ();
-		_have_a_real_frame = true;
+		_have_a_real_frame[eyes] = true;
 	}
 
 	++_video_frames_out;
@@ -302,7 +303,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		if (encoded) {
-			_writer->write (encoded, vf->frame ());
+			_writer->write (encoded, vf->frame (), vf->eyes ());
 			frame_done ();
 		} else {
 			lock.lock ();
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index a6e5932be..a866a77f1 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -66,7 +66,7 @@ public:
 	 *  @param i Video frame image.
 	 *  @param same true if i is the same as the last time we were called.
 	 */
-	void process_video (boost::shared_ptr<const Image> i, bool same);
+	void process_video (boost::shared_ptr<const Image> i, Eyes eyes, bool same);
 
 	/** Call with some audio data */
 	void process_audio (boost::shared_ptr<const AudioBuffers>);
@@ -100,7 +100,7 @@ private:
 	/** Number of video frames written for the DCP so far */
 	int _video_frames_out;
 
-	bool _have_a_real_frame;
+	bool _have_a_real_frame[EYES_COUNT];
 	bool _terminate;
 	std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
 	std::list<boost::thread *> _threads;
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 11cea8fb1..ea32d102d 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -59,7 +59,7 @@ using libdcp::Size;
 
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> f, shared_ptr<const FFmpegContent> c, bool video, bool audio)
 	: Decoder (f)
-	, VideoDecoder (f)
+	, VideoDecoder (f, c)
 	, AudioDecoder (f)
 	, SubtitleDecoder (f)
 	, FFmpeg (c)
diff --git a/src/lib/film.cc b/src/lib/film.cc
index e39e94cfc..40c696256 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -95,6 +95,7 @@ Film::Film (string d)
 	, _dci_metadata (Config::instance()->default_dci_metadata ())
 	, _dcp_video_frame_rate (24)
 	, _dcp_audio_channels (MAX_AUDIO_CHANNELS)
+	, _dcp_3d (false)
 	, _sequence_video (true)
 	, _dirty (false)
 {
@@ -141,6 +142,10 @@ Film::video_identifier () const
 	  << "_" << scaler()->id()
 	  << "_" << j2k_bandwidth();
 
+	if (_dcp_3d) {
+		s << "_3D";
+	}
+
 	return s.str ();
 }
 	  
@@ -327,6 +332,7 @@ Film::write_metadata () const
 	root->add_child("DCPVideoFrameRate")->add_child_text (lexical_cast<string> (_dcp_video_frame_rate));
 	root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date));
 	root->add_child("DCPAudioChannels")->add_child_text (lexical_cast<string> (_dcp_audio_channels));
+	root->add_child("DCP3D")->add_child_text (_dcp_3d ? "1" : "0");
 	root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0");
 	_playlist->as_xml (root->add_child ("Playlist"));
 
@@ -439,6 +445,14 @@ Film::dci_name (bool if_created_now) const
 		d << "_" << dcp_content_type()->dci_name();
 	}
 
+	if (dcp_3d ()) {
+		d << "-3D";
+	}
+
+	if (dcp_video_frame_rate() != 24) {
+		d << "-" << dcp_video_frame_rate();
+	}
+
 	if (container()) {
 		d << "_" << container()->dci_name();
 	}
@@ -635,6 +649,16 @@ Film::set_dcp_audio_channels (int c)
 	signal_changed (DCP_AUDIO_CHANNELS);
 }
 
+void
+Film::set_dcp_3d (bool t)
+{
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_dcp_3d = t;
+	}
+	signal_changed (DCP_3D);
+}
+
 void
 Film::signal_changed (Property p)
 {
@@ -667,15 +691,23 @@ Film::set_dci_date_today ()
 }
 
 string
-Film::info_path (int f) const
+Film::info_path (int f, Eyes e) const
 {
 	boost::filesystem::path p;
 	p /= info_dir ();
 
 	stringstream s;
 	s.width (8);
-	s << setfill('0') << f << ".md5";
+	s << setfill('0') << f;
+
+	if (e == EYES_LEFT) {
+		s << ".L";
+	} else if (e == EYES_RIGHT) {
+		s << ".R";
+	}
 
+	s << ".md5";
+	
 	p /= s.str();
 
 	/* info_dir() will already have added any initial bit of the path,
@@ -685,7 +717,7 @@ Film::info_path (int f) const
 }
 
 string
-Film::j2c_path (int f, bool t) const
+Film::j2c_path (int f, Eyes e, bool t) const
 {
 	boost::filesystem::path p;
 	p /= "j2c";
@@ -693,7 +725,15 @@ Film::j2c_path (int f, bool t) const
 
 	stringstream s;
 	s.width (8);
-	s << setfill('0') << f << ".j2c";
+	s << setfill('0') << f;
+
+	if (e == EYES_LEFT) {
+		s << ".L";
+	} else if (e == EYES_RIGHT) {
+		s << ".R";
+	}
+	
+	s << ".j2c";
 
 	if (t) {
 		s << ".tmp";
diff --git a/src/lib/film.h b/src/lib/film.h
index 99c214ab7..5aff6f0be 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -55,8 +55,8 @@ public:
 	Film (std::string d);
 
 	std::string info_dir () const;
-	std::string j2c_path (int f, bool t) const;
-	std::string info_path (int f) const;
+	std::string j2c_path (int, Eyes, bool) const;
+	std::string info_path (int, Eyes) const;
 	std::string internal_video_mxf_dir () const;
 	std::string internal_video_mxf_filename () const;
 	boost::filesystem::path audio_analysis_path (boost::shared_ptr<const AudioContent>) const;
@@ -130,7 +130,9 @@ public:
 		DCI_METADATA,
 		DCP_VIDEO_FRAME_RATE,
 		DCP_AUDIO_CHANNELS,
-		SEQUENCE_VIDEO
+		/** The setting of _dcp_3d has been changed */
+		DCP_3D,
+		SEQUENCE_VIDEO,
 	};
 
 
@@ -197,6 +199,11 @@ public:
 		return _dcp_audio_channels;
 	}
 
+	bool dcp_3d () const {
+		boost::mutex::scoped_lock lm (_state_mutex);
+		return _dcp_3d;
+	}
+
 	bool sequence_video () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _sequence_video;
@@ -220,6 +227,7 @@ public:
 	void set_dci_metadata (DCIMetadata);
 	void set_dcp_video_frame_rate (int);
 	void set_dcp_audio_channels (int);
+	void set_dcp_3d (bool);
 	void set_dci_date_today ();
 	void set_sequence_video (bool);
 
@@ -275,6 +283,10 @@ private:
 	/** The date that we should use in a DCI name */
 	boost::gregorian::date _dci_date;
 	int _dcp_audio_channels;
+	/** If true, the DCP will be written in 3D mode; otherwise in 2D.
+	    This will be regardless of what content is on the playlist.
+	*/
+	bool _dcp_3d;
 	bool _sequence_video;
 
 	/** true if our state has changed since we last saved it */
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 98a31ae74..20beda945 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -202,7 +202,7 @@ Player::pass ()
 }
 
 void
-Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
+Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, VideoContent::Frame frame)
 {
 	shared_ptr<Piece> piece = weak_piece.lock ();
 	if (!piece) {
@@ -242,11 +242,11 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 	_last_video = piece->content;
 #endif	
 
-	Video (work_image, same, time);
+	Video (work_image, eyes, same, time);
 	time += TIME_HZ / _film->dcp_video_frame_rate();
 
 	if (frc.repeat) {
-		Video (work_image, true, time);
+		Video (work_image, eyes, true, time);
 		time += TIME_HZ / _film->dcp_video_frame_rate();
 	}
 
@@ -414,7 +414,7 @@ Player::setup_pieces ()
 		if (fc) {
 			shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio));
 			
-			fd->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3));
+			fd->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4));
 			fd->Audio.connect (bind (&Player::process_audio, this, piece, _1, _2));
 			fd->Subtitle.connect (bind (&Player::process_subtitle, this, piece, _1, _2, _3, _4));
 
@@ -435,7 +435,7 @@ Player::setup_pieces ()
 
 			if (!id) {
 				id.reset (new StillImageDecoder (_film, ic));
-				id->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3));
+				id->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4));
 			}
 
 			piece->decoder = id;
@@ -479,6 +479,9 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 	} else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) {
 		update_subtitle ();
 		Changed (frequent);
+	} else if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
+		cout << "vft change.\n";
+		Changed (frequent);
 	}
 }
 
@@ -518,7 +521,7 @@ Player::emit_black ()
 #endif
 	
 	/* XXX: use same here */
-	Video (_black_frame, false, _video_position);
+	Video (_black_frame, EYES_BOTH, false, _video_position);
 	_video_position += _film->video_frames_to_time (1);
 }
 
diff --git a/src/lib/player.h b/src/lib/player.h
index 568c7a7a1..8b28f010d 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -60,10 +60,11 @@ public:
 
 	/** Emitted when a video frame is ready.
 	 *  First parameter is the video image.
-	 *  Second parameter is true if the image is the same as the last one that was emitted.
-	 *  Third parameter is the time.
+	 *  Second parameter is the eye(s) that should see this image.
+	 *  Third parameter is true if the image is the same as the last one that was emitted.
+	 *  Fourth parameter is the time.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, Time)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, Eyes, bool, Time)> Video;
 	
 	/** Emitted when some audio data is ready */
 	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, Time)> Audio;
@@ -79,7 +80,7 @@ public:
 private:
 	friend class PlayerWrapper;
 
-	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, bool, VideoContent::Frame);
+	void process_video (boost::weak_ptr<Piece>, boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame);
 	void process_audio (boost::weak_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, AudioContent::Frame);
 	void process_subtitle (boost::weak_ptr<Piece>, boost::shared_ptr<Image>, dcpomatic::Rect<double>, Time, Time);
 	void setup_pieces ();
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 9af0883a7..37a076a54 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -105,13 +105,14 @@ Server::process (shared_ptr<Socket> socket)
 	int frame = get_required_int (kv, "frame");
 	int frames_per_second = get_required_int (kv, "frames_per_second");
 	int j2k_bandwidth = get_required_int (kv, "j2k_bandwidth");
+	Eyes eyes = static_cast<Eyes> (get_required_int (kv, "eyes"));
 
 	shared_ptr<Image> image (new Image (PIX_FMT_RGB24, size, true));
 
 	image->read_from_socket (socket);
 
 	DCPVideoFrame dcp_video_frame (
-		image, frame, frames_per_second, j2k_bandwidth, _log
+		image, frame, eyes, frames_per_second, j2k_bandwidth, _log
 		);
 	
 	shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
diff --git a/src/lib/still_image_decoder.cc b/src/lib/still_image_decoder.cc
index 21cc83f54..10e34427b 100644
--- a/src/lib/still_image_decoder.cc
+++ b/src/lib/still_image_decoder.cc
@@ -34,7 +34,7 @@ using libdcp::Size;
 
 StillImageDecoder::StillImageDecoder (shared_ptr<const Film> f, shared_ptr<const StillImageContent> c)
 	: Decoder (f)
-	, VideoDecoder (f)
+	, VideoDecoder (f, c)
 	, StillImage (c)
 {
 
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 7022965bd..3002ef61c 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -40,11 +40,11 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
 static void
-video_proxy (weak_ptr<Encoder> encoder, shared_ptr<const Image> image, bool same)
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<const Image> image, Eyes eyes, bool same)
 {
 	shared_ptr<Encoder> e = encoder.lock ();
 	if (e) {
-		e->process_video (image, same);
+		e->process_video (image, eyes, same);
 	}
 }
 
@@ -67,7 +67,7 @@ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	, _player (f->make_player ())
 	, _encoder (new Encoder (f, j))
 {
-	_player->Video.connect (bind (video_proxy, _encoder, _1, _2));
+	_player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3));
 	_player->Audio.connect (bind (audio_proxy, _encoder, _1));
 }
 
diff --git a/src/lib/types.h b/src/lib/types.h
index b1b359810..d6136fc3e 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -40,12 +40,21 @@ enum VideoFrameType
 	VIDEO_FRAME_TYPE_3D_LEFT_RIGHT
 };
 
+enum Eyes
+{
+	EYES_BOTH,
+	EYES_LEFT,
+	EYES_RIGHT,
+	EYES_COUNT
+};
+
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
  */
 struct Crop
 {
 	Crop () : left (0), right (0), top (0), bottom (0) {}
+	Crop (int l, int r, int t, int b) : left (l), right (r), top (t), bottom (b) {}
 
 	/** Number of pixels to remove from the left-hand side */
 	int left;
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 7eca53c3d..076cd6ec6 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -35,6 +35,7 @@ int const VideoContentProperty::VIDEO_RATIO	 = 4;
 using std::string;
 using std::stringstream;
 using std::setprecision;
+using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::optional;
@@ -231,7 +232,7 @@ VideoContent::set_video_frame_type (VideoFrameType t)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_video_frame_rate = t;
+		_video_frame_type = t;
 	}
 
 	signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE);
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 38d5dfcb8..eaa4534e4 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -25,8 +25,9 @@
 using std::cout;
 using boost::shared_ptr;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
 	: Decoder (f)
+	, _video_content (c)
 	, _video_position (0)
 {
 
@@ -35,7 +36,19 @@ VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
 void
 VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
 {
-	Video (image, same, frame);
+	switch (_video_content->video_frame_type ()) {
+	case VIDEO_FRAME_TYPE_2D:
+		Video (image, EYES_BOTH, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+	{
+		int const half = image->size().width / 2;
+		Video (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, frame);
+		Video (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, frame);
+		break;
+	}
+	}
+	
 	_video_position = frame + 1;
 }
 
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 26a11c805..142320a04 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -32,7 +32,7 @@ class Image;
 class VideoDecoder : public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>);
+	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
 
 	/** Seek so that the next pass() will yield (approximately) the requested frame.
 	 *  Pass accurate = true to try harder to get close to the request.
@@ -41,14 +41,16 @@ public:
 
 	/** Emitted when a video frame is ready.
 	 *  First parameter is the video image.
-	 *  Second parameter is true if the image is the same as the last one that was emitted.
-	 *  Third parameter is the frame within our source.
+	 *  Second parameter is the eye(s) which should see this image.
+	 *  Third parameter is true if the image is the same as the last one that was emitted for this Eyes value.
+	 *  Fourth parameter is the frame within our source.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, bool, VideoContent::Frame)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, Eyes, bool, VideoContent::Frame)> Video;
 	
 protected:
 
 	void video (boost::shared_ptr<const Image>, bool, VideoContent::Frame);
+	boost::shared_ptr<const VideoContent> _video_content;
 	VideoContent::Frame _video_position;
 };
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index c5360a122..122dcd716 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -99,7 +99,7 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
 }
 
 void
-Writer::write (shared_ptr<const EncodedData> encoded, int frame)
+Writer::write (shared_ptr<const EncodedData> encoded, int frame, Eyes eyes)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
@@ -107,6 +107,7 @@ Writer::write (shared_ptr<const EncodedData> encoded, int frame)
 	qi.type = QueueItem::FULL;
 	qi.encoded = encoded;
 	qi.frame = frame;
+	qi.eyes = eyes;
 	_queue.push_back (qi);
 	++_queued_full_in_memory;
 
@@ -114,17 +115,18 @@ Writer::write (shared_ptr<const EncodedData> encoded, int frame)
 }
 
 void
-Writer::fake_write (int frame)
+Writer::fake_write (int frame, Eyes eyes)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
-	ifstream ifi (_film->info_path (frame).c_str());
+	ifstream ifi (_film->info_path (frame, eyes).c_str());
 	libdcp::FrameInfo info (ifi);
 	
 	QueueItem qi;
 	qi.type = QueueItem::FAKE;
 	qi.size = info.size;
 	qi.frame = frame;
+	qi.eyes = eyes;
 	_queue.push_back (qi);
 
 	_condition.notify_all ();
@@ -137,6 +139,23 @@ Writer::write (shared_ptr<const AudioBuffers> audio)
 	_sound_asset_writer->write (audio->data(), audio->frames());
 }
 
+/** This must be called from Writer::thread() with an appropriate lock held */
+bool
+Writer::have_sequenced_image_at_queue_head () const
+{
+	if (_queue.empty ()) {
+		return false;
+	}
+
+	/* We assume that we will get either all 2D frames or all 3D frames, not a mixture */
+	
+	bool const eyes_ok = (_queue.front().eyes == EYES_BOTH) ||
+		(_queue.front().eyes == EYES_LEFT && _last_written_eyes == EYES_RIGHT) ||
+		(_queue.front().eyes == EYES_RIGHT && _last_written_eyes == EYES_LEFT);
+	
+	return _queue.front().frame == (_last_written_frame + 1) && eyes_ok;
+}
+
 void
 Writer::thread ()
 try
@@ -149,10 +168,7 @@ try
 			
 			_queue.sort ();
 			
-			if (_finish ||
-			    _queued_full_in_memory > _maximum_frames_in_memory ||
-			    (!_queue.empty() && _queue.front().frame == (_last_written_frame + 1))) {
-				
+			if (_finish || _queued_full_in_memory > _maximum_frames_in_memory || have_sequenced_image_at_queue_head ()) {
 				break;
 			}
 			
@@ -166,7 +182,7 @@ try
 		}
 
 		/* Write any frames that we can write; i.e. those that are in sequence */
-		while (!_queue.empty() && _queue.front().frame == (_last_written_frame + 1)) {
+		while (have_sequenced_image_at_queue_head ()) {
 			QueueItem qi = _queue.front ();
 			_queue.pop_front ();
 			if (qi.type == QueueItem::FULL && qi.encoded) {
@@ -179,10 +195,10 @@ try
 			{
 				_film->log()->log (String::compose (N_("Writer FULL-writes %1 to MXF"), qi.frame));
 				if (!qi.encoded) {
-					qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, false)));
+					qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false)));
 				}
 				libdcp::FrameInfo const fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size());
-				qi.encoded->write_info (_film, qi.frame, fin);
+				qi.encoded->write_info (_film, qi.frame, qi.eyes, fin);
 				_last_written = qi.encoded;
 				++_full_written;
 				break;
@@ -197,7 +213,7 @@ try
 			{
 				_film->log()->log (String::compose (N_("Writer REPEAT-writes %1 to MXF"), qi.frame));
 				libdcp::FrameInfo const fin = _picture_asset_writer->write (_last_written->data(), _last_written->size());
-				_last_written->write_info (_film, qi.frame, fin);
+				_last_written->write_info (_film, qi.frame, qi.eyes, fin);
 				++_repeat_written;
 				break;
 			}
@@ -231,7 +247,7 @@ try
 			
 			lock.unlock ();
 			_film->log()->log (String::compose (N_("Writer full (awaiting %1); pushes %2 to disk"), _last_written_frame + 1, qi.frame));
-			qi.encoded->write (_film, qi.frame);
+			qi.encoded->write (_film, qi.frame, qi.eyes);
 			lock.lock ();
 			qi.encoded.reset ();
 			--_queued_full_in_memory;
@@ -324,19 +340,44 @@ Writer::finish ()
 
 /** Tell the writer that frame `f' should be a repeat of the frame before it */
 void
-Writer::repeat (int f)
+Writer::repeat (int f, Eyes e)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
 	QueueItem qi;
 	qi.type = QueueItem::REPEAT;
 	qi.frame = f;
+	qi.eyes = e;
 	
 	_queue.push_back (qi);
 
 	_condition.notify_all ();
 }
 
+bool
+Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes)
+{
+	/* Read the frame info as written */
+	ifstream ifi (_film->info_path (f, eyes).c_str());
+	libdcp::FrameInfo info (ifi);
+	
+	/* Read the data from the MXF and hash it */
+	fseek (mxf, info.offset, SEEK_SET);
+	EncodedData data (info.size);
+	size_t const read = fread (data.data(), 1, data.size(), mxf);
+	if (read != static_cast<size_t> (data.size ())) {
+		_film->log()->log (String::compose ("Existing frame %1 is incomplete", f));
+		return false;
+	}
+	
+	string const existing_hash = md5_digest (data.data(), data.size());
+	if (existing_hash != info.hash) {
+		_film->log()->log (String::compose ("Existing frame %1 failed hash check", f));
+		return false;
+	}
+
+	return true;
+}
 
 void
 Writer::check_existing_picture_mxf ()
@@ -353,23 +394,17 @@ Writer::check_existing_picture_mxf ()
 
 	while (1) {
 
-		/* Read the frame info as written */
-		ifstream ifi (_film->info_path (_first_nonexistant_frame).c_str());
-		libdcp::FrameInfo info (ifi);
-
-		/* Read the data from the MXF and hash it */
-		fseek (mxf, info.offset, SEEK_SET);
-		EncodedData data (info.size);
-		size_t const read = fread (data.data(), 1, data.size(), mxf);
-		if (read != static_cast<size_t> (data.size ())) {
-			_film->log()->log (String::compose ("Existing frame %1 is incomplete", _first_nonexistant_frame));
-			break;
-		}
-		
-		string const existing_hash = md5_digest (data.data(), data.size());
-		if (existing_hash != info.hash) {
-			_film->log()->log (String::compose ("Existing frame %1 failed hash check", _first_nonexistant_frame));
-			break;
+		if (_film->dcp_3d ()) {
+			if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {
+				break;
+			}
+			if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_RIGHT)) {
+				break;
+			}
+		} else {
+			if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_BOTH)) {
+				break;
+			}
 		}
 
 		_film->log()->log (String::compose ("Have existing frame %1", _first_nonexistant_frame));
@@ -394,11 +429,15 @@ Writer::can_fake_write (int frame) const
 bool
 operator< (QueueItem const & a, QueueItem const & b)
 {
-	return a.frame < b.frame;
+	if (a.frame != b.frame) {
+		return a.frame < b.frame;
+	}
+	
+	return a.eyes == EYES_LEFT && b.eyes == EYES_RIGHT;
 }
 
 bool
 operator== (QueueItem const & a, QueueItem const & b)
 {
-	return a.frame == b.frame;
+	return a.frame == b.frame && a.eyes == b.eyes;
 }
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 1e5d86489..023107d97 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -22,6 +22,7 @@
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include "exceptions.h"
+#include "types.h"
 
 class Film;
 class EncodedData;
@@ -56,6 +57,7 @@ public:
 	int size;
 	/** frame index */
 	int frame;
+	Eyes eyes;
 };
 
 bool operator< (QueueItem const & a, QueueItem const & b);
@@ -68,16 +70,18 @@ public:
 
 	bool can_fake_write (int) const;
 	
-	void write (boost::shared_ptr<const EncodedData>, int);
-	void fake_write (int);
+	void write (boost::shared_ptr<const EncodedData>, int, Eyes);
+	void fake_write (int, Eyes);
 	void write (boost::shared_ptr<const AudioBuffers>);
-	void repeat (int f);
+	void repeat (int f, Eyes);
 	void finish ();
 
 private:
 
 	void thread ();
 	void check_existing_picture_mxf ();
+	bool check_existing_picture_mxf_frame (FILE *, int, Eyes);
+	bool have_sequenced_image_at_queue_head () const;
 
 	/** our Film */
 	boost::shared_ptr<const Film> _film;
@@ -101,6 +105,7 @@ private:
 	boost::shared_ptr<const EncodedData> _last_written;
 	/** the index of the last written frame */
 	int _last_written_frame;
+	Eyes _last_written_eyes;
 	/** maximum number of frames to hold in memory, for when we are managing
 	    ordering
 	*/
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 45d11cf80..f5d0ecae2 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -109,15 +109,12 @@ AudioMappingView::left_click (wxGridEvent& ev)
 	}
 	
 	if (_grid->GetCellValue (ev.GetRow(), ev.GetCol()) == wxT("1")) {
-		cout << "set " << ev.GetRow() << " " << ev.GetCol() << " to 0.\n";
 		_grid->SetCellValue (ev.GetRow(), ev.GetCol(), wxT("0"));
 	} else {
-		cout << "set " << ev.GetRow() << " " << ev.GetCol() << " to 1.\n";
 		_grid->SetCellValue (ev.GetRow(), ev.GetCol(), wxT("1"));
 	}
 
 	_map = AudioMapping (_map.content_channels ());
-	cout << "was: " << _map.dcp_to_content(libdcp::CENTRE).size() << "\n";
 	
 	for (int i = 0; i < _grid->GetNumberRows(); ++i) {
 		for (int j = 1; j < _grid->GetNumberCols(); ++j) {
@@ -127,7 +124,6 @@ AudioMappingView::left_click (wxGridEvent& ev)
 		}
 	}
 
-	cout << "changed: " << _map.dcp_to_content(libdcp::CENTRE).size() << "\n";
 	Changed (_map);
 }
 
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 39935927f..048791a10 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -151,6 +151,10 @@ FilmEditor::make_dcp_panel ()
 	grid->Add (_dcp_audio_channels, wxGBPosition (r, 1));
 	++r;
 
+	_dcp_3d = new wxCheckBox (_dcp_panel, wxID_ANY, _("3D"));
+	grid->Add (_dcp_3d, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+
 	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Resolution"), true, wxGBPosition (r, 0));
 	_dcp_resolution = new wxChoice (_dcp_panel, wxID_ANY);
 	grid->Add (_dcp_resolution, wxGBPosition (r, 1));
@@ -219,6 +223,7 @@ FilmEditor::connect_to_widgets ()
 	_j2k_bandwidth->Connect		 (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,	wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
 	_dcp_resolution->Connect         (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_resolution_changed), 0, this);
 	_sequence_video->Connect         (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::sequence_video_changed), 0, this);
+	_dcp_3d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::dcp_3d_changed, this));
 }
 
 void
@@ -403,6 +408,9 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::SEQUENCE_VIDEO:
 		checked_set (_sequence_video, _film->sequence_video ());
 		break;
+	case Film::DCP_3D:
+		checked_set (_dcp_3d, _film->dcp_3d ());
+		break;
 	}
 }
 
@@ -521,6 +529,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::DCP_VIDEO_FRAME_RATE);
 	film_changed (Film::DCP_AUDIO_CHANNELS);
 	film_changed (Film::SEQUENCE_VIDEO);
+	film_changed (Film::DCP_3D);
 
 	if (!_film->content().empty ()) {
 		set_selection (_film->content().front ());
@@ -549,6 +558,7 @@ FilmEditor::set_general_sensitivity (bool s)
 	_sequence_video->Enable (s);
 	_dcp_resolution->Enable (s);
 	_scaler->Enable (s);
+	_dcp_3d->Enable (s);
 
 	/* Set the panels in the content notebook */
 	for (list<FilmEditorPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {
@@ -824,3 +834,13 @@ FilmEditor::content_right_click (wxListEvent& ev)
 	cl.push_back (selected_content ());
 	_menu.popup (cl, ev.GetPoint ());
 }
+
+void
+FilmEditor::dcp_3d_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_dcp_3d (_dcp_3d->GetValue ());
+}
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 66913643e..9a9ba2906 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -89,6 +89,7 @@ private:
 	void dcp_resolution_changed (wxCommandEvent &);
 	void sequence_video_changed (wxCommandEvent &);
 	void content_right_click (wxListEvent &);
+	void dcp_3d_changed ();
 
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
@@ -135,6 +136,7 @@ private:
 	wxChoice* _dcp_frame_rate;
 	wxSpinCtrl* _dcp_audio_channels;
 	wxButton* _best_dcp_frame_rate;
+	wxCheckBox* _dcp_3d;
 	wxChoice* _dcp_resolution;
 
 	ContentMenu _menu;
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 42654bde5..b9d554c68 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -131,7 +131,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 
 	_player = f->make_player ();
 	_player->disable_audio ();
-	_player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _3));
+	_player->Video.connect (boost::bind (&FilmViewer::process_video, this, _1, _2, _4));
 	_player->Changed.connect (boost::bind (&FilmViewer::player_changed, this, _1));
 
 	calculate_sizes ();
@@ -280,8 +280,12 @@ FilmViewer::check_play_state ()
 }
 
 void
-FilmViewer::process_video (shared_ptr<const Image> image, Time t)
+FilmViewer::process_video (shared_ptr<const Image> image, Eyes eyes, Time t)
 {
+	if (eyes == EYES_RIGHT) {
+		return;
+	}
+	
 	if (_got_frame) {
 		/* This is an additional frame emitted by a single pass.  Store it. */
 		_queue.push_front (make_pair (image, t));
@@ -332,7 +336,7 @@ FilmViewer::fetch_next_frame ()
 	_got_frame = false;
 	
 	if (!_queue.empty ()) {
-		process_video (_queue.back().first, _queue.back().second);
+		process_video (_queue.back().first, EYES_BOTH, _queue.back().second);
 		_queue.pop_back ();
 	} else {
 		try {
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index b45e53d31..af58b5467 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -58,7 +58,7 @@ private:
 	void slider_moved (wxScrollEvent &);
 	void play_clicked (wxCommandEvent &);
 	void timer (wxTimerEvent &);
-	void process_video (boost::shared_ptr<const Image>, Time);
+	void process_video (boost::shared_ptr<const Image>, Eyes, Time);
 	void calculate_sizes ();
 	void check_play_state ();
 	void fetch_current_frame_again ();
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index e08edfa5a..ce0c869ff 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -28,6 +28,7 @@
 using std::vector;
 using std::string;
 using std::pair;
+using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
@@ -103,7 +104,7 @@ VideoPanel::VideoPanel (FilmEditor* e)
 	_frame_type->Append (_("2D"));
 	_frame_type->Append (_("3D left/right"));
 
-	_frame_type->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, bind (&VideoPanel::frame_type_changed, this));
+	_frame_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, bind (&VideoPanel::frame_type_changed, this));
 	_left_crop->Connect      (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::left_crop_changed), 0, this);
 	_right_crop->Connect     (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::right_crop_changed), 0, this);
 	_top_crop->Connect       (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (VideoPanel::top_crop_changed), 0, this);
@@ -180,7 +181,7 @@ VideoPanel::film_content_changed (shared_ptr<Content> c, int property)
 	shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
 
 	if (property == VideoContentProperty::VIDEO_FRAME_TYPE) {
-		checked_set (_frame_type, vc->video_frame_type ());
+		checked_set (_frame_type, vc ? vc->video_frame_type () : VIDEO_FRAME_TYPE_2D);
 	} else if (property == VideoContentProperty::VIDEO_CROP) {
 		checked_set (_left_crop,   vc ? vc->crop().left	: 0);
 		checked_set (_right_crop,  vc ? vc->crop().right	: 0);
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 7b5b2b7ef..2dc1545d6 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -75,6 +75,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 		new DCPVideoFrame (
 			image,
 			0,
+			EYES_BOTH,
 			24,
 			200000000,
 			log
-- 
cgit v1.2.3


From 4eb77be6999a3758998bfe37b28d4bb1cd55d51e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 23 Jul 2013 11:14:44 +0100
Subject: Various 3D fixes.

---
 src/lib/dcp_video_frame.cc | 14 +++++++-
 src/lib/encoder.cc         |  8 +++--
 src/lib/player.cc          |  3 +-
 src/lib/writer.cc          | 81 +++++++++++++++++++++++++++++++---------------
 test/threed_test.cc        | 51 +++++++++++++++++++++++++++++
 test/wscript               |  1 +
 6 files changed, 128 insertions(+), 30 deletions(-)
 create mode 100644 test/threed_test.cc

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 10f1e4ad1..4f6ff9987 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -185,7 +185,19 @@ DCPVideoFrame::encode_locally ()
 		throw EncodeError (N_("JPEG2000 encoding failed"));
 	}
 
-	_log->log (String::compose (N_("Finished locally-encoded frame %1"), _frame));
+	switch (_eyes) {
+	case EYES_BOTH:
+		_log->log (String::compose (N_("Finished locally-encoded frame %1 for mono"), _frame));
+		break;
+	case EYES_LEFT:
+		_log->log (String::compose (N_("Finished locally-encoded frame %1 for L"), _frame));
+		break;
+	case EYES_RIGHT:
+		_log->log (String::compose (N_("Finished locally-encoded frame %1 for R"), _frame));
+		break;
+	default:
+		break;
+	}
 
 	shared_ptr<EncodedData> enc (new LocallyEncodedData (cio->buffer, cio_tell (cio)));
 
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 8e61a0d60..7959fda6f 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -175,6 +175,8 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, bool same)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
+	/* XXX: discard 3D here if required */
+
 	/* Wait until the queue has gone down a bit */
 	while (_queue.size() >= _threads.size() * 2 && !_terminate) {
 		TIMING ("decoder sleeps with queue of %1", _queue.size());
@@ -212,7 +214,9 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, bool same)
 		_have_a_real_frame[eyes] = true;
 	}
 
-	++_video_frames_out;
+	if (eyes != EYES_LEFT) {
+		++_video_frames_out;
+	}
 }
 
 void
@@ -262,7 +266,7 @@ Encoder::encoder_thread (ServerDescription* server)
 
 		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
 		shared_ptr<DCPVideoFrame> vf = _queue.front ();
-		_film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 from queue"), boost::this_thread::get_id(), vf->frame()), Log::VERBOSE);
+		_film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 (%3) from queue"), boost::this_thread::get_id(), vf->frame(), vf->eyes ()));
 		_queue.pop_front ();
 		
 		lock.unlock ();
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 20beda945..e1173a36b 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -32,6 +32,7 @@
 #include "image.h"
 #include "ratio.h"
 #include "resampler.h"
+#include "log.h"
 #include "scaler.h"
 
 using std::list;
@@ -240,7 +241,7 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 
 #ifdef DCPOMATIC_DEBUG
 	_last_video = piece->content;
-#endif	
+#endif
 
 	Video (work_image, eyes, same, time);
 	time += TIME_HZ / _film->dcp_video_frame_rate();
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 90e1bd554..b9c1ce2e1 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -57,6 +57,7 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
 	, _finish (false)
 	, _queued_full_in_memory (0)
 	, _last_written_frame (-1)
+	, _last_written_eyes (EYES_RIGHT)
 	, _full_written (0)
 	, _fake_written (0)
 	, _repeat_written (0)
@@ -127,10 +128,21 @@ Writer::write (shared_ptr<const EncodedData> encoded, int frame, Eyes eyes)
 	qi.type = QueueItem::FULL;
 	qi.encoded = encoded;
 	qi.frame = frame;
-	qi.eyes = eyes;
-	_queue.push_back (qi);
-	++_queued_full_in_memory;
 
+	if (_film->dcp_3d() && eyes == EYES_BOTH) {
+		/* 2D material in a 3D DCP; fake the 3D */
+		qi.eyes = EYES_LEFT;
+		_queue.push_back (qi);
+		++_queued_full_in_memory;
+		qi.eyes = EYES_RIGHT;
+		_queue.push_back (qi);
+		++_queued_full_in_memory;
+	} else {
+		qi.eyes = eyes;
+		_queue.push_back (qi);
+		++_queued_full_in_memory;
+	}
+	
 	_condition.notify_all ();
 }
 
@@ -159,7 +171,9 @@ Writer::write (shared_ptr<const AudioBuffers> audio)
 	_sound_asset_writer->write (audio->data(), audio->frames());
 }
 
-/** This must be called from Writer::thread() with an appropriate lock held */
+/** This must be called from Writer::thread() with an appropriate lock held,
+ *  and with _queue sorted.
+ */
 bool
 Writer::have_sequenced_image_at_queue_head () const
 {
@@ -167,13 +181,24 @@ Writer::have_sequenced_image_at_queue_head () const
 		return false;
 	}
 
-	/* We assume that we will get either all 2D frames or all 3D frames, not a mixture */
-	
-	bool const eyes_ok = (_queue.front().eyes == EYES_BOTH) ||
-		(_queue.front().eyes == EYES_LEFT && _last_written_eyes == EYES_RIGHT) ||
-		(_queue.front().eyes == EYES_RIGHT && _last_written_eyes == EYES_LEFT);
-	
-	return _queue.front().frame == (_last_written_frame + 1) && eyes_ok;
+	/* The queue should contain only EYES_LEFT/EYES_RIGHT pairs or EYES_BOTH */
+
+	if (_queue.front().eyes == EYES_BOTH) {
+		/* 2D */
+		return _queue.front().frame == (_last_written_frame + 1);
+	}
+
+	/* 3D */
+
+	if (_last_written_eyes == EYES_LEFT && _queue.front().frame == _last_written_frame && _queue.front().eyes == EYES_RIGHT) {
+		return true;
+	}
+
+	if (_last_written_eyes == EYES_RIGHT && _queue.front().frame == (_last_written_frame + 1) && _queue.front().eyes == EYES_LEFT) {
+		return true;
+	}
+
+	return false;
 }
 
 void
@@ -191,7 +216,7 @@ try
 			if (_finish || _queued_full_in_memory > _maximum_frames_in_memory || have_sequenced_image_at_queue_head ()) {
 				break;
 			}
-			
+
 			TIMING (N_("writer sleeps with a queue of %1"), _queue.size());
 			_condition.wait (lock);
 			TIMING (N_("writer wakes with a queue of %1"), _queue.size());
@@ -245,25 +270,21 @@ try
 				if (_mono_picture_asset_writer) {
 
 					libdcp::FrameInfo fin = _mono_picture_asset_writer->write (
-						_last_written[EYES_BOTH]->data(),
-						_last_written[EYES_BOTH]->size()
+						_last_written[qi.eyes]->data(),
+						_last_written[qi.eyes]->size()
 						);
 					
-					_last_written[EYES_BOTH]->write_info (_film, qi.frame, qi.eyes, fin);
+					_last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, fin);
 					
 				} else {
 					
 					libdcp::FrameInfo fin = _stereo_picture_asset_writer->write (
-						_last_written[EYES_LEFT]->data(), _last_written[EYES_LEFT]->size(), libdcp::EYE_LEFT
+						_last_written[qi.eyes]->data(),
+						_last_written[qi.eyes]->size(),
+						qi.eyes == EYES_LEFT ? libdcp::EYE_LEFT : libdcp::EYE_RIGHT
 						);
 					
-					_last_written[EYES_LEFT]->write_info (_film, qi.frame, qi.eyes, fin);
-
-					fin = _stereo_picture_asset_writer->write (
-						_last_written[EYES_RIGHT]->data(), _last_written[EYES_RIGHT]->size(), libdcp::EYE_RIGHT
-						);
-
-					_last_written[EYES_RIGHT]->write_info (_film, qi.frame, qi.eyes, fin);
+					_last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, fin);
 				}
 					
 				++_repeat_written;
@@ -271,14 +292,15 @@ try
 			}
 			}
 			lock.lock ();
+
+			_last_written_frame = qi.frame;
+			_last_written_eyes = qi.eyes;
 			
 			if (_film->length()) {
 				_job->set_progress (
 					float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length())
 					);
 			}
-
-			++_last_written_frame;
 		}
 
 		while (_queued_full_in_memory > _maximum_frames_in_memory) {
@@ -298,7 +320,14 @@ try
 			++_pushed_to_disk;
 			
 			lock.unlock ();
-			_film->log()->log (String::compose (N_("Writer full (awaiting %1); pushes %2 to disk"), _last_written_frame + 1, qi.frame));
+
+			_film->log()->log (
+				String::compose (
+					"Writer full (awaiting %1 [last eye was %2]); pushes %3 to disk",
+					_last_written_frame + 1,
+					_last_written_eyes, qi.frame)
+				);
+			
 			qi.encoded->write (_film, qi.frame, qi.eyes);
 			lock.lock ();
 			qi.encoded.reset ();
diff --git a/test/threed_test.cc b/test/threed_test.cc
new file mode 100644
index 000000000..50fe87b4a
--- /dev/null
+++ b/test/threed_test.cc
@@ -0,0 +1,51 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/test/unit_test.hpp>
+#include "test.h"
+#include "lib/film.h"
+#include "lib/ratio.h"
+#include "lib/dcp_content_type.h"
+#include "lib/ffmpeg_content.h"
+
+using std::cout;
+using boost::shared_ptr;
+
+BOOST_AUTO_TEST_CASE (threed_test)
+{
+	cout << "here we go.\n";
+	shared_ptr<Film> film = new_test_film ("threed_test");
+	film->set_name ("test_film2");
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+	c->set_ratio (Ratio::from_id ("185"));
+	c->set_video_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
+	film->examine_and_add_content (c);
+
+	wait_for_jobs ();
+	
+	film->set_container (Ratio::from_id ("185"));
+	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->set_dcp_3d (true);
+	film->make_dcp ();
+	film->write_metadata ();
+
+	wait_for_jobs ();
+
+	exit (EXIT_SUCCESS);
+}
diff --git a/test/wscript b/test/wscript
index f0ee5f769..c59d9f7cf 100644
--- a/test/wscript
+++ b/test/wscript
@@ -16,6 +16,7 @@ def build(bld):
     obj.use    = 'libdcpomatic'
     obj.source = """
                  test.cc
+                 threed_test.cc
                  play_test.cc
                  frame_rate_test.cc
                  silence_padding_test.cc
-- 
cgit v1.2.3


From 38fda7888663429d452b9c71902e8bb5239dd720 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 23 Jul 2013 16:51:07 +0100
Subject: Remove some dcp prefixes; better logging of content on DCP creation.

---
 src/lib/analyse_audio_job.cc    |  4 +-
 src/lib/audio_content.cc        |  6 +++
 src/lib/audio_content.h         |  1 +
 src/lib/content.cc              |  6 +++
 src/lib/content.h               |  1 +
 src/lib/encoder.cc              |  2 +-
 src/lib/ffmpeg_content.cc       | 32 ++++++++++++--
 src/lib/ffmpeg_content.h        |  1 +
 src/lib/film.cc                 | 83 +++++++++++++++++-----------------
 src/lib/film.h                  | 43 +++++++++---------
 src/lib/player.cc               | 24 +++++-----
 src/lib/sndfile_content.cc      | 10 ++++-
 src/lib/sndfile_content.h       |  1 +
 src/lib/still_image_content.cc  | 10 ++++-
 src/lib/still_image_content.h   |  1 +
 src/lib/still_image_examiner.cc |  2 +-
 src/lib/video_content.cc        |  6 +++
 src/lib/video_content.h         |  1 +
 src/lib/writer.cc               | 24 +++++-----
 src/wx/audio_panel.cc           |  4 +-
 src/wx/film_editor.cc           | 98 ++++++++++++++++++++---------------------
 src/wx/film_editor.h            | 20 ++++-----
 src/wx/film_viewer.cc           |  6 +--
 src/wx/timing_panel.cc          |  8 ++--
 test/ffmpeg_dcp_test.cc         |  2 +-
 test/frame_rate_test.cc         | 14 +++---
 test/play_test.cc               |  2 +-
 test/silence_padding_test.cc    |  2 +-
 test/threed_test.cc             |  2 +-
 29 files changed, 240 insertions(+), 176 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 2848c1ed7..3902ec537 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -70,8 +70,8 @@ AnalyseAudioJob::run ()
 
 	_samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length()) / _num_points);
 
-	_current.resize (_film->dcp_audio_channels ());
-	_analysis.reset (new AudioAnalysis (_film->dcp_audio_channels ()));
+	_current.resize (_film->audio_channels ());
+	_analysis.reset (new AudioAnalysis (_film->audio_channels ()));
 
 	_done = 0;
 	while (!player->pass ()) {
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 4814f8244..100264d44 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -112,3 +112,9 @@ AudioContent::audio_analysis_path () const
 
 	return film->audio_analysis_path (dynamic_pointer_cast<const AudioContent> (shared_from_this ()));
 }
+
+string
+AudioContent::technical_summary () const
+{
+	return String::compose ("audio: channels %1, length %2, raw rate %3, out rate %4", audio_channels(), audio_length(), content_audio_frame_rate(), output_audio_frame_rate());
+}
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 58d00e686..73919105d 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -48,6 +48,7 @@ public:
 	AudioContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
 
 	void as_xml (xmlpp::Node *) const;
+	std::string technical_summary () const;
 
 	virtual int audio_channels () const = 0;
 	virtual AudioContent::Frame audio_length () const = 0;
diff --git a/src/lib/content.cc b/src/lib/content.cc
index cca4d56de..0db93d5e3 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -109,3 +109,9 @@ Content::clone () const
 	as_xml (node);
 	return content_factory (film, shared_ptr<cxml::Node> (new cxml::Node (node)));
 }
+
+string
+Content::technical_summary () const
+{
+	return String::compose ("%1 %2 %3", file(), digest(), start());
+}
diff --git a/src/lib/content.h b/src/lib/content.h
index 26e115354..33af0a624 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -52,6 +52,7 @@ public:
 	
 	virtual void examine (boost::shared_ptr<Job>);
 	virtual std::string summary () const = 0;
+	virtual std::string technical_summary () const;
 	virtual std::string information () const = 0;
 	virtual void as_xml (xmlpp::Node *) const;
 	virtual Time length () const = 0;
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 7959fda6f..0c7434220 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -205,7 +205,7 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, bool same)
 		TIMING ("adding to queue of %1", _queue.size ());
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, _video_frames_out, eyes, _film->dcp_video_frame_rate(),
+						  image, _video_frames_out, eyes, _film->video_frame_rate(),
 						  _film->j2k_bandwidth(), _film->log()
 						  )
 					  ));
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 8419fd31f..00499cf13 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -34,6 +34,7 @@ using std::stringstream;
 using std::vector;
 using std::list;
 using std::cout;
+using std::pair;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
@@ -168,6 +169,28 @@ FFmpegContent::summary () const
 	return String::compose (_("%1 [movie]"), file().filename().string());
 }
 
+string
+FFmpegContent::technical_summary () const
+{
+	string as = "none";
+	if (_audio_stream) {
+		as = String::compose ("id %1", _audio_stream->id);
+	}
+
+	string ss = "none";
+	if (_subtitle_stream) {
+		ss = String::compose ("id %1", _subtitle_stream->id);
+	}
+
+	pair<string, string> filt = Filter::ffmpeg_strings (_filters);
+	
+	return Content::technical_summary() + " - "
+		+ VideoContent::technical_summary() + " - "
+		+ String::compose (
+			"ffmpeg: audio %1, subtitle %2, filters %3 %4", as, ss, filt.first, filt.second
+			);
+}
+
 string
 FFmpegContent::information () const
 {
@@ -253,7 +276,7 @@ FFmpegContent::output_audio_frame_rate () const
 	/* Resample to a DCI-approved sample rate */
 	double t = dcp_audio_frame_rate (content_audio_frame_rate ());
 
-	FrameRateConversion frc (video_frame_rate(), film->dcp_video_frame_rate());
+	FrameRateConversion frc (video_frame_rate(), film->video_frame_rate());
 
 	/* Compensate if the DCP is being run at a different frame rate
 	   to the source; that is, if the video is run such that it will
@@ -262,7 +285,7 @@ FFmpegContent::output_audio_frame_rate () const
 	*/
 
 	if (frc.change_speed) {
-		t *= video_frame_rate() * frc.factor() / film->dcp_video_frame_rate();
+		t *= video_frame_rate() * frc.factor() / film->video_frame_rate();
 	}
 
 	return rint (t);
@@ -326,8 +349,8 @@ FFmpegContent::length () const
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
 	
-	FrameRateConversion frc (video_frame_rate (), film->dcp_video_frame_rate ());
-	return video_length() * frc.factor() * TIME_HZ / film->dcp_video_frame_rate ();
+	FrameRateConversion frc (video_frame_rate (), film->video_frame_rate ());
+	return video_length() * frc.factor() * TIME_HZ / film->video_frame_rate ();
 }
 
 AudioMapping
@@ -379,3 +402,4 @@ FFmpegContent::identifier () const
 
 	return s.str ();
 }
+
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 1af586a71..96d8c1727 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -104,6 +104,7 @@ public:
 	
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
+	std::string technical_summary () const;
 	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
 	Time length () const;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index e9c60429d..b8a26501e 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -93,9 +93,9 @@ Film::Film (string d)
 	, _with_subtitles (false)
 	, _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ())
 	, _dci_metadata (Config::instance()->default_dci_metadata ())
-	, _dcp_video_frame_rate (24)
-	, _dcp_audio_channels (MAX_AUDIO_CHANNELS)
-	, _dcp_3d (false)
+	, _video_frame_rate (24)
+	, _audio_channels (MAX_AUDIO_CHANNELS)
+	, _three_d (false)
 	, _sequence_video (true)
 	, _dirty (false)
 {
@@ -138,11 +138,11 @@ Film::video_identifier () const
 	s << container()->id()
 	  << "_" << resolution_to_string (_resolution)
 	  << "_" << _playlist->video_identifier()
-	  << "_" << _dcp_video_frame_rate
+	  << "_" << _video_frame_rate
 	  << "_" << scaler()->id()
 	  << "_" << j2k_bandwidth();
 
-	if (_dcp_3d) {
+	if (_three_d) {
 		s << "_3D";
 	}
 
@@ -172,13 +172,13 @@ Film::internal_video_mxf_filename () const
 }
 
 string
-Film::dcp_video_mxf_filename () const
+Film::video_mxf_filename () const
 {
 	return filename_safe_name() + "_video.mxf";
 }
 
 string
-Film::dcp_audio_mxf_filename () const
+Film::audio_mxf_filename () const
 {
 	return filename_safe_name() + "_audio.mxf";
 }
@@ -224,13 +224,12 @@ Film::make_dcp ()
 		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"))));
-//	if (length()) {
-//		log()->log (String::compose ("Content length %1", length().get()));
-//	}
-//	log()->log (String::compose ("Content digest %1", content_digest()));
-//	log()->log (String::compose ("Content at %1 fps, DCP at %2 fps", source_frame_rate(), dcp_frame_rate()));
+
+	ContentList cl = content ();
+	for (ContentList::const_iterator i = cl.begin(); i != cl.end(); ++i) {
+		log()->log (String::compose ("Content: %1", (*i)->technical_summary()));
+	}
+	log()->log (String::compose ("DCP video rate %2 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
@@ -329,10 +328,10 @@ Film::write_metadata () const
 	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("DCPVideoFrameRate")->add_child_text (lexical_cast<string> (_dcp_video_frame_rate));
+	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("DCPAudioChannels")->add_child_text (lexical_cast<string> (_dcp_audio_channels));
-	root->add_child("DCP3D")->add_child_text (_dcp_3d ? "1" : "0");
+	root->add_child("AudioChannels")->add_child_text (lexical_cast<string> (_audio_channels));
+	root->add_child("3D")->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"));
 
@@ -376,11 +375,11 @@ Film::read_metadata ()
 	_with_subtitles = f.bool_child ("WithSubtitles");
 	_j2k_bandwidth = f.number_child<int> ("J2KBandwidth");
 	_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
-	_dcp_video_frame_rate = f.number_child<int> ("DCPVideoFrameRate");
+	_video_frame_rate = f.number_child<int> ("VideoFrameRate");
 	_dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate"));
-	_dcp_audio_channels = f.number_child<int> ("DCPAudioChannels");
+	_audio_channels = f.number_child<int> ("AudioChannels");
 	_sequence_video = f.bool_child ("SequenceVideo");
-	_dcp_3d = f.bool_child ("DCP3D");
+	_three_d = f.bool_child ("3D");
 
 	_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"));
 
@@ -446,12 +445,12 @@ Film::dci_name (bool if_created_now) const
 		d << "_" << dcp_content_type()->dci_name();
 	}
 
-	if (dcp_3d ()) {
+	if (three_d ()) {
 		d << "-3D";
 	}
 
-	if (dcp_video_frame_rate() != 24) {
-		d << "-" << dcp_video_frame_rate();
+	if (video_frame_rate() != 24) {
+		d << "-" << video_frame_rate();
 	}
 
 	if (container()) {
@@ -476,7 +475,7 @@ Film::dci_name (bool if_created_now) const
 		}
 	}
 
-	switch (dcp_audio_channels ()) {
+	switch (audio_channels ()) {
 	case 1:
 		d << "_10";
 		break;
@@ -631,33 +630,33 @@ Film::set_dci_metadata (DCIMetadata m)
 }
 
 void
-Film::set_dcp_video_frame_rate (int f)
+Film::set_video_frame_rate (int f)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_video_frame_rate = f;
+		_video_frame_rate = f;
 	}
-	signal_changed (DCP_VIDEO_FRAME_RATE);
+	signal_changed (VIDEO_FRAME_RATE);
 }
 
 void
-Film::set_dcp_audio_channels (int c)
+Film::set_audio_channels (int c)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_audio_channels = c;
+		_audio_channels = c;
 	}
-	signal_changed (DCP_AUDIO_CHANNELS);
+	signal_changed (AUDIO_CHANNELS);
 }
 
 void
-Film::set_dcp_3d (bool t)
+Film::set_three_d (bool t)
 {
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
-		_dcp_3d = t;
+		_three_d = t;
 	}
-	signal_changed (DCP_3D);
+	signal_changed (THREE_D);
 }
 
 void
@@ -670,9 +669,9 @@ Film::signal_changed (Property p)
 
 	switch (p) {
 	case Film::CONTENT:
-		set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
+		set_video_frame_rate (_playlist->best_dcp_frame_rate ());
 		break;
-	case Film::DCP_VIDEO_FRAME_RATE:
+	case Film::VIDEO_FRAME_RATE:
 	case Film::SEQUENCE_VIDEO:
 		_playlist->maybe_sequence_video ();
 		break;
@@ -833,7 +832,7 @@ Film::has_subtitles () const
 }
 
 OutputVideoFrame
-Film::best_dcp_video_frame_rate () const
+Film::best_video_frame_rate () const
 {
 	return _playlist->best_dcp_frame_rate ();
 }
@@ -842,7 +841,7 @@ void
 Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
 {
 	if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
-		set_dcp_video_frame_rate (_playlist->best_dcp_frame_rate ());
+		set_video_frame_rate (_playlist->best_dcp_frame_rate ());
 	} 
 
 	if (ui_signaller) {
@@ -859,29 +858,29 @@ Film::playlist_changed ()
 OutputAudioFrame
 Film::time_to_audio_frames (Time t) const
 {
-	return t * dcp_audio_frame_rate () / TIME_HZ;
+	return t * audio_frame_rate () / TIME_HZ;
 }
 
 OutputVideoFrame
 Film::time_to_video_frames (Time t) const
 {
-	return t * dcp_video_frame_rate () / TIME_HZ;
+	return t * video_frame_rate () / TIME_HZ;
 }
 
 Time
 Film::audio_frames_to_time (OutputAudioFrame f) const
 {
-	return f * TIME_HZ / dcp_audio_frame_rate ();
+	return f * TIME_HZ / audio_frame_rate ();
 }
 
 Time
 Film::video_frames_to_time (OutputVideoFrame f) const
 {
-	return f * TIME_HZ / dcp_video_frame_rate ();
+	return f * TIME_HZ / video_frame_rate ();
 }
 
 OutputAudioFrame
-Film::dcp_audio_frame_rate () const
+Film::audio_frame_rate () const
 {
 	/* XXX */
 	return 48000;
diff --git a/src/lib/film.h b/src/lib/film.h
index 5aff6f0be..7279541e4 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -61,8 +61,8 @@ public:
 	std::string internal_video_mxf_filename () const;
 	boost::filesystem::path audio_analysis_path (boost::shared_ptr<const AudioContent>) const;
 
-	std::string dcp_video_mxf_filename () const;
-	std::string dcp_audio_mxf_filename () const;
+	std::string video_mxf_filename () const;
+	std::string audio_mxf_filename () const;
 
 	void send_dcp_to_tms ();
 	void make_dcp ();
@@ -97,7 +97,7 @@ public:
 	boost::shared_ptr<Player> make_player () const;
 	boost::shared_ptr<Playlist> playlist () const;
 
-	OutputAudioFrame dcp_audio_frame_rate () const;
+	OutputAudioFrame audio_frame_rate () const;
 
 	OutputAudioFrame time_to_audio_frames (Time) const;
 	OutputVideoFrame time_to_video_frames (Time) const;
@@ -110,7 +110,7 @@ public:
 
 	Time length () const;
 	bool has_subtitles () const;
-	OutputVideoFrame best_dcp_video_frame_rate () const;
+	OutputVideoFrame best_video_frame_rate () const;
 
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
@@ -128,10 +128,10 @@ public:
 		WITH_SUBTITLES,
 		J2K_BANDWIDTH,
 		DCI_METADATA,
-		DCP_VIDEO_FRAME_RATE,
-		DCP_AUDIO_CHANNELS,
-		/** The setting of _dcp_3d has been changed */
-		DCP_3D,
+		VIDEO_FRAME_RATE,
+		AUDIO_CHANNELS,
+		/** The setting of _three_d has been changed */
+		THREE_D,
 		SEQUENCE_VIDEO,
 	};
 
@@ -188,20 +188,20 @@ public:
 		return _dci_metadata;
 	}
 
-	/* XXX: -> "video_frame_rate" */
-	int dcp_video_frame_rate () const {
+	/** @return The frame rate of the DCP */
+	int video_frame_rate () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _dcp_video_frame_rate;
+		return _video_frame_rate;
 	}
 
-	int dcp_audio_channels () const {
+	int audio_channels () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _dcp_audio_channels;
+		return _audio_channels;
 	}
 
-	bool dcp_3d () const {
+	bool three_d () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
-		return _dcp_3d;
+		return _three_d;
 	}
 
 	bool sequence_video () const {
@@ -225,9 +225,9 @@ public:
 	void set_with_subtitles (bool);
 	void set_j2k_bandwidth (int);
 	void set_dci_metadata (DCIMetadata);
-	void set_dcp_video_frame_rate (int);
-	void set_dcp_audio_channels (int);
-	void set_dcp_3d (bool);
+	void set_video_frame_rate (int);
+	void set_audio_channels (int);
+	void set_three_d (bool);
 	void set_dci_date_today ();
 	void set_sequence_video (bool);
 
@@ -279,14 +279,15 @@ private:
 	/** DCI naming stuff */
 	DCIMetadata _dci_metadata;
 	/** Frames per second to run our DCP at */
-	int _dcp_video_frame_rate;
+	int _video_frame_rate;
 	/** The date that we should use in a DCI name */
 	boost::gregorian::date _dci_date;
-	int _dcp_audio_channels;
+	/** Number of audio channels to put in the DCP */
+	int _audio_channels;
 	/** If true, the DCP will be written in 3D mode; otherwise in 2D.
 	    This will be regardless of what content is on the playlist.
 	*/
-	bool _dcp_3d;
+	bool _three_d;
 	bool _sequence_video;
 
 	/** true if our state has changed since we last saved it */
diff --git a/src/lib/player.cc b/src/lib/player.cc
index e1173a36b..e50f26534 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -95,7 +95,7 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
 	, _have_valid_pieces (false)
 	, _video_position (0)
 	, _audio_position (0)
-	, _audio_buffers (f->dcp_audio_channels(), 0)
+	, _audio_buffers (f->audio_channels(), 0)
 {
 	_playlist->Changed.connect (bind (&Player::playlist_changed, this));
 	_playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
@@ -213,7 +213,7 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 	shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content);
 	assert (content);
 
-	FrameRateConversion frc (content->video_frame_rate(), _film->dcp_video_frame_rate());
+	FrameRateConversion frc (content->video_frame_rate(), _film->video_frame_rate());
 	if (frc.skip && (frame % 2) == 1) {
 		return;
 	}
@@ -224,7 +224,7 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 	
 	work_image = work_image->scale_and_convert_to_rgb (image_size, _film->scaler(), true);
 
-	Time time = content->start() + (frame * frc.factor() * TIME_HZ / _film->dcp_video_frame_rate());
+	Time time = content->start() + (frame * frc.factor() * TIME_HZ / _film->video_frame_rate());
 	
 	if (_film->with_subtitles () && _out_subtitle.image && time >= _out_subtitle.from && time <= _out_subtitle.to) {
 		work_image->alpha_blend (_out_subtitle.image, _out_subtitle.position);
@@ -244,11 +244,11 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 #endif
 
 	Video (work_image, eyes, same, time);
-	time += TIME_HZ / _film->dcp_video_frame_rate();
+	time += TIME_HZ / _film->video_frame_rate();
 
 	if (frc.repeat) {
 		Video (work_image, eyes, true, time);
-		time += TIME_HZ / _film->dcp_video_frame_rate();
+		time += TIME_HZ / _film->video_frame_rate();
 	}
 
 	_video_position = piece->video_position = time;
@@ -272,7 +272,7 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 	}
 
 	/* Remap channels */
-	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->dcp_audio_channels(), audio->frames()));
+	shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
 	dcp_mapped->make_silent ();
 	list<pair<int, libdcp::Channel> > map = content->audio_mapping().content_to_dcp ();
 	for (list<pair<int, libdcp::Channel> >::iterator i = map.begin(); i != map.end(); ++i) {
@@ -283,11 +283,11 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
 
 	audio = dcp_mapped;
 
-	Time time = content->start() + (frame * TIME_HZ / _film->dcp_audio_frame_rate()) + (content->audio_delay() * TIME_HZ / 1000);
+	Time time = content->start() + (frame * TIME_HZ / _film->audio_frame_rate()) + (content->audio_delay() * TIME_HZ / 1000);
 
 	/* We must cut off anything that comes before the start of all time */
 	if (time < 0) {
-		int const frames = - time * _film->dcp_audio_frame_rate() / TIME_HZ;
+		int const frames = - time * _film->audio_frame_rate() / TIME_HZ;
 		if (frames >= audio->frames ()) {
 			return;
 		}
@@ -381,12 +381,12 @@ Player::seek (Time t, bool accurate)
 
 		(*i)->video_position = (*i)->audio_position = vc->start() + s;
 
-		FrameRateConversion frc (vc->video_frame_rate(), _film->dcp_video_frame_rate());
+		FrameRateConversion frc (vc->video_frame_rate(), _film->video_frame_rate());
 		/* Here we are converting from time (in the DCP) to a frame number in the content.
 		   Hence we need to use the DCP's frame rate and the double/skip correction, not
 		   the source's rate.
 		*/
-		VideoContent::Frame f = s * _film->dcp_video_frame_rate() / (frc.factor() * TIME_HZ);
+		VideoContent::Frame f = s * _film->video_frame_rate() / (frc.factor() * TIME_HZ);
 		dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (f, accurate);
 	}
 
@@ -529,8 +529,8 @@ Player::emit_black ()
 void
 Player::emit_silence (OutputAudioFrame most)
 {
-	OutputAudioFrame N = min (most, _film->dcp_audio_frame_rate() / 2);
-	shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->dcp_audio_channels(), N));
+	OutputAudioFrame N = min (most, _film->audio_frame_rate() / 2);
+	shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), N));
 	silence->make_silent ();
 	Audio (silence, _audio_position);
 	_audio_position += _film->audio_frames_to_time (N);
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index e5491480f..ee55ede91 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -58,6 +58,14 @@ SndfileContent::summary () const
 	return String::compose (_("%1 [audio]"), file().filename().string());
 }
 
+string
+SndfileContent::technical_summary () const
+{
+	return Content::technical_summary() + " - "
+		+ AudioContent::technical_summary ()
+		+ "sndfile";
+}
+
 string
 SndfileContent::information () const
 {
@@ -141,7 +149,7 @@ SndfileContent::output_audio_frame_rate () const
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
 	
-	return film->dcp_audio_frame_rate ();
+	return film->audio_frame_rate ();
 }
 
 void
diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 3b61eee64..27e0ca21d 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -41,6 +41,7 @@ public:
 	
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
+	std::string technical_summary () const;
 	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
 	Time length () const;
diff --git a/src/lib/still_image_content.cc b/src/lib/still_image_content.cc
index 3a30ccf87..804a5c0f6 100644
--- a/src/lib/still_image_content.cc
+++ b/src/lib/still_image_content.cc
@@ -51,6 +51,14 @@ StillImageContent::summary () const
 	return String::compose (_("%1 [still]"), file().filename().string());
 }
 
+string
+StillImageContent::technical_summary () const
+{
+	return Content::technical_summary() + " - "
+		+ VideoContent::technical_summary() + " - "
+		+ "still";
+}
+
 bool
 StillImageContent::valid_file (boost::filesystem::path f)
 {
@@ -98,7 +106,7 @@ StillImageContent::length () const
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
 	
-	FrameRateConversion frc (video_frame_rate(), film->dcp_video_frame_rate ());
+	FrameRateConversion frc (video_frame_rate(), film->video_frame_rate ());
 	return video_length() * frc.factor() * TIME_HZ / video_frame_rate();
 }
 
diff --git a/src/lib/still_image_content.h b/src/lib/still_image_content.h
index 02921f4e2..b81879279 100644
--- a/src/lib/still_image_content.h
+++ b/src/lib/still_image_content.h
@@ -39,6 +39,7 @@ public:
 
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
+	std::string technical_summary () const;
 	void as_xml (xmlpp::Node *) const;
 	Time length () const;
 
diff --git a/src/lib/still_image_examiner.cc b/src/lib/still_image_examiner.cc
index 71357e5ef..07848d7b9 100644
--- a/src/lib/still_image_examiner.cc
+++ b/src/lib/still_image_examiner.cc
@@ -58,6 +58,6 @@ StillImageExaminer::video_frame_rate () const
 		return 24;
 	}
 
-	return f->dcp_video_frame_rate ();
+	return f->video_frame_rate ();
 }
 
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 076cd6ec6..d70ece340 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -237,3 +237,9 @@ VideoContent::set_video_frame_type (VideoFrameType t)
 
 	signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE);
 }
+
+string
+VideoContent::technical_summary () const
+{
+	return String::compose ("video: length %1, size %2x%3, rate %4", video_length(), video_size().width, video_size().height, video_frame_rate());
+}
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 348e2ce8b..513e1f598 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -45,6 +45,7 @@ public:
 	VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
 
 	void as_xml (xmlpp::Node *) const;
+	std::string technical_summary () const;
 	virtual std::string information () const;
 	virtual std::string identifier () const;
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 939a2906d..522ecc1c1 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -73,12 +73,12 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
 	   it into the DCP later.
 	*/
 
-	if (f->dcp_3d ()) {
+	if (f->three_d ()) {
 		_picture_asset.reset (
 			new libdcp::StereoPictureAsset (
 				_film->internal_video_mxf_dir (),
 				_film->internal_video_mxf_filename (),
-				_film->dcp_video_frame_rate (),
+				_film->video_frame_rate (),
 				_film->container()->size (_film->full_frame ())
 				)
 			);
@@ -88,7 +88,7 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
 			new libdcp::MonoPictureAsset (
 				_film->internal_video_mxf_dir (),
 				_film->internal_video_mxf_filename (),
-				_film->dcp_video_frame_rate (),
+				_film->video_frame_rate (),
 				_film->container()->size (_film->full_frame ())
 				)
 			);
@@ -100,10 +100,10 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
 	_sound_asset.reset (
 		new libdcp::SoundAsset (
 			_film->dir (_film->dcp_name()),
-			_film->dcp_audio_mxf_filename (),
-			_film->dcp_video_frame_rate (),
-			_film->dcp_audio_channels (),
-			_film->dcp_audio_frame_rate ()
+			_film->audio_mxf_filename (),
+			_film->video_frame_rate (),
+			_film->audio_channels (),
+			_film->audio_frame_rate ()
 			)
 		);
 	
@@ -122,7 +122,7 @@ Writer::write (shared_ptr<const EncodedData> encoded, int frame, Eyes eyes)
 	qi.encoded = encoded;
 	qi.frame = frame;
 
-	if (_film->dcp_3d() && eyes == EYES_BOTH) {
+	if (_film->three_d() && eyes == EYES_BOTH) {
 		/* 2D material in a 3D DCP; fake the 3D */
 		qi.eyes = EYES_LEFT;
 		_queue.push_back (qi);
@@ -345,7 +345,7 @@ Writer::finish ()
 	
 	boost::filesystem::path to;
 	to /= _film->dir (_film->dcp_name());
-	to /= _film->dcp_video_mxf_filename ();
+	to /= _film->video_mxf_filename ();
 
 	boost::system::error_code ec;
 	boost::filesystem::create_hard_link (from, to, ec);
@@ -358,7 +358,7 @@ Writer::finish ()
 	/* And update the asset */
 
 	_picture_asset->set_directory (_film->dir (_film->dcp_name ()));
-	_picture_asset->set_file_name (_film->dcp_video_mxf_filename ());
+	_picture_asset->set_file_name (_film->video_mxf_filename ());
 	_sound_asset->set_duration (frames);
 	
 	libdcp::DCP dcp (_film->dir (_film->dcp_name()));
@@ -369,7 +369,7 @@ Writer::finish ()
 			_film->dcp_name(),
 			_film->dcp_content_type()->libdcp_kind (),
 			frames,
-			_film->dcp_video_frame_rate ()
+			_film->video_frame_rate ()
 			)
 		);
 	
@@ -445,7 +445,7 @@ Writer::check_existing_picture_mxf ()
 
 	while (1) {
 
-		if (_film->dcp_3d ()) {
+		if (_film->three_d ()) {
 			if (!check_existing_picture_mxf_frame (mxf, _first_nonexistant_frame, EYES_LEFT)) {
 				break;
 			}
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index b686b6154..e8b1db382 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -100,8 +100,8 @@ void
 AudioPanel::film_changed (Film::Property property)
 {
 	switch (property) {
-	case Film::DCP_AUDIO_CHANNELS:
-		_mapping->set_channels (_editor->film()->dcp_audio_channels ());
+	case Film::AUDIO_CHANNELS:
+		_mapping->set_channels (_editor->film()->audio_channels ());
 		_sizer->Layout ();
 		break;
 	default:
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 048791a10..4a3781ecd 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -138,26 +138,26 @@ FilmEditor::make_dcp_panel ()
 	{
 		add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Frame Rate"), true, wxGBPosition (r, 0));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_dcp_frame_rate = new wxChoice (_dcp_panel, wxID_ANY);
-		s->Add (_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
-		_best_dcp_frame_rate = new wxButton (_dcp_panel, wxID_ANY, _("Use best"));
-		s->Add (_best_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND);
+		_frame_rate = new wxChoice (_dcp_panel, wxID_ANY);
+		s->Add (_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
+		_best_frame_rate = new wxButton (_dcp_panel, wxID_ANY, _("Use best"));
+		s->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND);
 		grid->Add (s, wxGBPosition (r, 1));
 	}
 	++r;
 
 	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Audio channels"), true, wxGBPosition (r, 0));
-	_dcp_audio_channels = new wxSpinCtrl (_dcp_panel, wxID_ANY);
-	grid->Add (_dcp_audio_channels, wxGBPosition (r, 1));
+	_audio_channels = new wxSpinCtrl (_dcp_panel, wxID_ANY);
+	grid->Add (_audio_channels, wxGBPosition (r, 1));
 	++r;
 
-	_dcp_3d = new wxCheckBox (_dcp_panel, wxID_ANY, _("3D"));
-	grid->Add (_dcp_3d, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	_three_d = new wxCheckBox (_dcp_panel, wxID_ANY, _("3D"));
+	grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	++r;
 
 	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Resolution"), true, wxGBPosition (r, 0));
-	_dcp_resolution = new wxChoice (_dcp_panel, wxID_ANY);
-	grid->Add (_dcp_resolution, wxGBPosition (r, 1));
+	_resolution = new wxChoice (_dcp_panel, wxID_ANY);
+	grid->Add (_resolution, wxGBPosition (r, 1));
 	++r;
 
 	{
@@ -192,14 +192,14 @@ FilmEditor::make_dcp_panel ()
 
 	list<int> const dfr = Config::instance()->allowed_dcp_frame_rates ();
 	for (list<int>::const_iterator i = dfr.begin(); i != dfr.end(); ++i) {
-		_dcp_frame_rate->Append (std_to_wx (boost::lexical_cast<string> (*i)));
+		_frame_rate->Append (std_to_wx (boost::lexical_cast<string> (*i)));
 	}
 
-	_dcp_audio_channels->SetRange (0, MAX_AUDIO_CHANNELS);
+	_audio_channels->SetRange (0, MAX_AUDIO_CHANNELS);
 	_j2k_bandwidth->SetRange (50, 250);
 
-	_dcp_resolution->Append (_("2K"));
-	_dcp_resolution->Append (_("4K"));
+	_resolution->Append (_("2K"));
+	_resolution->Append (_("4K"));
 }
 
 void
@@ -217,13 +217,13 @@ FilmEditor::connect_to_widgets ()
 	_content_timeline->Connect	 (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,	wxCommandEventHandler (FilmEditor::content_timeline_clicked), 0, this);
 	_scaler->Connect		 (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,	wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
 	_dcp_content_type->Connect	 (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,	wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
-	_dcp_frame_rate->Connect	 (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,	wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this);
-	_best_dcp_frame_rate->Connect	 (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,	wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this);
-	_dcp_audio_channels->Connect	 (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,	wxCommandEventHandler (FilmEditor::dcp_audio_channels_changed), 0, this);
+	_frame_rate->Connect	         (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,	wxCommandEventHandler (FilmEditor::frame_rate_changed), 0, this);
+	_best_frame_rate->Connect	 (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,	wxCommandEventHandler (FilmEditor::best_frame_rate_clicked), 0, this);
+	_audio_channels->Connect	 (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,	wxCommandEventHandler (FilmEditor::audio_channels_changed), 0, this);
 	_j2k_bandwidth->Connect		 (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,	wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
-	_dcp_resolution->Connect         (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_resolution_changed), 0, this);
+	_resolution->Connect             (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::resolution_changed), 0, this);
 	_sequence_video->Connect         (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::sequence_video_changed), 0, this);
-	_dcp_3d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::dcp_3d_changed, this));
+	_three_d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::three_d_changed, this));
 }
 
 void
@@ -293,37 +293,37 @@ FilmEditor::j2k_bandwidth_changed (wxCommandEvent &)
 }
 
 void
-FilmEditor::dcp_frame_rate_changed (wxCommandEvent &)
+FilmEditor::frame_rate_changed (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 
-	_film->set_dcp_video_frame_rate (
+	_film->set_video_frame_rate (
 		boost::lexical_cast<int> (
-			wx_to_std (_dcp_frame_rate->GetString (_dcp_frame_rate->GetSelection ()))
+			wx_to_std (_frame_rate->GetString (_frame_rate->GetSelection ()))
 			)
 		);
 }
 
 void
-FilmEditor::dcp_audio_channels_changed (wxCommandEvent &)
+FilmEditor::audio_channels_changed (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 
-	_film->set_dcp_audio_channels (_dcp_audio_channels->GetValue ());
+	_film->set_audio_channels (_audio_channels->GetValue ());
 }
 
 void
-FilmEditor::dcp_resolution_changed (wxCommandEvent &)
+FilmEditor::resolution_changed (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 
-	_film->set_resolution (_dcp_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K);
+	_film->set_resolution (_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K);
 }
 
 
@@ -370,7 +370,7 @@ FilmEditor::film_changed (Film::Property p)
 		checked_set (_scaler, Scaler::as_index (_film->scaler ()));
 		break;
 	case Film::RESOLUTION:
-		checked_set (_dcp_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1);
+		checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1);
 		setup_dcp_name ();
 		break;
 	case Film::J2K_BANDWIDTH:
@@ -383,33 +383,33 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::DCI_METADATA:
 		setup_dcp_name ();
 		break;
-	case Film::DCP_VIDEO_FRAME_RATE:
+	case Film::VIDEO_FRAME_RATE:
 	{
 		bool done = false;
-		for (unsigned int i = 0; i < _dcp_frame_rate->GetCount(); ++i) {
-			if (wx_to_std (_dcp_frame_rate->GetString(i)) == boost::lexical_cast<string> (_film->dcp_video_frame_rate())) {
-				checked_set (_dcp_frame_rate, i);
+		for (unsigned int i = 0; i < _frame_rate->GetCount(); ++i) {
+			if (wx_to_std (_frame_rate->GetString(i)) == boost::lexical_cast<string> (_film->video_frame_rate())) {
+				checked_set (_frame_rate, i);
 				done = true;
 				break;
 			}
 		}
 
 		if (!done) {
-			checked_set (_dcp_frame_rate, -1);
+			checked_set (_frame_rate, -1);
 		}
 
-		_best_dcp_frame_rate->Enable (_film->best_dcp_video_frame_rate () != _film->dcp_video_frame_rate ());
+		_best_frame_rate->Enable (_film->best_video_frame_rate () != _film->video_frame_rate ());
 		break;
 	}
-	case Film::DCP_AUDIO_CHANNELS:
-		_dcp_audio_channels->SetValue (_film->dcp_audio_channels ());
+	case Film::AUDIO_CHANNELS:
+		_audio_channels->SetValue (_film->audio_channels ());
 		setup_dcp_name ();
 		break;
 	case Film::SEQUENCE_VIDEO:
 		checked_set (_sequence_video, _film->sequence_video ());
 		break;
-	case Film::DCP_3D:
-		checked_set (_dcp_3d, _film->dcp_3d ());
+	case Film::THREE_D:
+		checked_set (_three_d, _film->three_d ());
 		break;
 	}
 }
@@ -526,10 +526,10 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::WITH_SUBTITLES);
 	film_changed (Film::J2K_BANDWIDTH);
 	film_changed (Film::DCI_METADATA);
-	film_changed (Film::DCP_VIDEO_FRAME_RATE);
-	film_changed (Film::DCP_AUDIO_CHANNELS);
+	film_changed (Film::VIDEO_FRAME_RATE);
+	film_changed (Film::AUDIO_CHANNELS);
 	film_changed (Film::SEQUENCE_VIDEO);
-	film_changed (Film::DCP_3D);
+	film_changed (Film::THREE_D);
 
 	if (!_film->content().empty ()) {
 		set_selection (_film->content().front ());
@@ -550,15 +550,15 @@ FilmEditor::set_general_sensitivity (bool s)
 	_content_remove->Enable (s);
 	_content_timeline->Enable (s);
 	_dcp_content_type->Enable (s);
-	_dcp_frame_rate->Enable (s);
-	_dcp_audio_channels->Enable (s);
+	_frame_rate->Enable (s);
+	_audio_channels->Enable (s);
 	_j2k_bandwidth->Enable (s);
 	_container->Enable (s);
-	_best_dcp_frame_rate->Enable (s && _film && _film->best_dcp_video_frame_rate () != _film->dcp_video_frame_rate ());
+	_best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ());
 	_sequence_video->Enable (s);
-	_dcp_resolution->Enable (s);
+	_resolution->Enable (s);
 	_scaler->Enable (s);
-	_dcp_3d->Enable (s);
+	_three_d->Enable (s);
 
 	/* Set the panels in the content notebook */
 	for (list<FilmEditorPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {
@@ -622,13 +622,13 @@ FilmEditor::setup_dcp_name ()
 }
 
 void
-FilmEditor::best_dcp_frame_rate_clicked (wxCommandEvent &)
+FilmEditor::best_frame_rate_clicked (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 	
-	_film->set_dcp_video_frame_rate (_film->best_dcp_video_frame_rate ());
+	_film->set_video_frame_rate (_film->best_video_frame_rate ());
 }
 
 void
@@ -836,11 +836,11 @@ FilmEditor::content_right_click (wxListEvent& ev)
 }
 
 void
-FilmEditor::dcp_3d_changed ()
+FilmEditor::three_d_changed ()
 {
 	if (!_film) {
 		return;
 	}
 
-	_film->set_dcp_3d (_dcp_3d->GetValue ());
+	_film->set_three_d (_three_d->GetValue ());
 }
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 9a9ba2906..49b091468 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -82,14 +82,14 @@ private:
 	void dcp_content_type_changed (wxCommandEvent &);
 	void scaler_changed (wxCommandEvent &);
 	void j2k_bandwidth_changed (wxCommandEvent &);
-	void dcp_frame_rate_changed (wxCommandEvent &);
-	void best_dcp_frame_rate_clicked (wxCommandEvent &);
+	void frame_rate_changed (wxCommandEvent &);
+	void best_frame_rate_clicked (wxCommandEvent &);
 	void content_timeline_clicked (wxCommandEvent &);
-	void dcp_audio_channels_changed (wxCommandEvent &);
-	void dcp_resolution_changed (wxCommandEvent &);
+	void audio_channels_changed (wxCommandEvent &);
+	void resolution_changed (wxCommandEvent &);
 	void sequence_video_changed (wxCommandEvent &);
 	void content_right_click (wxListEvent &);
-	void dcp_3d_changed ();
+	void three_d_changed ();
 
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
@@ -133,11 +133,11 @@ private:
 	wxChoice* _scaler;
  	wxSpinCtrl* _j2k_bandwidth;
 	wxChoice* _dcp_content_type;
-	wxChoice* _dcp_frame_rate;
-	wxSpinCtrl* _dcp_audio_channels;
-	wxButton* _best_dcp_frame_rate;
-	wxCheckBox* _dcp_3d;
-	wxChoice* _dcp_resolution;
+	wxChoice* _frame_rate;
+	wxSpinCtrl* _audio_channels;
+	wxButton* _best_frame_rate;
+	wxCheckBox* _three_d;
+	wxChoice* _resolution;
 
 	ContentMenu _menu;
 
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index b9d554c68..88b293397 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -268,12 +268,12 @@ FilmViewer::play_clicked (wxCommandEvent &)
 void
 FilmViewer::check_play_state ()
 {
-	if (!_film || _film->dcp_video_frame_rate() == 0) {
+	if (!_film || _film->video_frame_rate() == 0) {
 		return;
 	}
 	
 	if (_play_button->GetValue()) {
-		_timer.Start (1000 / _film->dcp_video_frame_rate());
+		_timer.Start (1000 / _film->video_frame_rate());
 	} else {
 		_timer.Stop ();
 	}
@@ -307,7 +307,7 @@ FilmViewer::set_position_text (Time t)
 		return;
 	}
 		
-	double const fps = _film->dcp_video_frame_rate ();
+	double const fps = _film->video_frame_rate ();
 	/* Count frame number from 1 ... not sure if this is the best idea */
 	_frame_number->SetLabel (wxString::Format (wxT("%d"), int (rint (t * fps / TIME_HZ)) + 1));
 	
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index da62aabdf..ee62797e3 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -49,13 +49,13 @@ TimingPanel::film_content_changed (shared_ptr<Content> content, int property)
 {
 	if (property == ContentProperty::START) {
 		if (content) {
-			_start->set (content->start (), _editor->film()->dcp_video_frame_rate ());
+			_start->set (content->start (), _editor->film()->video_frame_rate ());
 		} else {
 			_start->set (0, 24);
 		}
 	} else if (property == ContentProperty::LENGTH) {
 		if (content) {
-			_length->set (content->length (), _editor->film()->dcp_video_frame_rate ());
+			_length->set (content->length (), _editor->film()->video_frame_rate ());
 		} else {
 			_length->set (0, 24);
 		}
@@ -70,7 +70,7 @@ TimingPanel::start_changed ()
 		return;
 	}
 
-	c->set_start (_start->get (_editor->film()->dcp_video_frame_rate ()));
+	c->set_start (_start->get (_editor->film()->video_frame_rate ()));
 }
 
 void
@@ -83,6 +83,6 @@ TimingPanel::length_changed ()
 
 	shared_ptr<StillImageContent> ic = dynamic_pointer_cast<StillImageContent> (c);
 	if (ic) {
-		ic->set_video_length (_length->get (_editor->film()->dcp_video_frame_rate()) * ic->video_frame_rate() / TIME_HZ);
+		ic->set_video_length (_length->get (_editor->film()->video_frame_rate()) * ic->video_frame_rate() / TIME_HZ);
 	}
 }
diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 66f3af839..ef10e6098 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 	BOOST_CHECK (f->have_dcp());
 
 	p /= f->dcp_name();
-	p /= f->dcp_video_mxf_filename();
+	p /= f->video_mxf_filename();
 	boost::filesystem::remove (p);
 	BOOST_CHECK (!f->have_dcp ());
 }
diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 2ea7e60a5..5cdea8c6b 100644
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -228,7 +228,7 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
 
 	content->_video_frame_rate = 24;
-	film->set_dcp_video_frame_rate (24);
+	film->set_video_frame_rate (24);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 48000);
 
@@ -239,30 +239,30 @@ BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 96000);
 
 	content->_video_frame_rate = 23.976;
-	film->set_dcp_video_frame_rate (24);
+	film->set_video_frame_rate (24);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 47952);
 
 	content->_video_frame_rate = 29.97;
-	film->set_dcp_video_frame_rate (30);
-	BOOST_CHECK_EQUAL (film->dcp_video_frame_rate (), 30);
+	film->set_video_frame_rate (30);
+	BOOST_CHECK_EQUAL (film->video_frame_rate (), 30);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 47952);
 
 	content->_video_frame_rate = 25;
-	film->set_dcp_video_frame_rate (24);
+	film->set_video_frame_rate (24);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 48000, 0)));
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 50000);
 
 	content->_video_frame_rate = 25;
-	film->set_dcp_video_frame_rate (24);
+	film->set_video_frame_rate (24);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 44100, 0)));
 	BOOST_CHECK_EQUAL (content->output_audio_frame_rate(), 50000);
 
 	/* Check some out-there conversions (not the best) */
 	
 	content->_video_frame_rate = 14.99;
-	film->set_dcp_video_frame_rate (25);
+	film->set_video_frame_rate (25);
 	content->set_audio_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream ("a", 42, 16000, 0)));
 	/* The FrameRateConversion within output_audio_frame_rate should choose to double-up
 	   the 14.99 fps video to 30 and then run it slow at 25.
diff --git a/test/play_test.cc b/test/play_test.cc
index c1dabe620..52b54408b 100644
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE (play_test)
 	BOOST_CHECK_EQUAL (B->video_length(), 16);
 	
 	/* Film should have been set to 25fps */
-	BOOST_CHECK_EQUAL (film->dcp_video_frame_rate(), 25);
+	BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);
 
 	BOOST_CHECK_EQUAL (A->start(), 0);
 	/* A is 16 frames long at 25 fps */
diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index a8748f851..82cbad080 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -45,7 +45,7 @@ static void test_silence_padding (int channels)
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
-	film->set_dcp_audio_channels (channels);
+	film->set_audio_channels (channels);
 	film->make_dcp ();
 	wait_for_jobs ();
 
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 4fd5a50c8..31a95e382 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (threed_test)
 	
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-	film->set_dcp_3d (true);
+	film->set_three_d (true);
 	film->make_dcp ();
 	film->write_metadata ();
 
-- 
cgit v1.2.3


From 74a8d26a8907c6e00e29f054178a3425f44e38ed Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 16 Aug 2013 20:14:33 +0100
Subject: Very basics of colour conversion configuration.

---
 src/lib/colour_conversion.cc       | 101 ++++++++++++++++++++++
 src/lib/colour_conversion.h        |  45 ++++++++++
 src/lib/config.cc                  |  24 +++++-
 src/lib/config.h                   |  16 +++-
 src/lib/dcp_video_frame.cc         |   2 +-
 src/lib/dcp_video_frame.h          |   2 +-
 src/lib/encoder.cc                 |   8 +-
 src/lib/encoder.h                  |   2 +-
 src/lib/server.cc                  |   6 +-
 src/lib/server.h                   |   7 +-
 src/lib/wscript                    |   1 +
 src/tools/dcpomatic_cli.cc         |   2 +-
 src/wx/colour_conversion_dialog.cc | 150 +++++++++++++++++++++++++++++++++
 src/wx/colour_conversion_dialog.h  |  39 +++++++++
 src/wx/config_dialog.cc            | 167 ++++++++++++-------------------------
 src/wx/config_dialog.h             |  18 ++--
 src/wx/editable_list.h             | 156 ++++++++++++++++++++++++++++++++++
 src/wx/server_dialog.cc            |   8 +-
 src/wx/server_dialog.h             |   6 +-
 src/wx/video_panel.cc              |  40 +++++++--
 src/wx/video_panel.h               |   3 +
 src/wx/wscript                     |   1 +
 test/client_server_test.cc         |   6 +-
 test/test.cc                       |   2 +-
 24 files changed, 651 insertions(+), 161 deletions(-)
 create mode 100644 src/lib/colour_conversion.cc
 create mode 100644 src/lib/colour_conversion.h
 create mode 100644 src/wx/colour_conversion_dialog.cc
 create mode 100644 src/wx/colour_conversion_dialog.h
 create mode 100644 src/wx/editable_list.h

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
new file mode 100644
index 000000000..96dc0e2c9
--- /dev/null
+++ b/src/lib/colour_conversion.cc
@@ -0,0 +1,101 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/lexical_cast.hpp>
+#include <libxml++/libxml++.h>
+#include <libdcp/colour_matrix.h>
+#include <libcxml/cxml.h>
+#include "colour_conversion.h"
+
+#include "i18n.h"
+
+using std::list;
+using std::string;
+using boost::shared_ptr;
+using boost::lexical_cast;
+
+ColourConversion::ColourConversion ()
+	: name (_("Untitled"))
+	, input_gamma (2.4)
+	, input_gamma_linearised (true)
+	, matrix (3, 3)
+	, output_gamma (2.6)
+{
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			matrix (i, j) = libdcp::colour_matrix::xyz_to_rgb[i][j];
+		}
+	}
+}
+
+ColourConversion::ColourConversion (string n, float i, bool il, float const m[3][3], float o)
+	: name (n)
+	, input_gamma (i)
+	, input_gamma_linearised (il)
+	, matrix (3, 3)
+	, output_gamma (o)
+{
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			matrix (i, j) = m[i][j];
+		}
+	}
+}
+
+ColourConversion::ColourConversion (shared_ptr<cxml::Node> node)
+	: matrix (3, 3)
+{
+	name = node->string_child ("Name");
+	input_gamma = node->number_child<float> ("InputGamma");
+	input_gamma_linearised = node->bool_child ("InputGammaLinearised");
+
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			matrix (i, j) = 0;
+		}
+	}
+
+	list<shared_ptr<cxml::Node> > m = node->node_children ("Matrix");
+	for (list<shared_ptr<cxml::Node> >::iterator i = m.begin(); i != m.end(); ++i) {
+		int const ti = (*i)->number_attribute<int> ("i");
+		int const tj = (*i)->number_attribute<int> ("j");
+		matrix(ti, tj) = lexical_cast<float> ((*i)->content ());
+	}
+
+	output_gamma = node->number_child<float> ("OutputGamma");
+}
+
+void
+ColourConversion::as_xml (xmlpp::Node* node) const
+{
+	node->add_child("Name")->add_child_text (name);
+	node->add_child("InputGamma")->add_child_text (lexical_cast<string> (input_gamma));
+	node->add_child("InputGammaLinearised")->add_child_text (input_gamma_linearised ? "1" : "0");
+
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			xmlpp::Element* m = node->add_child("Matrix");
+			m->set_attribute ("i", lexical_cast<string> (i));
+			m->set_attribute ("j", lexical_cast<string> (j));
+			m->add_child_text (lexical_cast<string> (matrix (i, j)));
+		}
+	}
+
+	node->add_child("OutputGamma")->add_child_text (lexical_cast<string> (output_gamma));
+}
diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
new file mode 100644
index 000000000..ed89f8c63
--- /dev/null
+++ b/src/lib/colour_conversion.h
@@ -0,0 +1,45 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/utility.hpp>
+#include <boost/numeric/ublas/matrix.hpp>
+
+namespace cxml {
+	class Node;
+}
+
+namespace xmlpp {
+	class Node;
+}
+
+class ColourConversion : public boost::noncopyable
+{
+public:
+	ColourConversion ();
+	ColourConversion (std::string, float, bool, float const matrix[3][3], float);
+	ColourConversion (boost::shared_ptr<cxml::Node>);
+
+	void as_xml (xmlpp::Node *) const;
+
+	std::string name;
+	float input_gamma;
+	bool input_gamma_linearised;
+	boost::numeric::ublas::matrix<float> matrix;
+	float output_gamma;
+};
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 29b63b5c8..8f4e5aed0 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -22,6 +22,7 @@
 #include <fstream>
 #include <glib.h>
 #include <boost/filesystem.hpp>
+#include <libdcp/colour_matrix.h>
 #include <libcxml/cxml.h>
 #include "config.h"
 #include "server.h"
@@ -30,6 +31,7 @@
 #include "ratio.h"
 #include "dcp_content_type.h"
 #include "sound_processor.h"
+#include "colour_conversion.h"
 
 #include "i18n.h"
 
@@ -62,6 +64,8 @@ Config::Config ()
 	_allowed_dcp_frame_rates.push_back (48);
 	_allowed_dcp_frame_rates.push_back (50);
 	_allowed_dcp_frame_rates.push_back (60);
+
+	_colour_conversions.push_back (shared_ptr<ColourConversion> (new ColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::xyz_to_rgb, 2.6)));
 }
 
 void
@@ -81,7 +85,7 @@ Config::read ()
 	
 	list<shared_ptr<cxml::Node> > servers = f.node_children ("Server");
 	for (list<shared_ptr<cxml::Node> >::iterator i = servers.begin(); i != servers.end(); ++i) {
-		_servers.push_back (new ServerDescription (*i));
+		_servers.push_back (shared_ptr<ServerDescription> (new ServerDescription (*i)));
 	}
 
 	_tms_ip = f.string_child ("TMSIP");
@@ -111,7 +115,17 @@ Config::read ()
 
 	_default_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata"));
 	_default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
-	_default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000); 
+	_default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
+
+	list<shared_ptr<cxml::Node> > cc = f.node_children ("ColourConversion");
+
+	if (!cc.empty ()) {
+		_colour_conversions.clear ();
+	}
+	
+	for (list<shared_ptr<cxml::Node> >::iterator i = cc.begin(); i != cc.end(); ++i) {
+		_colour_conversions.push_back (shared_ptr<ColourConversion> (new ColourConversion (*i)));
+	}
 }
 
 void
@@ -217,7 +231,7 @@ Config::write () const
 	root->add_child("DefaultDirectory")->add_child_text (_default_directory);
 	root->add_child("ServerPort")->add_child_text (lexical_cast<string> (_server_port));
 	
-	for (vector<ServerDescription*>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
+	for (vector<shared_ptr<ServerDescription> >::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
 		(*i)->as_xml (root->add_child ("Server"));
 	}
 
@@ -245,6 +259,10 @@ Config::write () const
 	root->add_child("DefaultStillLength")->add_child_text (lexical_cast<string> (_default_still_length));
 	root->add_child("DefaultJ2KBandwidth")->add_child_text (lexical_cast<string> (_default_j2k_bandwidth));
 
+	for (vector<shared_ptr<ColourConversion> >::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) {
+		(*i)->as_xml (root->add_child ("ColourConversion"));
+	}
+
 	doc.write_to_file_formatted (file (false));
 }
 
diff --git a/src/lib/config.h b/src/lib/config.h
index 77287e686..40d06a172 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -36,6 +36,7 @@ class Filter;
 class SoundProcessor;
 class DCPContentType;
 class Ratio;
+class ColourConversion;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -61,7 +62,7 @@ public:
 	}
 
 	/** @return J2K encoding servers to use */
-	std::vector<ServerDescription*> servers () const {
+	std::vector<boost::shared_ptr<ServerDescription> > servers () const {
 		return _servers;
 	}
 
@@ -122,6 +123,10 @@ public:
 		return _default_j2k_bandwidth;
 	}
 
+	std::vector<boost::shared_ptr<ColourConversion> > colour_conversions () const {
+		return _colour_conversions;
+	}
+
 	/** @param n New number of local encoding threads */
 	void set_num_local_encoding_threads (int n) {
 		_num_local_encoding_threads = n;
@@ -137,7 +142,7 @@ public:
 	}
 
 	/** @param s New list of servers */
-	void set_servers (std::vector<ServerDescription*> s) {
+	void set_servers (std::vector<boost::shared_ptr<ServerDescription> > s) {
 		_servers = s;
 	}
 
@@ -204,6 +209,10 @@ public:
 	void set_default_j2k_bandwidth (int b) {
 		_default_j2k_bandwidth = b;
 	}
+
+	void set_colour_conversions (std::vector<boost::shared_ptr<ColourConversion> > const & c) {
+		_colour_conversions = c;
+	}
 	
 	void write () const;
 
@@ -224,7 +233,7 @@ private:
 	int _server_port;
 
 	/** J2K encoding servers to use */
-	std::vector<ServerDescription *> _servers;
+	std::vector<boost::shared_ptr<ServerDescription> > _servers;
 	/** Scaler to use for the "A" part of A/B comparisons */
 	Scaler const * _reference_scaler;
 	/** Filters to use for the "A" part of A/B comparisons */
@@ -248,6 +257,7 @@ private:
 	DCPContentType const * _default_dcp_content_type;
 	libdcp::XMLMetadata _dcp_metadata;
 	int _default_j2k_bandwidth;
+	std::vector<boost::shared_ptr<ColourConversion> > _colour_conversions;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 4f6ff9987..53cf1753a 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -213,7 +213,7 @@ DCPVideoFrame::encode_locally ()
  *  @return Encoded data.
  */
 shared_ptr<EncodedData>
-DCPVideoFrame::encode_remotely (ServerDescription const * serv)
+DCPVideoFrame::encode_remotely (boost::shared_ptr<const ServerDescription> serv)
 {
 	boost::asio::io_service io_service;
 	boost::asio::ip::tcp::resolver resolver (io_service);
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 96a773a6f..18c8fe628 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -105,7 +105,7 @@ public:
 	DCPVideoFrame (boost::shared_ptr<const Image>, int, Eyes, int, int, boost::shared_ptr<Log>);
 
 	boost::shared_ptr<EncodedData> encode_locally ();
-	boost::shared_ptr<EncodedData> encode_remotely (ServerDescription const *);
+	boost::shared_ptr<EncodedData> encode_remotely (boost::shared_ptr<const ServerDescription>);
 
 	Eyes eyes () const {
 		return _eyes;
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 0c7434220..a1c024799 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -71,12 +71,12 @@ void
 Encoder::process_begin ()
 {
 	for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
-		_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, (ServerDescription *) 0)));
+		_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, shared_ptr<ServerDescription> ())));
 	}
 
-	vector<ServerDescription*> servers = Config::instance()->servers ();
+	vector<shared_ptr<ServerDescription> > servers = Config::instance()->servers ();
 
-	for (vector<ServerDescription*>::iterator i = servers.begin(); i != servers.end(); ++i) {
+	for (vector<shared_ptr<ServerDescription> >::iterator i = servers.begin(); i != servers.end(); ++i) {
 		for (int j = 0; j < (*i)->threads (); ++j) {
 			_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, *i)));
 		}
@@ -244,7 +244,7 @@ Encoder::terminate_threads ()
 }
 
 void
-Encoder::encoder_thread (ServerDescription* server)
+Encoder::encoder_thread (shared_ptr<ServerDescription> server)
 {
 	/* Number of seconds that we currently wait between attempts
 	   to connect to the server; not relevant for localhost
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index a866a77f1..a4df202a2 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -81,7 +81,7 @@ private:
 	
 	void frame_done ();
 	
-	void encoder_thread (ServerDescription *);
+	void encoder_thread (boost::shared_ptr<ServerDescription>);
 	void terminate_threads ();
 
 	/** Film that we are encoding */
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 37a076a54..54cffc077 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -68,17 +68,17 @@ ServerDescription::as_xml (xmlpp::Node* root) const
  *  @param v Metadata.
  *  @return ServerDescription, or 0.
  */
-ServerDescription *
+shared_ptr<ServerDescription>
 ServerDescription::create_from_metadata (string v)
 {
 	vector<string> b;
 	split (b, v, is_any_of (N_(" ")));
 
 	if (b.size() != 2) {
-		return 0;
+		return shared_ptr<ServerDescription> ();
 	}
 
-	return new ServerDescription (b[0], atoi (b[1].c_str ()));
+	return shared_ptr<ServerDescription> (new ServerDescription (b[0], atoi (b[1].c_str ())));
 }
 
 Server::Server (shared_ptr<Log> log)
diff --git a/src/lib/server.h b/src/lib/server.h
index e6d374369..6307c1867 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -41,6 +41,11 @@ namespace cxml {
 class ServerDescription
 {
 public:
+	ServerDescription ()
+		: _host_name ("")
+		, _threads (1)
+	{}
+	
 	/** @param h Server host name or IP address in string form.
 	 *  @param t Number of threads to use on the server.
 	 */
@@ -73,7 +78,7 @@ public:
 
 	void as_xml (xmlpp::Node *) const;
 	
-	static ServerDescription * create_from_metadata (std::string v);
+	static boost::shared_ptr<ServerDescription> create_from_metadata (std::string v);
 
 private:
 	/** server's host name */
diff --git a/src/lib/wscript b/src/lib/wscript
index 04dae7587..6c45d8b1e 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -8,6 +8,7 @@ sources = """
           audio_content.cc
           audio_decoder.cc
           audio_mapping.cc
+          colour_conversion.cc
           config.cc
           content.cc
           content_factory.cc
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 7c5852fcc..ff7ab6ffe 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -116,7 +116,7 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	if (no_remote) {
-		Config::instance()->set_servers (vector<ServerDescription*> ());
+		Config::instance()->set_servers (vector<shared_ptr<ServerDescription> > ());
 	}
 
 	cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
diff --git a/src/wx/colour_conversion_dialog.cc b/src/wx/colour_conversion_dialog.cc
new file mode 100644
index 000000000..976d295d5
--- /dev/null
+++ b/src/wx/colour_conversion_dialog.cc
@@ -0,0 +1,150 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/lexical_cast.hpp>
+#include <wx/spinctrl.h>
+#include <wx/gbsizer.h>
+#include "lib/colour_conversion.h"
+#include "wx_util.h"
+#include "colour_conversion_dialog.h"
+
+using std::string;
+using std::cout;
+using boost::shared_ptr;
+using boost::lexical_cast;
+
+ColourConversionDialog::ColourConversionDialog (wxWindow* parent, shared_ptr<ColourConversion> conversion)
+	: wxDialog (parent, wxID_ANY, _("Colour conversion"))
+	, _conversion (conversion)
+{
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	SetSizer (overall_sizer);
+
+	wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+
+	int r = 0;
+
+	add_label_to_grid_bag_sizer (table, this, _("Name"), true, wxGBPosition (r, 0));
+	_name = new wxTextCtrl (this, wxID_ANY, wxT (""));
+	table->Add (_name, wxGBPosition (r, 1));
+	++r;
+
+	add_label_to_grid_bag_sizer (table, this, _("Input gamma"), true, wxGBPosition (r, 0));
+	_input_gamma = new wxSpinCtrlDouble (this);
+	table->Add (_input_gamma, wxGBPosition (r, 1));
+	++r;
+
+	_input_gamma_linearised = new wxCheckBox (this, wxID_ANY, _("Linearise input gamma curve for low values"));
+	table->Add (_input_gamma_linearised, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+
+        wxClientDC dc (parent);
+        wxSize size = dc.GetTextExtent (wxT ("0.123456789012"));
+        size.SetHeight (-1);
+
+        wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
+        wxArrayString list;
+
+        wxString n (wxT ("0123456789.-"));
+        for (size_t i = 0; i < n.Length(); ++i) {
+                list.Add (n[i]);
+        }
+
+        validator.SetIncludes (list);
+
+	add_label_to_grid_bag_sizer (table, this, _("Matrix"), true, wxGBPosition (r, 0));
+	wxFlexGridSizer* matrix_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	for (int x = 0; x < 3; ++x) {
+		for (int y = 0; y < 3; ++y) {
+			_matrix[x][y] = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+			matrix_sizer->Add (_matrix[x][y]);
+		}
+	}
+	table->Add (matrix_sizer, wxGBPosition (r, 1));
+	++r;
+
+	add_label_to_grid_bag_sizer (table, this, _("Output gamma"), true, wxGBPosition (r, 0));
+	wxBoxSizer* output_sizer = new wxBoxSizer (wxHORIZONTAL);
+	/* TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
+	   comes after it.
+	*/
+	add_label_to_sizer (output_sizer, this, _("1 / "), false);
+	_output_gamma = new wxSpinCtrlDouble (this);
+	output_sizer->Add (_output_gamma);
+	table->Add (output_sizer, wxGBPosition (r, 1));
+	++r;
+
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	SetSizer (overall_sizer);
+	overall_sizer->Layout ();
+	overall_sizer->SetSizeHints (this);
+
+	_input_gamma->SetRange(0.1, 4.0);
+	_input_gamma->SetDigits (1);
+	_input_gamma->SetIncrement (0.1);
+	_output_gamma->SetRange(0.1, 4.0);
+	_output_gamma->SetDigits (1);
+	_output_gamma->SetIncrement (0.1);
+
+	_name->SetValue (std_to_wx (conversion->name));
+	_input_gamma->SetValue (conversion->input_gamma);
+	_input_gamma_linearised->SetValue (conversion->input_gamma_linearised);
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			_matrix[i][j]->SetValue (std_to_wx (lexical_cast<string> (conversion->matrix(i, j))));
+		}
+	}
+	_output_gamma->SetValue (conversion->output_gamma);
+
+	_name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionDialog::changed, this));
+	_input_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionDialog::changed, this));
+	_input_gamma_linearised->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ColourConversionDialog::changed, this));
+	_output_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionDialog::changed, this));
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			_matrix[i][j]->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionDialog::changed, this));
+		}
+	}
+}
+
+void
+ColourConversionDialog::changed ()
+{
+	_conversion->name = wx_to_std (_name->GetValue ());
+	_conversion->input_gamma = _input_gamma->GetValue ();
+	_conversion->input_gamma_linearised = _input_gamma_linearised->GetValue ();
+
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			string const v = wx_to_std (_matrix[i][j]->GetValue ());
+			if (v.empty ()) {
+				_conversion->matrix (i, j) = 0;
+			} else {
+				_conversion->matrix (i, j) = lexical_cast<float> (v);
+			}
+		}
+	}
+	_conversion->output_gamma = _output_gamma->GetValue ();
+}
+	
diff --git a/src/wx/colour_conversion_dialog.h b/src/wx/colour_conversion_dialog.h
new file mode 100644
index 000000000..8da6df100
--- /dev/null
+++ b/src/wx/colour_conversion_dialog.h
@@ -0,0 +1,39 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/wx.h>
+
+class wxSpinCtrlDouble;
+class ColourConversion;
+
+class ColourConversionDialog : public wxDialog
+{
+public:
+	ColourConversionDialog (wxWindow *, boost::shared_ptr<ColourConversion>);
+
+private:
+	void changed ();
+	
+	boost::shared_ptr<ColourConversion> _conversion;
+	wxTextCtrl* _name;
+	wxSpinCtrlDouble* _input_gamma;
+	wxCheckBox* _input_gamma_linearised;
+	wxTextCtrl* _matrix[3][3];
+	wxSpinCtrlDouble* _output_gamma;
+};
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index cbcae78f8..66f0cd186 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -26,21 +26,28 @@
 #include <boost/filesystem.hpp>
 #include <wx/stdpaths.h>
 #include <wx/notebook.h>
+#include <libdcp/colour_matrix.h>
 #include "lib/config.h"
 #include "lib/server.h"
 #include "lib/ratio.h"
 #include "lib/scaler.h"
 #include "lib/filter.h"
 #include "lib/dcp_content_type.h"
+#include "lib/colour_conversion.h"
 #include "config_dialog.h"
 #include "wx_util.h"
 #include "filter_dialog.h"
 #include "server_dialog.h"
 #include "dir_picker_ctrl.h"
 #include "dci_metadata_dialog.h"
+#include "colour_conversion_dialog.h"
 
-using namespace std;
+using std::vector;
+using std::string;
+using std::list;
 using boost::bind;
+using boost::shared_ptr;
+using boost::lexical_cast;
 
 ConfigDialog::ConfigDialog (wxWindow* parent)
 	: wxDialog (parent, wxID_ANY, _("DCP-o-matic Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
@@ -53,6 +60,8 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	_notebook->AddPage (_misc_panel, _("Miscellaneous"), true);
 	make_servers_panel ();
 	_notebook->AddPage (_servers_panel, _("Encoding servers"), false);
+	make_colour_conversions_panel ();
+	_notebook->AddPage (_colour_conversions_panel, _("Colour conversions"), false);
 	make_metadata_panel ();
 	_notebook->AddPage (_metadata_panel, _("Metadata"), false);
 	make_tms_panel ();
@@ -270,54 +279,32 @@ ConfigDialog::make_metadata_panel ()
 	_creator->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::creator_changed, this));
 }
 
-void
-ConfigDialog::make_servers_panel ()
+static std::string
+server_column (shared_ptr<ServerDescription> s, int c)
 {
-	_servers_panel = new wxPanel (_notebook);
-	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-	_servers_panel->SetSizer (s);
-
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (0, 1);
-	s->Add (table, 1, wxALL | wxEXPAND, 8);
-
-	Config* config = Config::instance ();
-
-	_servers = new wxListCtrl (_servers_panel, wxID_ANY, wxDefaultPosition, wxSize (220, 100), wxLC_REPORT | wxLC_SINGLE_SEL);
-	wxListItem ip;
-	ip.SetId (0);
-	ip.SetText (_("IP address"));
-	ip.SetWidth (120);
-	_servers->InsertColumn (0, ip);
-	ip.SetId (1);
-	ip.SetText (_("Threads"));
-	ip.SetWidth (80);
-	_servers->InsertColumn (1, ip);
-	table->Add (_servers, 1, wxEXPAND | wxALL);
-
-	{
-		wxSizer* s = new wxBoxSizer (wxVERTICAL);
-		_add_server = new wxButton (_servers_panel, wxID_ANY, _("Add"));
-		s->Add (_add_server, 0, wxTOP | wxBOTTOM, 2);
-		_edit_server = new wxButton (_servers_panel, wxID_ANY, _("Edit"));
-		s->Add (_edit_server, 0, wxTOP | wxBOTTOM, 2);
-		_remove_server = new wxButton (_servers_panel, wxID_ANY, _("Remove"));
-		s->Add (_remove_server, 0, wxTOP | wxBOTTOM, 2);
-		table->Add (s, 0);
+	switch (c) {
+	case 0:
+		return s->host_name ();
+	case 1:
+		return lexical_cast<string> (s->threads ());
 	}
 
-	vector<ServerDescription*> servers = config->servers ();
-	for (vector<ServerDescription*>::iterator i = servers.begin(); i != servers.end(); ++i) {
-		add_server_to_control (*i);
-	}
-	
-	_add_server->Bind    (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ConfigDialog::add_server_clicked,    this));
-	_edit_server->Bind   (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ConfigDialog::edit_server_clicked,   this));
-	_remove_server->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ConfigDialog::remove_server_clicked, this));
+	return "";
+}
 
-	_servers->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED,   boost::bind (&ConfigDialog::server_selection_changed, this));
-	_servers->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&ConfigDialog::server_selection_changed, this));
-	server_selection_changed ();
+void
+ConfigDialog::make_servers_panel ()
+{
+	vector<string> columns;
+	columns.push_back (wx_to_std (_("IP address")));
+	columns.push_back (wx_to_std (_("Threads")));
+	_servers_panel = new EditableList<ServerDescription, ServerDialog> (
+		_notebook,
+		columns,
+		boost::bind (&Config::servers, Config::instance()),
+		boost::bind (&Config::set_servers, Config::instance(), _1),
+		boost::bind (&server_column, _1, _2)
+		);
 }
 
 void
@@ -378,76 +365,6 @@ ConfigDialog::default_directory_changed ()
 	Config::instance()->set_default_directory (wx_to_std (_default_directory->GetPath ()));
 }
 
-void
-ConfigDialog::add_server_to_control (ServerDescription* s)
-{
-	wxListItem item;
-	int const n = _servers->GetItemCount ();
-	item.SetId (n);
-	_servers->InsertItem (item);
-	_servers->SetItem (n, 0, std_to_wx (s->host_name ()));
-	_servers->SetItem (n, 1, std_to_wx (boost::lexical_cast<string> (s->threads ())));
-}
-
-void
-ConfigDialog::add_server_clicked ()
-{
-	ServerDialog* d = new ServerDialog (this, 0);
-	d->ShowModal ();
-	ServerDescription* s = d->server ();
-	d->Destroy ();
-	
-	add_server_to_control (s);
-	vector<ServerDescription*> o = Config::instance()->servers ();
-	o.push_back (s);
-	Config::instance()->set_servers (o);
-}
-
-void
-ConfigDialog::edit_server_clicked ()
-{
-	int i = _servers->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	if (i == -1) {
-		return;
-	}
-
-	wxListItem item;
-	item.SetId (i);
-	item.SetColumn (0);
-	_servers->GetItem (item);
-
-	vector<ServerDescription*> servers = Config::instance()->servers ();
-	assert (i >= 0 && i < int (servers.size ()));
-
-	ServerDialog* d = new ServerDialog (this, servers[i]);
-	d->ShowModal ();
-	d->Destroy ();
-
-	_servers->SetItem (i, 0, std_to_wx (servers[i]->host_name ()));
-	_servers->SetItem (i, 1, std_to_wx (boost::lexical_cast<string> (servers[i]->threads ())));
-}
-
-void
-ConfigDialog::remove_server_clicked ()
-{
-	int i = _servers->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	if (i >= 0) {
-		_servers->DeleteItem (i);
-	}
-
-	vector<ServerDescription*> o = Config::instance()->servers ();
-	o.erase (o.begin() + i);
-	Config::instance()->set_servers (o);
-}
-
-void
-ConfigDialog::server_selection_changed ()
-{
-	int const i = _servers->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	_edit_server->Enable (i >= 0);
-	_remove_server->Enable (i >= 0);
-}
-
 void
 ConfigDialog::edit_default_dci_metadata_clicked ()
 {
@@ -515,3 +432,23 @@ ConfigDialog::default_j2k_bandwidth_changed ()
 {
 	Config::instance()->set_default_j2k_bandwidth (_default_j2k_bandwidth->GetValue() * 1e6);
 }
+
+static std::string
+colour_conversion_column (shared_ptr<ColourConversion> c)
+{
+	return c->name;
+}
+
+void
+ConfigDialog::make_colour_conversions_panel ()
+{
+	vector<string> columns;
+	columns.push_back (wx_to_std (_("Name")));
+	_colour_conversions_panel = new EditableList<ColourConversion, ColourConversionDialog> (
+		_notebook,
+		columns,
+		boost::bind (&Config::colour_conversions, Config::instance()),
+		boost::bind (&Config::set_colour_conversions, Config::instance(), _1),
+		boost::bind (&colour_conversion_column, _1)
+		);
+}
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 444b886f4..60d9229c4 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -26,11 +26,14 @@
 #include <wx/listctrl.h>
 #include <wx/filepicker.h>
 #include "wx_util.h"
+#include "editable_list.h"
 
 class DirPickerCtrl;
 class wxNotebook;
-
 class ServerDescription;
+class ColourConversion;
+class ColourConversionDialog;
+class ServerDialog;
 
 /** @class ConfigDialog
  *  @brief A dialogue to edit DCP-o-matic configuration.
@@ -51,28 +54,25 @@ private:
 	void default_still_length_changed ();
 	void default_directory_changed ();
 	void edit_default_dci_metadata_clicked ();
-	void add_server_clicked ();
-	void edit_server_clicked ();
-	void remove_server_clicked ();
-	void server_selection_changed ();
 	void default_container_changed ();
 	void default_dcp_content_type_changed ();
 	void issuer_changed ();
 	void creator_changed ();
 	void default_j2k_bandwidth_changed ();
 
-	void add_server_to_control (ServerDescription *);
 	void setup_language_sensitivity ();
 
 	void make_misc_panel ();
 	void make_tms_panel ();
 	void make_metadata_panel ();
 	void make_servers_panel ();
+	void make_colour_conversions_panel ();
 
 	wxNotebook* _notebook;
 	wxPanel* _misc_panel;
 	wxPanel* _tms_panel;
-	wxPanel* _servers_panel;
+	EditableList<ColourConversion, ColourConversionDialog>* _colour_conversions_panel;
+	EditableList<ServerDescription, ServerDialog>* _servers_panel;
 	wxPanel* _metadata_panel;
 	wxCheckBox* _set_language;
 	wxChoice* _language;
@@ -90,10 +90,6 @@ private:
 	wxDirPickerCtrl* _default_directory;
 #endif
 	wxButton* _default_dci_metadata_button;
-	wxListCtrl* _servers;
-	wxButton* _add_server;
-	wxButton* _edit_server;
-	wxButton* _remove_server;
 	wxTextCtrl* _issuer;
 	wxTextCtrl* _creator;
 	wxSpinCtrl* _default_j2k_bandwidth;
diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
new file mode 100644
index 000000000..32cc326b6
--- /dev/null
+++ b/src/wx/editable_list.h
@@ -0,0 +1,156 @@
+/*
+    Copyright (C) 2012 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/wx.h>
+
+template<class T, class S>
+class EditableList : public wxPanel
+{
+public:
+	EditableList (
+		wxWindow* parent,
+		std::vector<std::string> columns,
+		boost::function<std::vector<boost::shared_ptr<T> > ()> get,
+		boost::function<void (std::vector<boost::shared_ptr<T> >)> set,
+		boost::function<std::string (boost::shared_ptr<T>, int)> column
+		)
+		: wxPanel (parent)
+		, _get (get)
+		, _set (set)
+		, _columns (columns.size ())
+		, _column (column)
+	{
+		wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+		SetSizer (s);
+
+		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+		table->AddGrowableCol (0, 1);
+		s->Add (table, 1, wxALL | wxEXPAND, 8);
+
+		_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, 100), wxLC_REPORT | wxLC_SINGLE_SEL);
+
+		for (size_t i = 0; i < columns.size(); ++i) {
+			wxListItem ip;
+			ip.SetId (i);
+			ip.SetText (std_to_wx (columns[i]));
+			ip.SetWidth (200);
+			_list->InsertColumn (i, ip);
+		}
+
+		table->Add (_list, 1, wxEXPAND | wxALL);
+
+		{
+			wxSizer* s = new wxBoxSizer (wxVERTICAL);
+			_add = new wxButton (this, wxID_ANY, _("Add..."));
+			s->Add (_add, 0, wxTOP | wxBOTTOM, 2);
+			_edit = new wxButton (this, wxID_ANY, _("Edit..."));
+			s->Add (_edit, 0, wxTOP | wxBOTTOM, 2);
+			_remove = new wxButton (this, wxID_ANY, _("Remove"));
+			s->Add (_remove, 0, wxTOP | wxBOTTOM, 2);
+			table->Add (s, 0);
+		}
+
+		std::vector<boost::shared_ptr<T> > current = _get ();
+		for (typename std::vector<boost::shared_ptr<T> >::iterator i = current.begin (); i != current.end(); ++i) {
+			add_to_control (*i);
+		}
+
+		_add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::add_clicked, this));
+		_edit->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::edit_clicked, this));
+		_remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&EditableList::remove_clicked, this));
+
+		_list->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&EditableList::selection_changed, this));
+		_list->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&EditableList::selection_changed, this));
+		selection_changed ();
+	}
+
+	void add_to_control (boost::shared_ptr<T> item)
+	{
+		wxListItem list_item;
+		int const n = _list->GetItemCount ();
+		list_item.SetId (n);
+		_list->InsertItem (list_item);
+
+		for (int i = 0; i < _columns; ++i) {
+			_list->SetItem (n, i, std_to_wx (_column (item, i)));
+		}
+	}
+
+	void selection_changed ()
+	{
+		int const i = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		_edit->Enable (i >= 0);
+		_remove->Enable (i >= 0);
+	}
+
+	void add_clicked ()
+	{
+		boost::shared_ptr<T> new_item (new T);
+		S* dialog = new S (this, new_item);
+		dialog->ShowModal ();
+		dialog->Destroy ();
+
+		add_to_control (new_item);
+		std::vector<boost::shared_ptr<T> > all = _get ();
+		all.push_back (new_item);
+		_set (all);
+	}
+
+	void edit_clicked ()
+	{
+		int item = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		if (item == -1) {
+			return;
+		}
+
+		std::vector<boost::shared_ptr<T> > all = _get ();
+		assert (item >= 0 && item < int (all.size ()));
+
+		S* dialog = new S (this, all[item]);
+		dialog->ShowModal ();
+		dialog->Destroy ();
+
+		for (int i = 0; i < _columns; ++i) {
+			_list->SetItem (item, i, std_to_wx (_column (all[item], i)));
+		}
+	}
+
+	void remove_clicked ()
+	{
+		int i = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		if (i >= 0) {
+			_list->DeleteItem (i);
+		}
+		
+		std::vector<boost::shared_ptr<T> > all = _get ();
+		all.erase (all.begin() + i);
+		_set (all);
+	}
+
+private:	
+	boost::function <std::vector<boost::shared_ptr<T> > ()> _get;
+	boost::function <void (std::vector<boost::shared_ptr<T> >)> _set;
+	int _columns;
+	boost::function<std::string (boost::shared_ptr<T>, int)> _column;
+
+	wxButton* _add;
+	wxButton* _edit;
+	wxButton* _remove;
+	wxListCtrl* _list;
+};
diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 0f41b5b90..a0f1f04ae 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -21,13 +21,15 @@
 #include "server_dialog.h"
 #include "wx_util.h"
 
-ServerDialog::ServerDialog (wxWindow* parent, ServerDescription* server)
+using boost::shared_ptr;
+
+ServerDialog::ServerDialog (wxWindow* parent, shared_ptr<ServerDescription> server)
 	: wxDialog (parent, wxID_ANY, _("Server"))
 {
 	if (server) {
 		_server = server;
 	} else {
-		_server = new ServerDescription (wx_to_std (N_("localhost")), 1);
+		_server.reset (new ServerDescription (wx_to_std (N_("localhost")), 1));
 	}
 		
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
@@ -73,7 +75,7 @@ ServerDialog::threads_changed ()
 	_server->set_threads (_threads->GetValue ());
 }
 
-ServerDescription *
+shared_ptr<ServerDescription>
 ServerDialog::server () const
 {
 	return _server;
diff --git a/src/wx/server_dialog.h b/src/wx/server_dialog.h
index f42236771..3f1fa1f73 100644
--- a/src/wx/server_dialog.h
+++ b/src/wx/server_dialog.h
@@ -25,15 +25,15 @@ class ServerDescription;
 class ServerDialog : public wxDialog
 {
 public:
-	ServerDialog (wxWindow *, ServerDescription *);
+	ServerDialog (wxWindow *, boost::shared_ptr<ServerDescription>);
 
-	ServerDescription* server () const;
+	boost::shared_ptr<ServerDescription> server () const;
 
 private:
 	void host_changed ();
 	void threads_changed ();
 
-	ServerDescription* _server;
+	boost::shared_ptr<ServerDescription> _server;
 	wxTextCtrl* _host;
 	wxSpinCtrl* _threads;
 };
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 0c2702913..5ba06b12d 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -21,6 +21,8 @@
 #include "lib/ratio.h"
 #include "lib/filter.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/colour_conversion.h"
+#include "lib/config.h"
 #include "filter_dialog.h"
 #include "video_panel.h"
 #include "wx_util.h"
@@ -30,6 +32,7 @@ using std::vector;
 using std::string;
 using std::pair;
 using std::cout;
+using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
@@ -83,6 +86,11 @@ VideoPanel::VideoPanel (FilmEditor* e)
 	}
 	++r;
 
+	add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0));
+	_colour_conversion = new wxChoice (this, wxID_ANY);
+	grid->Add (_colour_conversion, wxGBPosition (r, 1));
+	++r;
+
 	_description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
 	grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
 	wxFont font = _description->GetFont();
@@ -105,13 +113,16 @@ VideoPanel::VideoPanel (FilmEditor* e)
 	_frame_type->Append (_("2D"));
 	_frame_type->Append (_("3D left/right"));
 
-	_frame_type->Bind     (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::frame_type_changed, this));
-	_left_crop->Bind      (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::left_crop_changed, this));
-	_right_crop->Bind     (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::right_crop_changed, this));
-	_top_crop->Bind       (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::top_crop_changed, this));
-	_bottom_crop->Bind    (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::bottom_crop_changed, this));
-	_ratio->Bind	      (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::ratio_changed, this));
-	_filters_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
+	setup_colour_conversions ();
+
+	_frame_type->Bind        (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::frame_type_changed, this));
+	_left_crop->Bind         (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::left_crop_changed, this));
+	_right_crop->Bind        (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::right_crop_changed, this));
+	_top_crop->Bind          (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::top_crop_changed, this));
+	_bottom_crop->Bind       (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::bottom_crop_changed, this));
+	_ratio->Bind	         (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::ratio_changed, this));
+	_filters_button->Bind    (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
+	_colour_conversion->Bind (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::colour_conversion_changed, this));
 }
 
 
@@ -342,3 +353,18 @@ VideoPanel::frame_type_changed ()
 		vc->set_video_frame_type (static_cast<VideoFrameType> (_frame_type->GetSelection ()));
 	}
 }
+
+void
+VideoPanel::setup_colour_conversions ()
+{
+	vector<shared_ptr<ColourConversion> > cc = Config::instance()->colour_conversions ();
+	for (vector<shared_ptr<ColourConversion> >::iterator i = cc.begin(); i != cc.end(); ++i) {
+		_colour_conversion->Append (std_to_wx ((*i)->name));
+	}
+}
+
+void
+VideoPanel::colour_conversion_changed ()
+{
+
+}
diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 5a2281150..62332a052 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -41,8 +41,10 @@ private:
 	void edit_filters_clicked ();
 	void ratio_changed ();
 	void frame_type_changed ();
+	void colour_conversion_changed ();
 
 	void setup_description ();
+	void setup_colour_conversions ();
 
 	wxChoice* _frame_type;
 	wxSpinCtrl* _left_crop;
@@ -54,4 +56,5 @@ private:
 	wxStaticText* _description;
 	wxStaticText* _filters;
 	wxButton* _filters_button;
+	wxChoice* _colour_conversion;
 };
diff --git a/src/wx/wscript b/src/wx/wscript
index 883304eff..e0566a6ed 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -9,6 +9,7 @@ sources = """
           audio_mapping_view.cc
           audio_panel.cc
           audio_plot.cc
+          colour_conversion_dialog.cc
           config_dialog.cc
           content_menu.cc
           dci_metadata_dialog.cc
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 2dc1545d6..d695f96ce 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -29,7 +29,7 @@ using boost::shared_ptr;
 using boost::thread;
 
 void
-do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription* description, shared_ptr<EncodedData> locally_encoded)
+do_remote_encode (shared_ptr<DCPVideoFrame> frame, shared_ptr<ServerDescription> description, shared_ptr<EncodedData> locally_encoded)
 {
 	shared_ptr<EncodedData> remotely_encoded;
 	BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
@@ -92,11 +92,11 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 	/* Let the server get itself ready */
 	dcpomatic_sleep (1);
 
-	ServerDescription description ("localhost", 2);
+	shared_ptr<ServerDescription> description (new ServerDescription ("localhost", 2));
 
 	list<thread*> threads;
 	for (int i = 0; i < 8; ++i) {
-		threads.push_back (new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded)));
+		threads.push_back (new thread (boost::bind (do_remote_encode, frame, description, locally_encoded)));
 	}
 
 	for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
diff --git a/test/test.cc b/test/test.cc
index 2334523a1..21cf18c76 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -46,7 +46,7 @@ struct TestConfig
 		dcpomatic_setup();
 
 		Config::instance()->set_num_local_encoding_threads (1);
-		Config::instance()->set_servers (vector<ServerDescription*> ());
+		Config::instance()->set_servers (vector<shared_ptr<ServerDescription> > ());
 		Config::instance()->set_server_port (61920);
 		Config::instance()->set_default_dci_metadata (DCIMetadata ());
 		Config::instance()->set_default_container (static_cast<Ratio*> (0));
-- 
cgit v1.2.3


From 2499c41097f8410cb3016e095a85d68979485a7b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 17 Aug 2013 21:47:08 +0100
Subject: Various bits mostly related to colour conversions.

---
 platform/windows/installer.nsi.32.in       |   6 +-
 platform/windows/installer.nsi.64.in       |   6 +-
 src/lib/colour_conversion.cc               |  96 ++++++++++++++++--
 src/lib/colour_conversion.h                |  35 +++++--
 src/lib/config.cc                          |  26 +++--
 src/lib/config.h                           |  15 +--
 src/lib/dcp_video_frame.cc                 |   4 +-
 src/lib/dcp_video_frame.h                  |   2 +-
 src/lib/encoder.cc                         |  12 +--
 src/lib/encoder.h                          |   2 +-
 src/lib/server.cc                          |   7 +-
 src/lib/server.h                           |   7 +-
 src/lib/video_content.cc                   |  28 +++++-
 src/lib/video_content.h                    |  10 ++
 src/tools/dcpomatic_cli.cc                 |   2 +-
 src/wx/colour_conversion_dialog.cc         | 150 ----------------------------
 src/wx/colour_conversion_dialog.h          |  39 --------
 src/wx/colour_conversion_editor.cc         | 152 +++++++++++++++++++++++++++++
 src/wx/colour_conversion_editor.h          |  48 +++++++++
 src/wx/config_dialog.cc                    |  14 +--
 src/wx/config_dialog.h                     |   6 +-
 src/wx/content_colour_conversion_dialog.cc | 121 +++++++++++++++++++++++
 src/wx/content_colour_conversion_dialog.h  |  41 ++++++++
 src/wx/editable_list.h                     |  57 +++++++----
 src/wx/film_editor.cc                      |   1 +
 src/wx/filter_dialog.cc                    |   4 +-
 src/wx/filter_dialog.h                     |   4 +-
 src/wx/filter_editor.cc                    |  92 +++++++++++++++++
 src/wx/filter_editor.h                     |  47 +++++++++
 src/wx/filter_view.cc                      |  92 -----------------
 src/wx/filter_view.h                       |  47 ---------
 src/wx/preset_colour_conversion_dialog.cc  |  68 +++++++++++++
 src/wx/preset_colour_conversion_dialog.h   |  35 +++++++
 src/wx/server_dialog.cc                    |  33 ++-----
 src/wx/server_dialog.h                     |   9 +-
 src/wx/video_panel.cc                      |  67 ++++++++-----
 src/wx/video_panel.h                       |   6 +-
 src/wx/wscript                             |   6 +-
 test/client_server_test.cc                 |   4 +-
 test/test.cc                               |   2 +-
 40 files changed, 919 insertions(+), 484 deletions(-)
 delete mode 100644 src/wx/colour_conversion_dialog.cc
 delete mode 100644 src/wx/colour_conversion_dialog.h
 create mode 100644 src/wx/colour_conversion_editor.cc
 create mode 100644 src/wx/colour_conversion_editor.h
 create mode 100644 src/wx/content_colour_conversion_dialog.cc
 create mode 100644 src/wx/content_colour_conversion_dialog.h
 create mode 100644 src/wx/filter_editor.cc
 create mode 100644 src/wx/filter_editor.h
 delete mode 100644 src/wx/filter_view.cc
 delete mode 100644 src/wx/filter_view.h
 create mode 100644 src/wx/preset_colour_conversion_dialog.cc
 create mode 100644 src/wx/preset_colour_conversion_dialog.h

(limited to 'src/lib/encoder.cc')

diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in
index 30cfd806d..938024d57 100644
--- a/platform/windows/installer.nsi.32.in
+++ b/platform/windows/installer.nsi.32.in
@@ -48,9 +48,9 @@ File "%deps%/bin/libglib-2.0-0.dll"
 File "%deps%/bin/libgobject-2.0-0.dll"
 File "%deps%/bin/libiconv-2.dll"
 File "%deps%/bin/libjpeg-8.dll"
-File "%deps%/bin/libMagick++-5.dll"
-File "%deps%/bin/libMagickCore-5.dll"
-File "%deps%/bin/libMagickWand-5.dll"
+File "%deps%/bin/libMagick++-6.Q16-2.dll"
+File "%deps%/bin/libMagickCore-6.Q16-1.dll"
+File "%deps%/bin/libMagickWand-6.Q16-1.dll"
 File "%deps%/bin/libopenjpeg-1.dll"
 File "%deps%/bin/libpng15-15.dll"
 File "%deps%/bin/libsigc-2.0-0.dll"
diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in
index 3cc54b4fc..941e1c047 100644
--- a/platform/windows/installer.nsi.64.in
+++ b/platform/windows/installer.nsi.64.in
@@ -58,9 +58,9 @@ File "%deps%/bin/libglib-2.0-0.dll"
 File "%deps%/bin/libgobject-2.0-0.dll"
 File "%deps%/bin/libiconv-2.dll"
 File "%deps%/bin/libjpeg-8.dll"
-File "%deps%/bin/libMagick++-5.dll"
-File "%deps%/bin/libMagickCore-5.dll"
-File "%deps%/bin/libMagickWand-5.dll"
+File "%deps%/bin/libMagick++-6.Q16-2.dll"
+File "%deps%/bin/libMagickCore-6.Q16-1.dll"
+File "%deps%/bin/libMagickWand-6.Q16-1.dll"
 File "%deps%/bin/libopenjpeg-1.dll"
 File "%deps%/bin/libpng15-15.dll"
 File "%deps%/bin/libsigc-2.0-0.dll"
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 96dc0e2c9..cc25ccc67 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -21,18 +21,21 @@
 #include <libxml++/libxml++.h>
 #include <libdcp/colour_matrix.h>
 #include <libcxml/cxml.h>
+#include "config.h"
 #include "colour_conversion.h"
 
 #include "i18n.h"
 
 using std::list;
 using std::string;
+using std::cout;
+using std::vector;
 using boost::shared_ptr;
 using boost::lexical_cast;
+using boost::optional;
 
 ColourConversion::ColourConversion ()
-	: name (_("Untitled"))
-	, input_gamma (2.4)
+	: input_gamma (2.4)
 	, input_gamma_linearised (true)
 	, matrix (3, 3)
 	, output_gamma (2.6)
@@ -44,9 +47,8 @@ ColourConversion::ColourConversion ()
 	}
 }
 
-ColourConversion::ColourConversion (string n, float i, bool il, float const m[3][3], float o)
-	: name (n)
-	, input_gamma (i)
+ColourConversion::ColourConversion (double i, bool il, double const m[3][3], double o)
+	: input_gamma (i)
 	, input_gamma_linearised (il)
 	, matrix (3, 3)
 	, output_gamma (o)
@@ -61,8 +63,7 @@ ColourConversion::ColourConversion (string n, float i, bool il, float const m[3]
 ColourConversion::ColourConversion (shared_ptr<cxml::Node> node)
 	: matrix (3, 3)
 {
-	name = node->string_child ("Name");
-	input_gamma = node->number_child<float> ("InputGamma");
+	input_gamma = node->number_child<double> ("InputGamma");
 	input_gamma_linearised = node->bool_child ("InputGammaLinearised");
 
 	for (int i = 0; i < 3; ++i) {
@@ -75,16 +76,15 @@ ColourConversion::ColourConversion (shared_ptr<cxml::Node> node)
 	for (list<shared_ptr<cxml::Node> >::iterator i = m.begin(); i != m.end(); ++i) {
 		int const ti = (*i)->number_attribute<int> ("i");
 		int const tj = (*i)->number_attribute<int> ("j");
-		matrix(ti, tj) = lexical_cast<float> ((*i)->content ());
+		matrix(ti, tj) = lexical_cast<double> ((*i)->content ());
 	}
 
-	output_gamma = node->number_child<float> ("OutputGamma");
+	output_gamma = node->number_child<double> ("OutputGamma");
 }
 
 void
 ColourConversion::as_xml (xmlpp::Node* node) const
 {
-	node->add_child("Name")->add_child_text (name);
 	node->add_child("InputGamma")->add_child_text (lexical_cast<string> (input_gamma));
 	node->add_child("InputGammaLinearised")->add_child_text (input_gamma_linearised ? "1" : "0");
 
@@ -99,3 +99,79 @@ ColourConversion::as_xml (xmlpp::Node* node) const
 
 	node->add_child("OutputGamma")->add_child_text (lexical_cast<string> (output_gamma));
 }
+
+optional<size_t>
+ColourConversion::preset () const
+{
+	vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
+	size_t i = 0;
+	while (i < presets.size() && (presets[i].conversion != *this)) {
+		++i;
+	}
+
+	if (i >= presets.size ()) {
+		return optional<size_t> ();
+	}
+
+	return i;
+}
+
+PresetColourConversion::PresetColourConversion ()
+	: name (_("Untitled"))
+{
+
+}
+
+PresetColourConversion::PresetColourConversion (string n, double i, bool il, double const m[3][3], double o)
+	: name (n)
+	, conversion (i, il, m, o)
+{
+
+}
+
+PresetColourConversion::PresetColourConversion (shared_ptr<cxml::Node> node)
+	: conversion (node)
+{
+	name = node->string_child ("Name");
+}
+
+void
+PresetColourConversion::as_xml (xmlpp::Node* node) const
+{
+	conversion.as_xml (node);
+	node->add_child("Name")->add_child_text (name);
+}
+
+static bool
+about_equal (double a, double b)
+{
+	static const double eps = 1e-6;
+	return fabs (a - b) < eps;
+}
+
+bool
+operator== (ColourConversion const & a, ColourConversion const & b)
+{
+	if (
+		!about_equal (a.input_gamma, b.input_gamma) ||
+		a.input_gamma_linearised != b.input_gamma_linearised ||
+		!about_equal (a.output_gamma, b.output_gamma)) {
+		return false;
+	}
+
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			if (!about_equal (a.matrix (i, j), b.matrix (i, j))) {
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+bool
+operator!= (ColourConversion const & a, ColourConversion const & b)
+{
+	return !(a == b);
+}
diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index ed89f8c63..85d951ce1 100644
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -17,7 +17,11 @@
 
 */
 
+#ifndef DCPOMATIC_COLOUR_CONVERSION_H
+#define DCPOMATIC_COLOUR_CONVERSION_H
+
 #include <boost/utility.hpp>
+#include <boost/optional.hpp>
 #include <boost/numeric/ublas/matrix.hpp>
 
 namespace cxml {
@@ -28,18 +32,37 @@ namespace xmlpp {
 	class Node;
 }
 
-class ColourConversion : public boost::noncopyable
+class ColourConversion
 {
 public:
 	ColourConversion ();
-	ColourConversion (std::string, float, bool, float const matrix[3][3], float);
+	ColourConversion (double, bool, double const matrix[3][3], double);
 	ColourConversion (boost::shared_ptr<cxml::Node>);
 
+	virtual void as_xml (xmlpp::Node *) const;
+
+	boost::optional<size_t> preset () const;
+
+	double input_gamma;
+	bool input_gamma_linearised;
+	boost::numeric::ublas::matrix<double> matrix;
+	double output_gamma;
+};
+
+class PresetColourConversion
+{
+public:
+	PresetColourConversion ();
+	PresetColourConversion (std::string, double, bool, double const matrix[3][3], double);
+	PresetColourConversion (boost::shared_ptr<cxml::Node>);
+
 	void as_xml (xmlpp::Node *) const;
 
 	std::string name;
-	float input_gamma;
-	bool input_gamma_linearised;
-	boost::numeric::ublas::matrix<float> matrix;
-	float output_gamma;
+	ColourConversion conversion;
 };
+
+bool operator== (ColourConversion const &, ColourConversion const &);
+bool operator!= (ColourConversion const &, ColourConversion const &);
+
+#endif
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 0c8413be9..10cb13ecc 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -65,13 +65,8 @@ Config::Config ()
 	_allowed_dcp_frame_rates.push_back (50);
 	_allowed_dcp_frame_rates.push_back (60);
 
-	_colour_conversions.push_back (shared_ptr<ColourConversion> (
-					       new ColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::xyz_to_rgb, 2.6))
-		);
-	
-	_colour_conversions.push_back (shared_ptr<ColourConversion> (
-					       new ColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::xyz_to_rgb, 2.6))
-		);
+	_colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::xyz_to_rgb, 2.6));
+	_colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::xyz_to_rgb, 2.6));
 }
 
 void
@@ -91,7 +86,7 @@ Config::read ()
 	
 	list<shared_ptr<cxml::Node> > servers = f.node_children ("Server");
 	for (list<shared_ptr<cxml::Node> >::iterator i = servers.begin(); i != servers.end(); ++i) {
-		_servers.push_back (shared_ptr<ServerDescription> (new ServerDescription (*i)));
+		_servers.push_back (ServerDescription (*i));
 	}
 
 	_tms_ip = f.string_child ("TMSIP");
@@ -130,7 +125,7 @@ Config::read ()
 	}
 	
 	for (list<shared_ptr<cxml::Node> >::iterator i = cc.begin(); i != cc.end(); ++i) {
-		_colour_conversions.push_back (shared_ptr<ColourConversion> (new ColourConversion (*i)));
+		_colour_conversions.push_back (PresetColourConversion (*i));
 	}
 }
 
@@ -163,7 +158,10 @@ Config::read_old_metadata ()
 		} else if (k == N_("server_port")) {
 			_server_port = atoi (v.c_str ());
 		} else if (k == N_("server")) {
-			_servers.push_back (ServerDescription::create_from_metadata (v));
+			optional<ServerDescription> server = ServerDescription::create_from_metadata (v);
+			if (server) {
+				_servers.push_back (server.get ());
+			}
 		} else if (k == N_("tms_ip")) {
 			_tms_ip = v;
 		} else if (k == N_("tms_path")) {
@@ -237,8 +235,8 @@ Config::write () const
 	root->add_child("DefaultDirectory")->add_child_text (_default_directory);
 	root->add_child("ServerPort")->add_child_text (lexical_cast<string> (_server_port));
 	
-	for (vector<shared_ptr<ServerDescription> >::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
-		(*i)->as_xml (root->add_child ("Server"));
+	for (vector<ServerDescription>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
+		i->as_xml (root->add_child ("Server"));
 	}
 
 	root->add_child("TMSIP")->add_child_text (_tms_ip);
@@ -265,8 +263,8 @@ Config::write () const
 	root->add_child("DefaultStillLength")->add_child_text (lexical_cast<string> (_default_still_length));
 	root->add_child("DefaultJ2KBandwidth")->add_child_text (lexical_cast<string> (_default_j2k_bandwidth));
 
-	for (vector<shared_ptr<ColourConversion> >::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) {
-		(*i)->as_xml (root->add_child ("ColourConversion"));
+	for (vector<PresetColourConversion>::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) {
+		i->as_xml (root->add_child ("ColourConversion"));
 	}
 
 	doc.write_to_file_formatted (file (false));
diff --git a/src/lib/config.h b/src/lib/config.h
index 40d06a172..bce6bfd7e 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -29,6 +29,8 @@
 #include <boost/signals2.hpp>
 #include <libdcp/metadata.h>
 #include "dci_metadata.h"
+#include "colour_conversion.h"
+#include "server.h"
 
 class ServerDescription;
 class Scaler;
@@ -36,7 +38,6 @@ class Filter;
 class SoundProcessor;
 class DCPContentType;
 class Ratio;
-class ColourConversion;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -62,7 +63,7 @@ public:
 	}
 
 	/** @return J2K encoding servers to use */
-	std::vector<boost::shared_ptr<ServerDescription> > servers () const {
+	std::vector<ServerDescription> servers () const {
 		return _servers;
 	}
 
@@ -123,7 +124,7 @@ public:
 		return _default_j2k_bandwidth;
 	}
 
-	std::vector<boost::shared_ptr<ColourConversion> > colour_conversions () const {
+	std::vector<PresetColourConversion> colour_conversions () const {
 		return _colour_conversions;
 	}
 
@@ -142,7 +143,7 @@ public:
 	}
 
 	/** @param s New list of servers */
-	void set_servers (std::vector<boost::shared_ptr<ServerDescription> > s) {
+	void set_servers (std::vector<ServerDescription> s) {
 		_servers = s;
 	}
 
@@ -210,7 +211,7 @@ public:
 		_default_j2k_bandwidth = b;
 	}
 
-	void set_colour_conversions (std::vector<boost::shared_ptr<ColourConversion> > const & c) {
+	void set_colour_conversions (std::vector<PresetColourConversion> const & c) {
 		_colour_conversions = c;
 	}
 	
@@ -233,7 +234,7 @@ private:
 	int _server_port;
 
 	/** J2K encoding servers to use */
-	std::vector<boost::shared_ptr<ServerDescription> > _servers;
+	std::vector<ServerDescription> _servers;
 	/** Scaler to use for the "A" part of A/B comparisons */
 	Scaler const * _reference_scaler;
 	/** Filters to use for the "A" part of A/B comparisons */
@@ -257,7 +258,7 @@ private:
 	DCPContentType const * _default_dcp_content_type;
 	libdcp::XMLMetadata _dcp_metadata;
 	int _default_j2k_bandwidth;
-	std::vector<boost::shared_ptr<ColourConversion> > _colour_conversions;
+	std::vector<PresetColourConversion> _colour_conversions;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 53cf1753a..1cb20b611 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -213,11 +213,11 @@ DCPVideoFrame::encode_locally ()
  *  @return Encoded data.
  */
 shared_ptr<EncodedData>
-DCPVideoFrame::encode_remotely (boost::shared_ptr<const ServerDescription> serv)
+DCPVideoFrame::encode_remotely (ServerDescription serv)
 {
 	boost::asio::io_service io_service;
 	boost::asio::ip::tcp::resolver resolver (io_service);
-	boost::asio::ip::tcp::resolver::query query (serv->host_name(), boost::lexical_cast<string> (Config::instance()->server_port ()));
+	boost::asio::ip::tcp::resolver::query query (serv.host_name(), boost::lexical_cast<string> (Config::instance()->server_port ()));
 	boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
 
 	shared_ptr<Socket> socket (new Socket);
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 18c8fe628..ce6444293 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -105,7 +105,7 @@ public:
 	DCPVideoFrame (boost::shared_ptr<const Image>, int, Eyes, int, int, boost::shared_ptr<Log>);
 
 	boost::shared_ptr<EncodedData> encode_locally ();
-	boost::shared_ptr<EncodedData> encode_remotely (boost::shared_ptr<const ServerDescription>);
+	boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);
 
 	Eyes eyes () const {
 		return _eyes;
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index a1c024799..29fe64e26 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -71,13 +71,13 @@ void
 Encoder::process_begin ()
 {
 	for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
-		_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, shared_ptr<ServerDescription> ())));
+		_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<ServerDescription> ())));
 	}
 
-	vector<shared_ptr<ServerDescription> > servers = Config::instance()->servers ();
+	vector<ServerDescription> servers = Config::instance()->servers ();
 
-	for (vector<shared_ptr<ServerDescription> >::iterator i = servers.begin(); i != servers.end(); ++i) {
-		for (int j = 0; j < (*i)->threads (); ++j) {
+	for (vector<ServerDescription>::iterator i = servers.begin(); i != servers.end(); ++i) {
+		for (int j = 0; j < i->threads (); ++j) {
 			_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, *i)));
 		}
 	}
@@ -244,7 +244,7 @@ Encoder::terminate_threads ()
 }
 
 void
-Encoder::encoder_thread (shared_ptr<ServerDescription> server)
+Encoder::encoder_thread (optional<ServerDescription> server)
 {
 	/* Number of seconds that we currently wait between attempts
 	   to connect to the server; not relevant for localhost
@@ -275,7 +275,7 @@ Encoder::encoder_thread (shared_ptr<ServerDescription> server)
 
 		if (server) {
 			try {
-				encoded = vf->encode_remotely (server);
+				encoded = vf->encode_remotely (server.get ());
 
 				if (remote_backoff > 0) {
 					_film->log()->log (String::compose (N_("%1 was lost, but now she is found; removing backoff"), server->host_name ()));
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index a4df202a2..c0ea30fcb 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -81,7 +81,7 @@ private:
 	
 	void frame_done ();
 	
-	void encoder_thread (boost::shared_ptr<ServerDescription>);
+	void encoder_thread (boost::optional<ServerDescription>);
 	void terminate_threads ();
 
 	/** Film that we are encoding */
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 54cffc077..de265dca4 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -49,6 +49,7 @@ using boost::algorithm::split;
 using boost::thread;
 using boost::bind;
 using boost::scoped_array;
+using boost::optional;
 using libdcp::Size;
 
 ServerDescription::ServerDescription (shared_ptr<const cxml::Node> node)
@@ -68,17 +69,17 @@ ServerDescription::as_xml (xmlpp::Node* root) const
  *  @param v Metadata.
  *  @return ServerDescription, or 0.
  */
-shared_ptr<ServerDescription>
+optional<ServerDescription>
 ServerDescription::create_from_metadata (string v)
 {
 	vector<string> b;
 	split (b, v, is_any_of (N_(" ")));
 
 	if (b.size() != 2) {
-		return shared_ptr<ServerDescription> ();
+		return optional<ServerDescription> ();
 	}
 
-	return shared_ptr<ServerDescription> (new ServerDescription (b[0], atoi (b[1].c_str ())));
+	return ServerDescription (b[0], atoi (b[1].c_str ()));
 }
 
 Server::Server (shared_ptr<Log> log)
diff --git a/src/lib/server.h b/src/lib/server.h
index 6307c1867..56a1fdab9 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_SERVER_H
+#define DCPOMATIC_SERVER_H
+
 /** @file src/server.h
  *  @brief Class to describe a server to which we can send
  *  encoding work, and a class to implement such a server.
@@ -78,7 +81,7 @@ public:
 
 	void as_xml (xmlpp::Node *) const;
 	
-	static boost::shared_ptr<ServerDescription> create_from_metadata (std::string v);
+	static boost::optional<ServerDescription> create_from_metadata (std::string);
 
 private:
 	/** server's host name */
@@ -104,3 +107,5 @@ private:
 	boost::condition _worker_condition;
 	boost::shared_ptr<Log> _log;
 };
+
+#endif
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index f61518ec0..8b0ec4c99 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -23,14 +23,17 @@
 #include "video_examiner.h"
 #include "ratio.h"
 #include "compose.hpp"
+#include "config.h"
+#include "colour_conversion.h"
 
 #include "i18n.h"
 
-int const VideoContentProperty::VIDEO_SIZE	 = 0;
-int const VideoContentProperty::VIDEO_FRAME_RATE = 1;
-int const VideoContentProperty::VIDEO_FRAME_TYPE = 2;
-int const VideoContentProperty::VIDEO_CROP	 = 3;
-int const VideoContentProperty::VIDEO_RATIO	 = 4;
+int const VideoContentProperty::VIDEO_SIZE	  = 0;
+int const VideoContentProperty::VIDEO_FRAME_RATE  = 1;
+int const VideoContentProperty::VIDEO_FRAME_TYPE  = 2;
+int const VideoContentProperty::VIDEO_CROP	  = 3;
+int const VideoContentProperty::VIDEO_RATIO	  = 4;
+int const VideoContentProperty::COLOUR_CONVERSION = 5;
 
 using std::string;
 using std::stringstream;
@@ -46,6 +49,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Fram
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _ratio (Ratio::from_id ("185"))
+	, _colour_conversion (Config::instance()->colour_conversions().front().conversion)
 {
 
 }
@@ -56,6 +60,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _ratio (Ratio::from_id ("185"))
+	, _colour_conversion (Config::instance()->colour_conversions().front().conversion)
 {
 
 }
@@ -76,6 +81,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
 	if (r) {
 		_ratio = Ratio::from_id (r.get ());
 	}
+	_colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
 }
 
 void
@@ -94,6 +100,7 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	if (_ratio) {
 		node->add_child("Ratio")->add_child_text (_ratio->id ());
 	}
+	_colour_conversion.as_xml (node->add_child("ColourConversion"));
 }
 
 void
@@ -257,3 +264,14 @@ VideoContent::video_size_after_3d_split () const
 
 	assert (false);
 }
+
+void
+VideoContent::set_colour_conversion (ColourConversion c)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_colour_conversion = c;
+	}
+
+	signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+}
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 97ef6a9fa..72c72625b 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -21,6 +21,7 @@
 #define DCPOMATIC_VIDEO_CONTENT_H
 
 #include "content.h"
+#include "colour_conversion.h"
 
 class VideoExaminer;
 class Ratio;
@@ -33,6 +34,7 @@ public:
 	static int const VIDEO_FRAME_TYPE;
 	static int const VIDEO_CROP;
 	static int const VIDEO_RATIO;
+	static int const COLOUR_CONVERSION;
 };
 
 class VideoContent : public virtual Content
@@ -71,6 +73,8 @@ public:
 	void set_top_crop (int);
 	void set_bottom_crop (int);
 
+	void set_colour_conversion (ColourConversion);
+
 	VideoFrameType video_frame_type () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_frame_type;
@@ -88,6 +92,11 @@ public:
 		return _ratio;
 	}
 
+	ColourConversion colour_conversion () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _colour_conversion;
+	}
+
 	libdcp::Size video_size_after_3d_split () const;
 
 protected:
@@ -106,6 +115,7 @@ private:
 	VideoFrameType _video_frame_type;
 	Crop _crop;
 	Ratio const * _ratio;
+	ColourConversion _colour_conversion;
 };
 
 #endif
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index ff7ab6ffe..7695e1e94 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -116,7 +116,7 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	if (no_remote) {
-		Config::instance()->set_servers (vector<shared_ptr<ServerDescription> > ());
+		Config::instance()->set_servers (vector<ServerDescription> ());
 	}
 
 	cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
diff --git a/src/wx/colour_conversion_dialog.cc b/src/wx/colour_conversion_dialog.cc
deleted file mode 100644
index 1a8008bfd..000000000
--- a/src/wx/colour_conversion_dialog.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <boost/lexical_cast.hpp>
-#include <wx/spinctrl.h>
-#include <wx/gbsizer.h>
-#include "lib/colour_conversion.h"
-#include "wx_util.h"
-#include "colour_conversion_dialog.h"
-
-using std::string;
-using std::cout;
-using boost::shared_ptr;
-using boost::lexical_cast;
-
-ColourConversionDialog::ColourConversionDialog (wxWindow* parent, shared_ptr<ColourConversion> conversion)
-	: wxDialog (parent, wxID_ANY, _("Colour conversion"))
-	, _conversion (conversion)
-{
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	SetSizer (overall_sizer);
-
-	wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-
-	int r = 0;
-
-	add_label_to_grid_bag_sizer (table, this, _("Name"), true, wxGBPosition (r, 0));
-	_name = new wxTextCtrl (this, wxID_ANY, wxT (""));
-	table->Add (_name, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
-	++r;
-
-	add_label_to_grid_bag_sizer (table, this, _("Input gamma"), true, wxGBPosition (r, 0));
-	_input_gamma = new wxSpinCtrlDouble (this);
-	table->Add (_input_gamma, wxGBPosition (r, 1));
-	++r;
-
-	_input_gamma_linearised = new wxCheckBox (this, wxID_ANY, _("Linearise input gamma curve for low values"));
-	table->Add (_input_gamma_linearised, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
-
-        wxClientDC dc (parent);
-        wxSize size = dc.GetTextExtent (wxT ("0.123456789012"));
-        size.SetHeight (-1);
-
-        wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
-        wxArrayString list;
-
-        wxString n (wxT ("0123456789.-"));
-        for (size_t i = 0; i < n.Length(); ++i) {
-                list.Add (n[i]);
-        }
-
-        validator.SetIncludes (list);
-
-	add_label_to_grid_bag_sizer (table, this, _("Matrix"), true, wxGBPosition (r, 0));
-	wxFlexGridSizer* matrix_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	for (int x = 0; x < 3; ++x) {
-		for (int y = 0; y < 3; ++y) {
-			_matrix[x][y] = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
-			matrix_sizer->Add (_matrix[x][y]);
-		}
-	}
-	table->Add (matrix_sizer, wxGBPosition (r, 1));
-	++r;
-
-	add_label_to_grid_bag_sizer (table, this, _("Output gamma"), true, wxGBPosition (r, 0));
-	wxBoxSizer* output_sizer = new wxBoxSizer (wxHORIZONTAL);
-	/* TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
-	   comes after it.
-	*/
-	add_label_to_sizer (output_sizer, this, _("1 / "), false);
-	_output_gamma = new wxSpinCtrlDouble (this);
-	output_sizer->Add (_output_gamma);
-	table->Add (output_sizer, wxGBPosition (r, 1));
-	++r;
-
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
-
-	_input_gamma->SetRange(0.1, 4.0);
-	_input_gamma->SetDigits (1);
-	_input_gamma->SetIncrement (0.1);
-	_output_gamma->SetRange(0.1, 4.0);
-	_output_gamma->SetDigits (1);
-	_output_gamma->SetIncrement (0.1);
-
-	_name->SetValue (std_to_wx (conversion->name));
-	_input_gamma->SetValue (conversion->input_gamma);
-	_input_gamma_linearised->SetValue (conversion->input_gamma_linearised);
-	for (int i = 0; i < 3; ++i) {
-		for (int j = 0; j < 3; ++j) {
-			_matrix[i][j]->SetValue (std_to_wx (lexical_cast<string> (conversion->matrix(i, j))));
-		}
-	}
-	_output_gamma->SetValue (conversion->output_gamma);
-
-	_name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionDialog::changed, this));
-	_input_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionDialog::changed, this));
-	_input_gamma_linearised->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ColourConversionDialog::changed, this));
-	_output_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionDialog::changed, this));
-	for (int i = 0; i < 3; ++i) {
-		for (int j = 0; j < 3; ++j) {
-			_matrix[i][j]->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionDialog::changed, this));
-		}
-	}
-}
-
-void
-ColourConversionDialog::changed ()
-{
-	_conversion->name = wx_to_std (_name->GetValue ());
-	_conversion->input_gamma = _input_gamma->GetValue ();
-	_conversion->input_gamma_linearised = _input_gamma_linearised->GetValue ();
-
-	for (int i = 0; i < 3; ++i) {
-		for (int j = 0; j < 3; ++j) {
-			string const v = wx_to_std (_matrix[i][j]->GetValue ());
-			if (v.empty ()) {
-				_conversion->matrix (i, j) = 0;
-			} else {
-				_conversion->matrix (i, j) = lexical_cast<float> (v);
-			}
-		}
-	}
-	_conversion->output_gamma = _output_gamma->GetValue ();
-}
-	
diff --git a/src/wx/colour_conversion_dialog.h b/src/wx/colour_conversion_dialog.h
deleted file mode 100644
index 8da6df100..000000000
--- a/src/wx/colour_conversion_dialog.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-    Copyright (C) 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <wx/wx.h>
-
-class wxSpinCtrlDouble;
-class ColourConversion;
-
-class ColourConversionDialog : public wxDialog
-{
-public:
-	ColourConversionDialog (wxWindow *, boost::shared_ptr<ColourConversion>);
-
-private:
-	void changed ();
-	
-	boost::shared_ptr<ColourConversion> _conversion;
-	wxTextCtrl* _name;
-	wxSpinCtrlDouble* _input_gamma;
-	wxCheckBox* _input_gamma_linearised;
-	wxTextCtrl* _matrix[3][3];
-	wxSpinCtrlDouble* _output_gamma;
-};
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
new file mode 100644
index 000000000..091028dcd
--- /dev/null
+++ b/src/wx/colour_conversion_editor.cc
@@ -0,0 +1,152 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/lexical_cast.hpp>
+#include <wx/spinctrl.h>
+#include <wx/gbsizer.h>
+#include "lib/colour_conversion.h"
+#include "wx_util.h"
+#include "colour_conversion_editor.h"
+
+using std::string;
+using std::cout;
+using std::stringstream;
+using boost::shared_ptr;
+using boost::lexical_cast;
+
+ColourConversionEditor::ColourConversionEditor (wxWindow* parent)
+	: wxPanel (parent, wxID_ANY)
+{
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	SetSizer (overall_sizer);
+
+	wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+
+	int r = 0;
+
+	add_label_to_grid_bag_sizer (table, this, _("Input gamma"), true, wxGBPosition (r, 0));
+	_input_gamma = new wxSpinCtrlDouble (this);
+	table->Add (_input_gamma, wxGBPosition (r, 1));
+	++r;
+
+	_input_gamma_linearised = new wxCheckBox (this, wxID_ANY, _("Linearise input gamma curve for low values"));
+	table->Add (_input_gamma_linearised, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+
+        wxClientDC dc (parent);
+        wxSize size = dc.GetTextExtent (wxT ("-0.123456789012345678"));
+        size.SetHeight (-1);
+
+        wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
+        wxArrayString list;
+
+        wxString n (wxT ("0123456789.-"));
+        for (size_t i = 0; i < n.Length(); ++i) {
+                list.Add (n[i]);
+        }
+
+        validator.SetIncludes (list);
+
+	add_label_to_grid_bag_sizer (table, this, _("Matrix"), true, wxGBPosition (r, 0));
+	wxFlexGridSizer* matrix_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			_matrix[i][j] = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+			matrix_sizer->Add (_matrix[i][j]);
+		}
+	}
+	table->Add (matrix_sizer, wxGBPosition (r, 1));
+	++r;
+
+	add_label_to_grid_bag_sizer (table, this, _("Output gamma"), true, wxGBPosition (r, 0));
+	wxBoxSizer* output_sizer = new wxBoxSizer (wxHORIZONTAL);
+	/* TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
+	   comes after it.
+	*/
+	add_label_to_sizer (output_sizer, this, _("1 / "), false);
+	_output_gamma = new wxSpinCtrlDouble (this);
+	output_sizer->Add (_output_gamma);
+	table->Add (output_sizer, wxGBPosition (r, 1));
+	++r;
+
+	_input_gamma->SetRange(0.1, 4.0);
+	_input_gamma->SetDigits (1);
+	_input_gamma->SetIncrement (0.1);
+	_output_gamma->SetRange(0.1, 4.0);
+	_output_gamma->SetDigits (1);
+	_output_gamma->SetIncrement (0.1);
+
+	_input_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionEditor::changed, this));
+	_input_gamma_linearised->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ColourConversionEditor::changed, this));
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			_matrix[i][j]->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this));
+		}
+	}
+	_output_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionEditor::changed, this));
+}
+
+void
+ColourConversionEditor::set (ColourConversion conversion)
+{
+	_input_gamma->SetValue (conversion.input_gamma);
+	_input_gamma_linearised->SetValue (conversion.input_gamma_linearised);
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			stringstream s;
+			s.setf (std::ios::fixed, std::ios::floatfield);
+			s.precision (14);
+			s << conversion.matrix (i, j);
+			_matrix[i][j]->SetValue (std_to_wx (s.str ()));
+		}
+	}
+	_output_gamma->SetValue (conversion.output_gamma);
+}
+
+ColourConversion
+ColourConversionEditor::get () const
+{
+	ColourConversion conversion;
+	
+	conversion.input_gamma = _input_gamma->GetValue ();
+	conversion.input_gamma_linearised = _input_gamma_linearised->GetValue ();
+
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			string const v = wx_to_std (_matrix[i][j]->GetValue ());
+			if (v.empty ()) {
+				conversion.matrix (i, j) = 0;
+			} else {
+				conversion.matrix (i, j) = lexical_cast<double> (v);
+			}
+		}
+	}
+	
+	conversion.output_gamma = _output_gamma->GetValue ();
+
+	return conversion;
+}
+
+void
+ColourConversionEditor::changed ()
+{
+	Changed ();
+}
+
diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
new file mode 100644
index 000000000..8567cac22
--- /dev/null
+++ b/src/wx/colour_conversion_editor.h
@@ -0,0 +1,48 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
+#define DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
+
+#include <boost/signals2.hpp>
+#include <wx/wx.h>
+
+class wxSpinCtrlDouble;
+class ColourConversion;
+
+class ColourConversionEditor : public wxPanel
+{
+public:
+	ColourConversionEditor (wxWindow *);
+
+	void set (ColourConversion);
+	ColourConversion get () const;
+
+	boost::signals2::signal<void ()> Changed;
+
+private:
+	void changed ();
+	
+	wxSpinCtrlDouble* _input_gamma;
+	wxCheckBox* _input_gamma_linearised;
+	wxTextCtrl* _matrix[3][3];
+	wxSpinCtrlDouble* _output_gamma;
+};
+
+#endif
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 66f0cd186..7f1efa52f 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -40,7 +40,7 @@
 #include "server_dialog.h"
 #include "dir_picker_ctrl.h"
 #include "dci_metadata_dialog.h"
-#include "colour_conversion_dialog.h"
+#include "preset_colour_conversion_dialog.h"
 
 using std::vector;
 using std::string;
@@ -280,13 +280,13 @@ ConfigDialog::make_metadata_panel ()
 }
 
 static std::string
-server_column (shared_ptr<ServerDescription> s, int c)
+server_column (ServerDescription s, int c)
 {
 	switch (c) {
 	case 0:
-		return s->host_name ();
+		return s.host_name ();
 	case 1:
-		return lexical_cast<string> (s->threads ());
+		return lexical_cast<string> (s.threads ());
 	}
 
 	return "";
@@ -434,9 +434,9 @@ ConfigDialog::default_j2k_bandwidth_changed ()
 }
 
 static std::string
-colour_conversion_column (shared_ptr<ColourConversion> c)
+colour_conversion_column (PresetColourConversion c)
 {
-	return c->name;
+	return c.name;
 }
 
 void
@@ -444,7 +444,7 @@ ConfigDialog::make_colour_conversions_panel ()
 {
 	vector<string> columns;
 	columns.push_back (wx_to_std (_("Name")));
-	_colour_conversions_panel = new EditableList<ColourConversion, ColourConversionDialog> (
+	_colour_conversions_panel = new EditableList<PresetColourConversion, PresetColourConversionDialog> (
 		_notebook,
 		columns,
 		boost::bind (&Config::colour_conversions, Config::instance()),
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 60d9229c4..82c4ee2a0 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -31,8 +31,8 @@
 class DirPickerCtrl;
 class wxNotebook;
 class ServerDescription;
-class ColourConversion;
-class ColourConversionDialog;
+class PresetColourConversion;
+class PresetColourConversionDialog;
 class ServerDialog;
 
 /** @class ConfigDialog
@@ -71,7 +71,7 @@ private:
 	wxNotebook* _notebook;
 	wxPanel* _misc_panel;
 	wxPanel* _tms_panel;
-	EditableList<ColourConversion, ColourConversionDialog>* _colour_conversions_panel;
+	EditableList<PresetColourConversion, PresetColourConversionDialog>* _colour_conversions_panel;
 	EditableList<ServerDescription, ServerDialog>* _servers_panel;
 	wxPanel* _metadata_panel;
 	wxCheckBox* _set_language;
diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
new file mode 100644
index 000000000..8fca090ad
--- /dev/null
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -0,0 +1,121 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/statline.h>
+#include "lib/colour_conversion.h"
+#include "lib/config.h"
+#include "wx_util.h"
+#include "content_colour_conversion_dialog.h"
+#include "colour_conversion_editor.h"
+
+using std::string;
+using std::vector;
+using std::cout;
+using boost::optional;
+
+ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
+	: wxDialog (parent, wxID_ANY, _("Colour conversion"))
+	, _editor (new ColourConversionEditor (this))
+	, _setting (false)
+{
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	SetSizer (overall_sizer);
+
+	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	_preset_check = new wxCheckBox (this, wxID_ANY, _("Use preset"));
+	table->Add (_preset_check, 0, wxALIGN_CENTER_VERTICAL);
+	_preset_choice = new wxChoice (this, wxID_ANY);
+	table->Add (_preset_choice);
+
+	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+	overall_sizer->Add (new wxStaticLine (this, wxID_ANY));
+	overall_sizer->Add (_editor);
+
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	overall_sizer->Layout ();
+	overall_sizer->SetSizeHints (this);
+
+	_preset_check->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this));
+	_preset_choice->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ContentColourConversionDialog::preset_choice_changed, this));
+
+	_editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));
+
+	vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
+	for (vector<PresetColourConversion>::const_iterator i = presets.begin(); i != presets.end(); ++i) {
+		_preset_choice->Append (std_to_wx (i->name));
+	}
+}
+
+ColourConversion
+ContentColourConversionDialog::get () const
+{
+	return _editor->get ();
+}
+
+void
+ContentColourConversionDialog::set (ColourConversion c)
+{
+	_setting = true;
+	_editor->set (c);
+	_setting = false;
+	
+	check_for_preset ();
+}
+
+void
+ContentColourConversionDialog::check_for_preset ()
+{
+	if (_setting) {
+		return;
+	}
+	
+	optional<size_t> preset = _editor->get().preset ();
+
+	_preset_check->SetValue (preset);
+	_preset_choice->Enable (preset);
+	_preset_choice->SetSelection (preset.get_value_or (-1));
+}
+
+void
+ContentColourConversionDialog::preset_check_clicked ()
+{
+	if (_preset_check->GetValue ()) {
+		_preset_choice->SetSelection (0);
+		preset_choice_changed ();
+	} else {
+		_preset_choice->SetSelection (-1);
+		_preset_choice->Enable (false);
+	}
+}
+
+void
+ContentColourConversionDialog::preset_choice_changed ()
+{
+	vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
+	int const s = _preset_choice->GetSelection();
+	if (s != -1) {
+		set (presets[s].conversion);
+	}
+}
+
+	
diff --git a/src/wx/content_colour_conversion_dialog.h b/src/wx/content_colour_conversion_dialog.h
new file mode 100644
index 000000000..e6069f117
--- /dev/null
+++ b/src/wx/content_colour_conversion_dialog.h
@@ -0,0 +1,41 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/wx.h>
+
+class ColourConversionEditor;
+
+class ContentColourConversionDialog : public wxDialog
+{
+public:
+	ContentColourConversionDialog (wxWindow *);
+
+	void set (ColourConversion);
+	ColourConversion get () const;
+
+private:
+	void check_for_preset ();
+	void preset_check_clicked ();
+	void preset_choice_changed ();
+	
+	wxCheckBox* _preset_check;
+	wxChoice* _preset_choice;
+	ColourConversionEditor* _editor;
+	bool _setting;
+};
diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index 32cc326b6..5eb46e80d 100644
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -26,9 +26,9 @@ public:
 	EditableList (
 		wxWindow* parent,
 		std::vector<std::string> columns,
-		boost::function<std::vector<boost::shared_ptr<T> > ()> get,
-		boost::function<void (std::vector<boost::shared_ptr<T> >)> set,
-		boost::function<std::string (boost::shared_ptr<T>, int)> column
+		boost::function<std::vector<T> ()> get,
+		boost::function<void (std::vector<T>)> set,
+		boost::function<std::string (T, int)> column
 		)
 		: wxPanel (parent)
 		, _get (get)
@@ -66,8 +66,8 @@ public:
 			table->Add (s, 0);
 		}
 
-		std::vector<boost::shared_ptr<T> > current = _get ();
-		for (typename std::vector<boost::shared_ptr<T> >::iterator i = current.begin (); i != current.end(); ++i) {
+		std::vector<T> current = _get ();
+		for (typename std::vector<T>::iterator i = current.begin (); i != current.end(); ++i) {
 			add_to_control (*i);
 		}
 
@@ -77,10 +77,14 @@ public:
 
 		_list->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&EditableList::selection_changed, this));
 		_list->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&EditableList::selection_changed, this));
+		_list->Bind (wxEVT_SIZE, boost::bind (&EditableList::resized, this, _1));
 		selection_changed ();
+
 	}
 
-	void add_to_control (boost::shared_ptr<T> item)
+private:	
+
+	void add_to_control (T item)
 	{
 		wxListItem list_item;
 		int const n = _list->GetItemCount ();
@@ -101,15 +105,18 @@ public:
 
 	void add_clicked ()
 	{
-		boost::shared_ptr<T> new_item (new T);
-		S* dialog = new S (this, new_item);
+		T new_item;
+		S* dialog = new S (this);
+		dialog->set (new_item);
 		dialog->ShowModal ();
-		dialog->Destroy ();
 
-		add_to_control (new_item);
-		std::vector<boost::shared_ptr<T> > all = _get ();
-		all.push_back (new_item);
+		add_to_control (dialog->get ());
+		
+		std::vector<T> all = _get ();
+		all.push_back (dialog->get ());
 		_set (all);
+		
+		dialog->Destroy ();
 	}
 
 	void edit_clicked ()
@@ -119,13 +126,15 @@ public:
 			return;
 		}
 
-		std::vector<boost::shared_ptr<T> > all = _get ();
+		std::vector<T> all = _get ();
 		assert (item >= 0 && item < int (all.size ()));
 
-		S* dialog = new S (this, all[item]);
+		S* dialog = new S (this);
+		dialog->set (all[item]);
 		dialog->ShowModal ();
+		all[item] = dialog->get ();
 		dialog->Destroy ();
-
+		
 		for (int i = 0; i < _columns; ++i) {
 			_list->SetItem (item, i, std_to_wx (_column (all[item], i)));
 		}
@@ -138,16 +147,24 @@ public:
 			_list->DeleteItem (i);
 		}
 		
-		std::vector<boost::shared_ptr<T> > all = _get ();
+		std::vector<T> all = _get ();
 		all.erase (all.begin() + i);
 		_set (all);
 	}
 
-private:	
-	boost::function <std::vector<boost::shared_ptr<T> > ()> _get;
-	boost::function <void (std::vector<boost::shared_ptr<T> >)> _set;
+	void resized (wxSizeEvent& ev)
+	{
+		int const w = GetSize().GetWidth() / _columns;
+		for (int i = 0; i < _columns; ++i) {
+			_list->SetColumnWidth (i, w);
+		}
+		ev.Skip ();
+	}
+
+	boost::function <std::vector<T> ()> _get;
+	boost::function <void (std::vector<T>)> _set;
 	int _columns;
-	boost::function<std::string (boost::shared_ptr<T>, int)> _column;
+	boost::function<std::string (T, int)> _column;
 
 	wxButton* _add;
 	wxButton* _edit;
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 812da88bf..28c315a96 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -741,6 +741,7 @@ FilmEditor::content_selection_changed ()
 	film_content_changed (s, VideoContentProperty::VIDEO_CROP);
 	film_content_changed (s, VideoContentProperty::VIDEO_RATIO);
 	film_content_changed (s, VideoContentProperty::VIDEO_FRAME_TYPE);
+	film_content_changed (s, VideoContentProperty::COLOUR_CONVERSION);
 	film_content_changed (s, AudioContentProperty::AUDIO_GAIN);
 	film_content_changed (s, AudioContentProperty::AUDIO_DELAY);
 	film_content_changed (s, AudioContentProperty::AUDIO_MAPPING);
diff --git a/src/wx/filter_dialog.cc b/src/wx/filter_dialog.cc
index 2abe53026..13907ae0c 100644
--- a/src/wx/filter_dialog.cc
+++ b/src/wx/filter_dialog.cc
@@ -23,14 +23,14 @@
 
 #include "lib/film.h"
 #include "filter_dialog.h"
-#include "filter_view.h"
+#include "filter_editor.h"
 
 using namespace std;
 using boost::bind;
 
 FilterDialog::FilterDialog (wxWindow* parent, vector<Filter const *> const & f)
 	: wxDialog (parent, wxID_ANY, wxString (_("Filters")))
-	, _filters (new FilterView (this, f))
+	, _filters (new FilterEditor (this, f))
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 	sizer->Add (_filters, 1, wxEXPAND | wxALL, 6);
diff --git a/src/wx/filter_dialog.h b/src/wx/filter_dialog.h
index 6f8b1dd1c..d54e6f2e4 100644
--- a/src/wx/filter_dialog.h
+++ b/src/wx/filter_dialog.h
@@ -25,7 +25,7 @@
 #include <boost/signals2.hpp>
 
 class Film;
-class FilterView;
+class FilterEditor;
 class Filter;
 
 /** @class FilterDialog
@@ -41,5 +41,5 @@ public:
 private:
 	void active_changed ();
 	
-	FilterView* _filters;
+	FilterEditor* _filters;
 };
diff --git a/src/wx/filter_editor.cc b/src/wx/filter_editor.cc
new file mode 100644
index 000000000..4dd18004b
--- /dev/null
+++ b/src/wx/filter_editor.cc
@@ -0,0 +1,92 @@
+/*
+    Copyright (C) 2012 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/filter_editor.cc
+ *  @brief A panel to select FFmpeg filters.
+ */
+
+#include <iostream>
+#include <algorithm>
+#include "lib/filter.h"
+#include "filter_editor.h"
+#include "wx_util.h"
+
+using namespace std;
+
+FilterEditor::FilterEditor (wxWindow* parent, vector<Filter const *> const & active)
+	: wxPanel (parent)
+{
+	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	SetSizer (sizer);
+	
+	vector<Filter const *> filters = Filter::all ();
+
+	typedef map<string, list<Filter const *> > CategoryMap;
+	CategoryMap categories;
+
+	for (vector<Filter const *>::iterator i = filters.begin(); i != filters.end(); ++i) {
+		CategoryMap::iterator j = categories.find ((*i)->category ());
+		if (j == categories.end ()) {
+			list<Filter const *> c;
+			c.push_back (*i);
+			categories[(*i)->category()] = c;
+		} else {
+			j->second.push_back (*i);
+		}
+	}
+
+	for (CategoryMap::iterator i = categories.begin(); i != categories.end(); ++i) {
+
+		wxStaticText* c = new wxStaticText (this, wxID_ANY, std_to_wx (i->first));
+		wxFont font = c->GetFont();
+		font.SetWeight(wxFONTWEIGHT_BOLD);
+		c->SetFont(font);
+		sizer->Add (c);
+
+		for (list<Filter const *>::iterator j = i->second.begin(); j != i->second.end(); ++j) {
+			wxCheckBox* b = new wxCheckBox (this, wxID_ANY, std_to_wx ((*j)->name ()));
+			bool const a = find (active.begin(), active.end(), *j) != active.end ();
+			b->SetValue (a);
+			_filters[*j] = b;
+			b->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilterEditor::filter_toggled, this));
+			sizer->Add (b);
+		}
+
+		sizer->AddSpacer (6);
+	}
+}
+
+void
+FilterEditor::filter_toggled ()
+{
+	ActiveChanged ();
+}
+
+vector<Filter const*>
+FilterEditor::active () const
+{
+	vector<Filter const *> active;
+	for (map<Filter const *, wxCheckBox*>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
+		if (i->second->IsChecked ()) {
+			active.push_back (i->first);
+		}
+	}
+
+	return active;
+}
diff --git a/src/wx/filter_editor.h b/src/wx/filter_editor.h
new file mode 100644
index 000000000..4e1d682d5
--- /dev/null
+++ b/src/wx/filter_editor.h
@@ -0,0 +1,47 @@
+/*
+    Copyright (C) 2012 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/filter_editor.h
+ *  @brief A panel to select FFmpeg filters.
+ */
+
+#include <boost/signals2.hpp>
+#include <vector>
+#include <map>
+#include <wx/wx.h>
+
+class Filter;
+
+/** @class FilterEditor
+ *  @brief A panel to select FFmpeg filters.
+ */
+class FilterEditor : public wxPanel
+{
+public:
+	FilterEditor (wxWindow *, std::vector<Filter const *> const &);
+
+	std::vector<Filter const *> active () const;
+
+	boost::signals2::signal<void()> ActiveChanged;
+
+private:
+	void filter_toggled ();
+
+	std::map<Filter const *, wxCheckBox *> _filters;
+};
diff --git a/src/wx/filter_view.cc b/src/wx/filter_view.cc
deleted file mode 100644
index 757daf3fa..000000000
--- a/src/wx/filter_view.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file  src/filter_view.cc
- *  @brief A panel to select FFmpeg filters.
- */
-
-#include <iostream>
-#include <algorithm>
-#include "lib/filter.h"
-#include "filter_view.h"
-#include "wx_util.h"
-
-using namespace std;
-
-FilterView::FilterView (wxWindow* parent, vector<Filter const *> const & active)
-	: wxPanel (parent)
-{
-	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-	SetSizer (sizer);
-	
-	vector<Filter const *> filters = Filter::all ();
-
-	typedef map<string, list<Filter const *> > CategoryMap;
-	CategoryMap categories;
-
-	for (vector<Filter const *>::iterator i = filters.begin(); i != filters.end(); ++i) {
-		CategoryMap::iterator j = categories.find ((*i)->category ());
-		if (j == categories.end ()) {
-			list<Filter const *> c;
-			c.push_back (*i);
-			categories[(*i)->category()] = c;
-		} else {
-			j->second.push_back (*i);
-		}
-	}
-
-	for (CategoryMap::iterator i = categories.begin(); i != categories.end(); ++i) {
-
-		wxStaticText* c = new wxStaticText (this, wxID_ANY, std_to_wx (i->first));
-		wxFont font = c->GetFont();
-		font.SetWeight(wxFONTWEIGHT_BOLD);
-		c->SetFont(font);
-		sizer->Add (c);
-
-		for (list<Filter const *>::iterator j = i->second.begin(); j != i->second.end(); ++j) {
-			wxCheckBox* b = new wxCheckBox (this, wxID_ANY, std_to_wx ((*j)->name ()));
-			bool const a = find (active.begin(), active.end(), *j) != active.end ();
-			b->SetValue (a);
-			_filters[*j] = b;
-			b->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilterView::filter_toggled, this));
-			sizer->Add (b);
-		}
-
-		sizer->AddSpacer (6);
-	}
-}
-
-void
-FilterView::filter_toggled ()
-{
-	ActiveChanged ();
-}
-
-vector<Filter const*>
-FilterView::active () const
-{
-	vector<Filter const *> active;
-	for (map<Filter const *, wxCheckBox*>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
-		if (i->second->IsChecked ()) {
-			active.push_back (i->first);
-		}
-	}
-
-	return active;
-}
diff --git a/src/wx/filter_view.h b/src/wx/filter_view.h
deleted file mode 100644
index 7fbef84bf..000000000
--- a/src/wx/filter_view.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-/** @file  src/filter_view.h
- *  @brief A panel to select FFmpeg filters.
- */
-
-#include <boost/signals2.hpp>
-#include <vector>
-#include <map>
-#include <wx/wx.h>
-
-class Filter;
-
-/** @class FilterView
- *  @brief A panel to select FFmpeg filters.
- */
-class FilterView : public wxPanel
-{
-public:
-	FilterView (wxWindow *, std::vector<Filter const *> const &);
-
-	std::vector<Filter const *> active () const;
-
-	boost::signals2::signal<void()> ActiveChanged;
-
-private:
-	void filter_toggled ();
-
-	std::map<Filter const *, wxCheckBox *> _filters;
-};
diff --git a/src/wx/preset_colour_conversion_dialog.cc b/src/wx/preset_colour_conversion_dialog.cc
new file mode 100644
index 000000000..8c4a6dbcf
--- /dev/null
+++ b/src/wx/preset_colour_conversion_dialog.cc
@@ -0,0 +1,68 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/statline.h>
+#include "lib/colour_conversion.h"
+#include "wx_util.h"
+#include "preset_colour_conversion_dialog.h"
+#include "colour_conversion_editor.h"
+
+using std::string;
+using std::cout;
+
+PresetColourConversionDialog::PresetColourConversionDialog (wxWindow* parent)
+	: wxDialog (parent, wxID_ANY, _("Colour conversion"))
+	, _editor (new ColourConversionEditor (this))
+{
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	SetSizer (overall_sizer);
+
+	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	add_label_to_sizer (table, this, _("Name"), true);
+	_name = new wxTextCtrl (this, wxID_ANY, wxT (""));
+	table->Add (_name);
+
+	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+	overall_sizer->Add (new wxStaticLine (this, wxID_ANY));
+	overall_sizer->Add (_editor);
+
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	overall_sizer->Layout ();
+	overall_sizer->SetSizeHints (this);
+}
+
+PresetColourConversion
+PresetColourConversionDialog::get () const
+{
+	PresetColourConversion pc;
+	pc.name = wx_to_std (_name->GetValue ());
+	pc.conversion = _editor->get ();
+	return pc;
+}
+
+void
+PresetColourConversionDialog::set (PresetColourConversion c)
+{
+	_name->SetValue (std_to_wx (c.name));
+	_editor->set (c.conversion);
+}
diff --git a/src/wx/preset_colour_conversion_dialog.h b/src/wx/preset_colour_conversion_dialog.h
new file mode 100644
index 000000000..4e612398c
--- /dev/null
+++ b/src/wx/preset_colour_conversion_dialog.h
@@ -0,0 +1,35 @@
+/*
+    Copyright (C) 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/wx.h>
+
+class ColourConversionEditor;
+
+class PresetColourConversionDialog : public wxDialog
+{
+public:
+	PresetColourConversionDialog (wxWindow *);
+
+	void set (PresetColourConversion);
+	PresetColourConversion get () const;
+
+private:
+	wxTextCtrl* _name;
+	ColourConversionEditor* _editor;
+};
diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index a0f1f04ae..31b3ce5dc 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -23,15 +23,9 @@
 
 using boost::shared_ptr;
 
-ServerDialog::ServerDialog (wxWindow* parent, shared_ptr<ServerDescription> server)
+ServerDialog::ServerDialog (wxWindow* parent)
 	: wxDialog (parent, wxID_ANY, _("Server"))
 {
-	if (server) {
-		_server = server;
-	} else {
-		_server.reset (new ServerDescription (wx_to_std (N_("localhost")), 1));
-	}
-		
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 	table->AddGrowableCol (1, 1);
 
@@ -43,12 +37,7 @@ ServerDialog::ServerDialog (wxWindow* parent, shared_ptr<ServerDescription> serv
 	_threads = new wxSpinCtrl (this, wxID_ANY);
 	table->Add (_threads, 1, wxEXPAND);
 
-	_host->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ServerDialog::host_changed, this));
 	_threads->SetRange (0, 256);
-	_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&ServerDialog::threads_changed, this));
-
-	_host->SetValue (std_to_wx (_server->host_name ()));
-	_threads->SetValue (_server->threads ());
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
 	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
@@ -64,20 +53,18 @@ ServerDialog::ServerDialog (wxWindow* parent, shared_ptr<ServerDescription> serv
 }
 
 void
-ServerDialog::host_changed ()
-{
-	_server->set_host_name (wx_to_std (_host->GetValue ()));
-}
-
-void
-ServerDialog::threads_changed ()
+ServerDialog::set (ServerDescription server)
 {
-	_server->set_threads (_threads->GetValue ());
+	_host->SetValue (std_to_wx (server.host_name ()));
+	_threads->SetValue (server.threads ());
 }
 
-shared_ptr<ServerDescription>
-ServerDialog::server () const
+ServerDescription
+ServerDialog::get () const
 {
-	return _server;
+	ServerDescription server;
+	server.set_host_name (wx_to_std (_host->GetValue ()));
+	server.set_threads (_threads->GetValue ());
+	return server;
 }
 
diff --git a/src/wx/server_dialog.h b/src/wx/server_dialog.h
index 3f1fa1f73..a6f48fe7b 100644
--- a/src/wx/server_dialog.h
+++ b/src/wx/server_dialog.h
@@ -25,15 +25,12 @@ class ServerDescription;
 class ServerDialog : public wxDialog
 {
 public:
-	ServerDialog (wxWindow *, boost::shared_ptr<ServerDescription>);
+	ServerDialog (wxWindow *);
 
-	boost::shared_ptr<ServerDescription> server () const;
+	void set (ServerDescription);
+	ServerDescription get () const;
 
 private:
-	void host_changed ();
-	void threads_changed ();
-
-	boost::shared_ptr<ServerDescription> _server;
 	wxTextCtrl* _host;
 	wxSpinCtrl* _threads;
 };
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 5ba06b12d..bb8476d63 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -27,6 +27,7 @@
 #include "video_panel.h"
 #include "wx_util.h"
 #include "film_editor.h"
+#include "content_colour_conversion_dialog.h"
 
 using std::vector;
 using std::string;
@@ -36,6 +37,7 @@ using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
+using boost::optional;
 
 VideoPanel::VideoPanel (FilmEditor* e)
 	: FilmEditorPanel (e, _("Video"))
@@ -78,17 +80,34 @@ VideoPanel::VideoPanel (FilmEditor* e)
 	{
 		add_label_to_grid_bag_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0));
 		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_filters = new wxStaticText (this, wxID_ANY, _("None"));
+
+		wxClientDC dc (this);
+		wxSize size = dc.GetTextExtent (wxT ("A quite long name"));
+		size.SetHeight (-1);
+		
+		_filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
 		s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
 		_filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
 		s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL);
 		grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	}
 	++r;
+	
+	{
+		add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0));
+		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 
-	add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0));
-	_colour_conversion = new wxChoice (this, wxID_ANY);
-	grid->Add (_colour_conversion, wxGBPosition (r, 1));
+		wxClientDC dc (this);
+		wxSize size = dc.GetTextExtent (wxT ("A quite long name"));
+		size.SetHeight (-1);
+		
+		_colour_conversion = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
+
+		s->Add (_colour_conversion, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+		_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
+		s->Add (_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
+		grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	}
 	++r;
 
 	_description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize);
@@ -113,16 +132,14 @@ VideoPanel::VideoPanel (FilmEditor* e)
 	_frame_type->Append (_("2D"));
 	_frame_type->Append (_("3D left/right"));
 
-	setup_colour_conversions ();
-
-	_frame_type->Bind        (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::frame_type_changed, this));
-	_left_crop->Bind         (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::left_crop_changed, this));
-	_right_crop->Bind        (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::right_crop_changed, this));
-	_top_crop->Bind          (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::top_crop_changed, this));
-	_bottom_crop->Bind       (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::bottom_crop_changed, this));
-	_ratio->Bind	         (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::ratio_changed, this));
-	_filters_button->Bind    (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
-	_colour_conversion->Bind (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::colour_conversion_changed, this));
+	_frame_type->Bind               (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::frame_type_changed, this));
+	_left_crop->Bind                (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::left_crop_changed, this));
+	_right_crop->Bind               (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::right_crop_changed, this));
+	_top_crop->Bind                 (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::top_crop_changed, this));
+	_bottom_crop->Bind              (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&VideoPanel::bottom_crop_changed, this));
+	_ratio->Bind	                (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&VideoPanel::ratio_changed, this));
+	_filters_button->Bind           (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
+	_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
 }
 
 
@@ -223,6 +240,10 @@ VideoPanel::film_content_changed (shared_ptr<Content> c, int property)
 		setup_description ();
 	} else if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
 		setup_description ();
+	} else if (property == VideoContentProperty::COLOUR_CONVERSION) {
+		optional<size_t> preset = vc ? vc->colour_conversion().preset () : optional<size_t> ();
+		vector<PresetColourConversion> cc = Config::instance()->colour_conversions ();
+		_colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom"));
 	} else if (property == FFmpegContentProperty::FILTERS) {
 		if (fc) {
 			pair<string, string> p = Filter::ffmpeg_strings (fc->filters ());
@@ -355,16 +376,18 @@ VideoPanel::frame_type_changed ()
 }
 
 void
-VideoPanel::setup_colour_conversions ()
+VideoPanel::edit_colour_conversion_clicked ()
 {
-	vector<shared_ptr<ColourConversion> > cc = Config::instance()->colour_conversions ();
-	for (vector<shared_ptr<ColourConversion> >::iterator i = cc.begin(); i != cc.end(); ++i) {
-		_colour_conversion->Append (std_to_wx ((*i)->name));
+	shared_ptr<VideoContent> vc = _editor->selected_video_content ();
+	if (!vc) {
+		return;
 	}
-}
 
-void
-VideoPanel::colour_conversion_changed ()
-{
+	ColourConversion conversion = vc->colour_conversion ();
+	ContentColourConversionDialog* d = new ContentColourConversionDialog (this);
+	d->set (conversion);
+	d->ShowModal ();
 
+	vc->set_colour_conversion (d->get ());
+	d->Destroy ();
 }
diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 62332a052..2ecf3c87f 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -41,10 +41,9 @@ private:
 	void edit_filters_clicked ();
 	void ratio_changed ();
 	void frame_type_changed ();
-	void colour_conversion_changed ();
+	void edit_colour_conversion_clicked ();
 
 	void setup_description ();
-	void setup_colour_conversions ();
 
 	wxChoice* _frame_type;
 	wxSpinCtrl* _left_crop;
@@ -56,5 +55,6 @@ private:
 	wxStaticText* _description;
 	wxStaticText* _filters;
 	wxButton* _filters_button;
-	wxChoice* _colour_conversion;
+	wxStaticText* _colour_conversion;
+	wxButton* _colour_conversion_button;
 };
diff --git a/src/wx/wscript b/src/wx/wscript
index e0566a6ed..9c3ecdd71 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -9,8 +9,9 @@ sources = """
           audio_mapping_view.cc
           audio_panel.cc
           audio_plot.cc
-          colour_conversion_dialog.cc
+          colour_conversion_editor.cc
           config_dialog.cc
+          content_colour_conversion_dialog.cc
           content_menu.cc
           dci_metadata_dialog.cc
           dir_picker_ctrl.cc
@@ -18,11 +19,12 @@ sources = """
           film_editor_panel.cc
           film_viewer.cc
           filter_dialog.cc
-          filter_view.cc
+          filter_editor.cc
           gain_calculator_dialog.cc
           job_manager_view.cc
           job_wrapper.cc
           new_film_dialog.cc
+          preset_colour_conversion_dialog.cc
           properties_dialog.cc
           repeat_dialog.cc
           server_dialog.cc
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index d695f96ce..7faf47c41 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -29,7 +29,7 @@ using boost::shared_ptr;
 using boost::thread;
 
 void
-do_remote_encode (shared_ptr<DCPVideoFrame> frame, shared_ptr<ServerDescription> description, shared_ptr<EncodedData> locally_encoded)
+do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
 {
 	shared_ptr<EncodedData> remotely_encoded;
 	BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 	/* Let the server get itself ready */
 	dcpomatic_sleep (1);
 
-	shared_ptr<ServerDescription> description (new ServerDescription ("localhost", 2));
+	ServerDescription description ("localhost", 2);
 
 	list<thread*> threads;
 	for (int i = 0; i < 8; ++i) {
diff --git a/test/test.cc b/test/test.cc
index 21cf18c76..1c7b7e245 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -46,7 +46,7 @@ struct TestConfig
 		dcpomatic_setup();
 
 		Config::instance()->set_num_local_encoding_threads (1);
-		Config::instance()->set_servers (vector<shared_ptr<ServerDescription> > ());
+		Config::instance()->set_servers (vector<ServerDescription> ());
 		Config::instance()->set_server_port (61920);
 		Config::instance()->set_default_dci_metadata (DCIMetadata ());
 		Config::instance()->set_default_container (static_cast<Ratio*> (0));
-- 
cgit v1.2.3


From 5f64a83b76dd015cc03d106061bf890d3d80d788 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 17 Aug 2013 22:21:15 +0100
Subject: Try to actually use colour conversion; bump libdcp in cscript.

---
 cscript                                    |  2 +-
 src/lib/dcp_video_frame.cc                 | 27 +++++++++++++++++++++++----
 src/lib/dcp_video_frame.h                  |  3 ++-
 src/lib/encoder.cc                         |  4 ++--
 src/lib/encoder.h                          |  2 +-
 src/lib/player.cc                          |  6 +++---
 src/lib/player.h                           |  7 ++++---
 src/lib/server.cc                          |  4 +++-
 src/lib/transcoder.cc                      |  6 +++---
 src/wx/content_colour_conversion_dialog.cc |  2 +-
 src/wx/preset_colour_conversion_dialog.cc  |  2 +-
 test/client_server_test.cc                 |  1 +
 12 files changed, 45 insertions(+), 21 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/cscript b/cscript
index 4004cbdc3..1f14f2f77 100644
--- a/cscript
+++ b/cscript
@@ -7,7 +7,7 @@ def dependencies(target):
         return ()
     else:
         return (('ffmpeg-cdist', '0d76267f36cbf01acd6a2a96ad2f7497a1843862'),
-                ('libdcp', 'ee5e932cf0afa1ce24ea5eb0f298be8009cd9689'))
+                ('libdcp', '7b8313c73082cc08b4dc42dc86d0c90a578993b1'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 1cb20b611..cde9f8a32 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -77,11 +77,12 @@ using libdcp::Size;
  *  @param l Log to write to.
  */
 DCPVideoFrame::DCPVideoFrame (
-	shared_ptr<const Image> image, int f, Eyes eyes, int dcp_fps, int bw, shared_ptr<Log> l
+	shared_ptr<const Image> image, int f, Eyes eyes, ColourConversion c, int dcp_fps, int bw, shared_ptr<Log> l
 	)
 	: _image (image)
 	, _frame (f)
 	, _eyes (eyes)
+	, _conversion (c)
 	, _frames_per_second (dcp_fps)
 	, _j2k_bandwidth (bw)
 	, _log (l)
@@ -95,11 +96,27 @@ DCPVideoFrame::DCPVideoFrame (
 shared_ptr<EncodedData>
 DCPVideoFrame::encode_locally ()
 {
+	shared_ptr<libdcp::LUT> in_lut;
+	if (_conversion.input_gamma_linearised) {
+		in_lut = libdcp::SRGBLinearisedGammaLUT::cache.get (12, _conversion.input_gamma);
+	} else {
+		in_lut = libdcp::GammaLUT::cache.get (12, _conversion.input_gamma);
+	}
+
+	/* XXX: libdcp should probably use boost */
+	
+	double matrix[3][3];
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			matrix[i][j] = _conversion.matrix (i, j);
+		}
+	}
+	
 	shared_ptr<libdcp::XYZFrame> xyz = libdcp::rgb_to_xyz (
 		_image,
-		libdcp::SRGBLinearisedGammaLUT::cache.get (12, 2.4),
-		libdcp::GammaLUT::cache.get (16, 1 / 2.6),
-		libdcp::colour_matrix::srgb_to_xyz
+		in_lut,
+		libdcp::GammaLUT::cache.get (16, 1 / _conversion.output_gamma),
+		matrix
 		);
 		
 	/* Set the max image and component sizes based on frame_rate */
@@ -224,6 +241,8 @@ DCPVideoFrame::encode_remotely (ServerDescription serv)
 
 	socket->connect (*endpoint_iterator);
 
+	/* XXX: colour conversion! */
+
 	stringstream s;
 	s << "encode please\n"
 	  << "width " << _image->size().width << "\n"
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index ce6444293..9e58b5879 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -102,7 +102,7 @@ public:
 class DCPVideoFrame : public boost::noncopyable
 {
 public:
-	DCPVideoFrame (boost::shared_ptr<const Image>, int, Eyes, int, int, boost::shared_ptr<Log>);
+	DCPVideoFrame (boost::shared_ptr<const Image>, int, Eyes, ColourConversion, int, int, boost::shared_ptr<Log>);
 
 	boost::shared_ptr<EncodedData> encode_locally ();
 	boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);
@@ -119,6 +119,7 @@ private:
 	boost::shared_ptr<const Image> _image;
 	int _frame;			 ///< frame index within the DCP's intrinsic duration
 	Eyes _eyes;
+	ColourConversion _conversion;
 	int _frames_per_second;		 ///< Frames per second that we will use for the DCP
 	int _j2k_bandwidth;		 ///< J2K bandwidth to use
 
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 29fe64e26..ea175f1f4 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -171,7 +171,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, bool same)
+Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, bool same)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
@@ -205,7 +205,7 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, bool same)
 		TIMING ("adding to queue of %1", _queue.size ());
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, _video_frames_out, eyes, _film->video_frame_rate(),
+						  image, _video_frames_out, eyes, conversion, _film->video_frame_rate(),
 						  _film->j2k_bandwidth(), _film->log()
 						  )
 					  ));
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index c0ea30fcb..44134e568 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -66,7 +66,7 @@ public:
 	 *  @param i Video frame image.
 	 *  @param same true if i is the same as the last time we were called.
 	 */
-	void process_video (boost::shared_ptr<const Image> i, Eyes eyes, bool same);
+	void process_video (boost::shared_ptr<const Image> i, Eyes eyes, ColourConversion, bool same);
 
 	/** Call with some audio data */
 	void process_audio (boost::shared_ptr<const AudioBuffers>);
diff --git a/src/lib/player.cc b/src/lib/player.cc
index af2e6216a..f8ccb0142 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -276,11 +276,11 @@ Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image
 	_last_video = piece->content;
 #endif
 
-	Video (work_image, eyes, same, time);
+	Video (work_image, eyes, content->colour_conversion(), same, time);
 	time += TIME_HZ / _film->video_frame_rate();
 
 	if (frc.repeat) {
-		Video (work_image, eyes, true, time);
+		Video (work_image, eyes, content->colour_conversion(), true, time);
 		time += TIME_HZ / _film->video_frame_rate();
 	}
 
@@ -549,7 +549,7 @@ Player::emit_black ()
 	_last_video.reset ();
 #endif
 	
-	Video (_black_frame, EYES_BOTH, _last_emit_was_black, _video_position);
+	Video (_black_frame, EYES_BOTH, ColourConversion(), _last_emit_was_black, _video_position);
 	_video_position += _film->video_frames_to_time (1);
 	_last_emit_was_black = true;
 }
diff --git a/src/lib/player.h b/src/lib/player.h
index 85d750f6f..2261f66ea 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -62,10 +62,11 @@ public:
 	/** Emitted when a video frame is ready.
 	 *  First parameter is the video image.
 	 *  Second parameter is the eye(s) that should see this image.
-	 *  Third parameter is true if the image is the same as the last one that was emitted.
-	 *  Fourth parameter is the time.
+	 *  Third parameter is the colour conversion that should be used for this image.
+	 *  Fourth parameter is true if the image is the same as the last one that was emitted.
+	 *  Fifth parameter is the time.
 	 */
-	boost::signals2::signal<void (boost::shared_ptr<const Image>, Eyes, bool, Time)> Video;
+	boost::signals2::signal<void (boost::shared_ptr<const Image>, Eyes, ColourConversion, bool, Time)> Video;
 	
 	/** Emitted when some audio data is ready */
 	boost::signals2::signal<void (boost::shared_ptr<const AudioBuffers>, Time)> Audio;
diff --git a/src/lib/server.cc b/src/lib/server.cc
index de265dca4..e4c281172 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -112,8 +112,10 @@ Server::process (shared_ptr<Socket> socket)
 
 	image->read_from_socket (socket);
 
+	/* XXX: colour conversion... */
+
 	DCPVideoFrame dcp_video_frame (
-		image, frame, eyes, frames_per_second, j2k_bandwidth, _log
+		image, frame, eyes, ColourConversion(), frames_per_second, j2k_bandwidth, _log
 		);
 	
 	shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 3002ef61c..715a158db 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -40,11 +40,11 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
 static void
-video_proxy (weak_ptr<Encoder> encoder, shared_ptr<const Image> image, Eyes eyes, bool same)
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, bool same)
 {
 	shared_ptr<Encoder> e = encoder.lock ();
 	if (e) {
-		e->process_video (image, eyes, same);
+		e->process_video (image, eyes, conversion, same);
 	}
 }
 
@@ -67,7 +67,7 @@ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	, _player (f->make_player ())
 	, _encoder (new Encoder (f, j))
 {
-	_player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3));
+	_player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4));
 	_player->Audio.connect (bind (audio_proxy, _encoder, _1));
 }
 
diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 8fca090ad..d8e768bcd 100644
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -44,7 +44,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
 	table->Add (_preset_choice);
 
 	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-	overall_sizer->Add (new wxStaticLine (this, wxID_ANY));
+	overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND);
 	overall_sizer->Add (_editor);
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
diff --git a/src/wx/preset_colour_conversion_dialog.cc b/src/wx/preset_colour_conversion_dialog.cc
index 8c4a6dbcf..e7f8cf049 100644
--- a/src/wx/preset_colour_conversion_dialog.cc
+++ b/src/wx/preset_colour_conversion_dialog.cc
@@ -39,7 +39,7 @@ PresetColourConversionDialog::PresetColourConversionDialog (wxWindow* parent)
 	table->Add (_name);
 
 	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-	overall_sizer->Add (new wxStaticLine (this, wxID_ANY));
+	overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND);
 	overall_sizer->Add (_editor);
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 7faf47c41..8662f54e8 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -76,6 +76,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 			image,
 			0,
 			EYES_BOTH,
+			ColourConversion (),
 			24,
 			200000000,
 			log
-- 
cgit v1.2.3


From 9e124e8ce2eb7a9faeb91b33169ab1ae4912afb0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 29 Aug 2013 14:25:31 +0100
Subject: Better progress reporting during MXF hashing (#184).

---
 ChangeLog                |  2 ++
 src/lib/encoder.cc       | 12 +++++++++---
 src/lib/encoder.h        | 15 +++++++++++++--
 src/lib/transcode_job.cc |  7 ++++++-
 src/lib/transcoder.cc    |  6 ++++++
 src/lib/transcoder.h     | 14 +++-----------
 src/lib/writer.cc        | 14 ++++++++++++++
 7 files changed, 53 insertions(+), 17 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/ChangeLog b/ChangeLog
index f88d29d56..54fdc10fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-08-29  Carl Hetherington  <cth@carlh.net>
 
+	* Fix stuck-at-99% progress meters (#184).
+
 	* Version 1.01beta1 released.
 
 2013-08-29  Carl Hetherington  <cth@carlh.net>
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index ea175f1f4..35ebfb52e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -52,6 +52,7 @@ Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _film (f)
 	, _job (j)
 	, _video_frames_out (0)
+	, _state (TRANSCODING)
 	, _terminate (false)
 {
 	_have_a_real_frame[EYES_BOTH] = false;
@@ -125,6 +126,11 @@ Encoder::process_end ()
 		}
 	}
 
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		_state = HASHING;
+	}
+		
 	_writer->finish ();
 	_writer.reset ();
 }	
@@ -135,7 +141,7 @@ Encoder::process_end ()
 float
 Encoder::current_encoding_rate () const
 {
-	boost::mutex::scoped_lock lock (_history_mutex);
+	boost::mutex::scoped_lock lock (_state_mutex);
 	if (int (_time_history.size()) < _history_size) {
 		return 0;
 	}
@@ -150,7 +156,7 @@ Encoder::current_encoding_rate () const
 int
 Encoder::video_frames_out () const
 {
-	boost::mutex::scoped_lock (_history_mutex);
+	boost::mutex::scoped_lock (_state_mutex);
 	return _video_frames_out;
 }
 
@@ -160,7 +166,7 @@ Encoder::video_frames_out () const
 void
 Encoder::frame_done ()
 {
-	boost::mutex::scoped_lock lock (_history_mutex);
+	boost::mutex::scoped_lock lock (_state_mutex);
 	
 	struct timeval tv;
 	gettimeofday (&tv, 0);
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 44134e568..e9b30df9e 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -77,6 +77,16 @@ public:
 	float current_encoding_rate () const;
 	int video_frames_out () const;
 
+	enum State {
+		TRANSCODING,
+		HASHING
+	};
+
+	State state () const {
+		boost::mutex::scoped_lock lm (_state_mutex);
+		return _state;
+	}
+
 private:
 	
 	void frame_done ();
@@ -88,8 +98,8 @@ private:
 	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<Job> _job;
 
-	/** Mutex for _time_history and _last_frame */
-	mutable boost::mutex _history_mutex;
+	/** Mutex for _time_history, _last_frame and _state */
+	mutable boost::mutex _state_mutex;
 	/** List of the times of completion of the last _history_size frames;
 	    first is the most recently completed.
 	*/
@@ -99,6 +109,7 @@ private:
 
 	/** Number of video frames written for the DCP so far */
 	int _video_frames_out;
+	State _state;
 
 	bool _have_a_real_frame[EYES_COUNT];
 	bool _terminate;
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 6d5edd7c0..c9ec2053d 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -91,7 +91,12 @@ TranscodeJob::status () const
 	s << Job::status ();
 
 	if (!finished ()) {
-		s << N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
+		if (_transcoder->state() == Encoder::TRANSCODING) {
+			s << "; " << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
+		} else {
+			/* TRANSLATORS: this means `computing a hash' as in a digest of a block of data */
+			s << "; " << _("hashing");
+		}
 	}
 	
 	return s.str ();
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 715a158db..63ba77939 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -90,3 +90,9 @@ Transcoder::video_frames_out () const
 {
 	return _encoder->video_frames_out ();
 }
+
+Encoder::State
+Transcoder::state () const
+{
+	return _encoder->state ();
+}
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index 007065b65..7bf214a88 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -18,12 +18,7 @@
 */
 
 #include "types.h"
-
-/** @file  src/transcoder.h
- *
- *  A decoder is selected according to the content type, and the encoder can be specified
- *  as a parameter to the constructor.
- */
+#include "encoder.h"
 
 class Film;
 class Job;
@@ -31,11 +26,7 @@ class Encoder;
 class VideoFilter;
 class Player;
 
-/** @class Transcoder
- *
- *  A decoder is selected according to the content type, and the encoder can be specified
- *  as a parameter to the constructor.
- */
+/** @class Transcoder */
 class Transcoder : public boost::noncopyable
 {
 public:
@@ -47,6 +38,7 @@ public:
 	void go ();
 
 	float current_encoding_rate () const;
+	Encoder::State state () const;
 	int video_frames_out () const;
 
 private:
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 2e0ffd833..5f94d5d6b 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -110,6 +110,8 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
 	_sound_asset_writer = _sound_asset->start_write (_film->interop ());
 
 	_thread = new boost::thread (boost::bind (&Writer::thread, this));
+
+	_job->descend (0.9);
 }
 
 void
@@ -389,6 +391,18 @@ Writer::finish ()
 							 )
 			       ));
 
+	/* Compute the digests for the assets now so that we can keep track of progress.
+	   We did _job->descend (0.9) in our constructor */
+	_job->ascend ();
+
+	_job->descend (0.1);
+	_picture_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1));
+	_job->ascend ();
+
+	_job->descend (0.1);
+	_sound_asset->compute_digest (boost::bind (&Job::set_progress, _job.get(), _1));
+	_job->ascend ();
+
 	libdcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
 	meta.set_issue_date_now ();
 	dcp.write_xml (_film->interop (), meta);
-- 
cgit v1.2.3