Rename Encoder -> FilmEncoder, and subclasses.

31 files changed, 105 insertions, 89 deletions

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index d473476a0..ce471202f 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -32,6 +32,7 @@
 #include "image.h"
 #include "j2k_image_proxy.h"
 #include "text_decoder.h"
+#include "util.h"
 #include "video_decoder.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_film_encoder.cc
index bd78312fa..0403b2d90 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_film_encoder.cc
@@ -19,7 +19,7 @@
 */
 
 
-/** @file  src/dcp_encoder.cc
+/** @file  src/dcp_film_encoder.cc
  *  @brief A class which takes a Film and some Options, then uses those to encode the film into a DCP.
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
@@ -29,7 +29,7 @@
 
 #include "audio_decoder.h"
 #include "compose.hpp"
-#include "dcp_encoder.h"
+#include "dcp_film_encoder.h"
 #include "film.h"
 #include "j2k_encoder.h"
 #include "job.h"
@@ -64,17 +64,17 @@ using namespace dcpomatic;
  *  @param film Film that we are encoding.
  *  @param job Job that this encoder is being used in.
  */
-DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
-	: Encoder (film, job)
+DCPFilmEncoder::DCPFilmEncoder(shared_ptr<const Film> film, weak_ptr<Job> job)
+	: FilmEncoder(film, job)
 	, _writer(film, job)
 	, _j2k_encoder(film, _writer)
 	, _finishing (false)
 	, _non_burnt_subtitles (false)
 {
-	_player_video_connection = _player.Video.connect(bind(&DCPEncoder::video, this, _1, _2));
-	_player_audio_connection = _player.Audio.connect(bind(&DCPEncoder::audio, this, _1, _2));
-	_player_text_connection = _player.Text.connect(bind(&DCPEncoder::text, this, _1, _2, _3, _4));
-	_player_atmos_connection = _player.Atmos.connect(bind(&DCPEncoder::atmos, this, _1, _2, _3));
+	_player_video_connection = _player.Video.connect(bind(&DCPFilmEncoder::video, this, _1, _2));
+	_player_audio_connection = _player.Audio.connect(bind(&DCPFilmEncoder::audio, this, _1, _2));
+	_player_text_connection = _player.Text.connect(bind(&DCPFilmEncoder::text, this, _1, _2, _3, _4));
+	_player_atmos_connection = _player.Atmos.connect(bind(&DCPFilmEncoder::atmos, this, _1, _2, _3));
 
 	for (auto c: film->content ()) {
 		for (auto i: c->text) {
@@ -85,7 +85,7 @@ DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 	}
 }
 
-DCPEncoder::~DCPEncoder ()
+DCPFilmEncoder::~DCPFilmEncoder()
 {
 	/* We must stop receiving more video data before we die */
 	_player_video_connection.release ();
@@ -95,7 +95,7 @@ DCPEncoder::~DCPEncoder ()
 }
 
 void
-DCPEncoder::go ()
+DCPFilmEncoder::go()
 {
 	_writer.start();
 	_j2k_encoder.begin();
@@ -123,26 +123,26 @@ DCPEncoder::go ()
 
 
 void
-DCPEncoder::pause()
+DCPFilmEncoder::pause()
 {
 	_j2k_encoder.pause();
 }
 
 
 void
-DCPEncoder::resume()
+DCPFilmEncoder::resume()
 {
 	_j2k_encoder.resume();
 }
 
 void
-DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
+DCPFilmEncoder::video(shared_ptr<PlayerVideo> data, DCPTime time)
 {
 	_j2k_encoder.encode(data, time);
 }
 
 void
-DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
+DCPFilmEncoder::audio(shared_ptr<AudioBuffers> data, DCPTime time)
 {
 	_writer.write(data, time);
 
@@ -152,7 +152,7 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 }
 
 void
-DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
+DCPFilmEncoder::text(PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
 	if (type == TextType::CLOSED_CAPTION || _non_burnt_subtitles) {
 		_writer.write(data, type, track, period);
@@ -161,20 +161,20 @@ DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track,
 
 
 void
-DCPEncoder::atmos (shared_ptr<const dcp::AtmosFrame> data, DCPTime time, AtmosMetadata metadata)
+DCPFilmEncoder::atmos(shared_ptr<const dcp::AtmosFrame> data, DCPTime time, AtmosMetadata metadata)
 {
 	_writer.write(data, time, metadata);
 }
 
 
 optional<float>
-DCPEncoder::current_rate () const
+DCPFilmEncoder::current_rate() const
 {
 	return _j2k_encoder.current_encoding_rate();
 }
 
 Frame
-DCPEncoder::frames_done () const
+DCPFilmEncoder::frames_done() const
 {
 	return _j2k_encoder.video_frames_enqueued();
 }
diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_film_encoder.h
index ce0b72204..fbc0aeb13 100644
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_film_encoder.h
@@ -22,7 +22,7 @@
 #include "atmos_metadata.h"
 #include "dcp_text_track.h"
 #include "dcpomatic_time.h"
-#include "encoder.h"
+#include "film_encoder.h"
 #include "player_text.h"
 #include "j2k_encoder.h"
 #include "writer.h"
@@ -38,12 +38,12 @@ class PlayerVideo;
 struct frames_not_lost_when_threads_disappear;
 
 
-/** @class DCPEncoder */
-class DCPEncoder : public Encoder
+/** @class DCPFilmEncoder */
+class DCPFilmEncoder : public FilmEncoder
 {
 public:
-	DCPEncoder (std::shared_ptr<const Film> film, std::weak_ptr<Job> job);
-	~DCPEncoder ();
+	DCPFilmEncoder(std::shared_ptr<const Film> film, std::weak_ptr<Job> job);
+	~DCPFilmEncoder();
 
 	void go () override;
 
diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index da5c7270e..68ee871f8 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -37,6 +37,7 @@
 #include "image.h"
 #include "log.h"
 #include "player_video.h"
+#include "util.h"
 #include "variant.h"
 #include "version.h"
 #include <dcp/raw_convert.h>
diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 9ce9e1691..143569e16 100644
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -26,6 +26,7 @@
 #include "encode_server_description.h"
 #include "encode_server_finder.h"
 #include "exceptions.h"
+#include "util.h"
 #include "variant.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index d7833265d..4547a8e8e 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -21,7 +21,7 @@
 
 #include "compose.hpp"
 #include "cross.h"
-#include "ffmpeg_encoder.h"
+#include "ffmpeg_file_encoder.h"
 #include "ffmpeg_wrapper.h"
 #include "film.h"
 #include "image.h"
diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index 78840d6a8..907eca53d 100644
--- a/src/lib/ffmpeg_file_encoder.h
+++ b/src/lib/ffmpeg_file_encoder.h
@@ -23,12 +23,14 @@
 #define DCPOMATIC_FFMPEG_FILE_ENCODER_H
 
 
+#include "audio_buffers.h"
 #include "audio_mapping.h"
 #include "dcpomatic_time.h"
-#include "encoder.h"
 #include "event_history.h"
 #include "image_store.h"
 #include "log.h"
+#include "player_text.h"
+#include "player_video.h"
 #include <dcp/key.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_film_encoder.cc
index 60241b233..2d100f7bc 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_film_encoder.cc
@@ -21,7 +21,7 @@
 
 #include "butler.h"
 #include "cross.h"
-#include "ffmpeg_encoder.h"
+#include "ffmpeg_film_encoder.h"
 #include "film.h"
 #include "image.h"
 #include "job.h"
@@ -48,7 +48,7 @@ using namespace boost::placeholders;
 #endif
 
 
-FFmpegEncoder::FFmpegEncoder (
+FFmpegFilmEncoder::FFmpegFilmEncoder(
 	shared_ptr<const Film> film,
 	weak_ptr<Job> job,
 	boost::filesystem::path output,
@@ -58,7 +58,7 @@ FFmpegEncoder::FFmpegEncoder (
 	bool audio_stream_per_channel,
 	int x264_crf
 	)
-	: Encoder (film, job)
+	: FilmEncoder(film, job)
 	, _output_audio_channels(mixdown_to_stereo ? 2 : (_film->audio_channels() > 8 ? 16 : _film->audio_channels()))
 	, _history (200)
 	, _output (output)
@@ -85,7 +85,7 @@ FFmpegEncoder::FFmpegEncoder (
 
 
 AudioMapping
-FFmpegEncoder::stereo_map() const
+FFmpegFilmEncoder::stereo_map() const
 {
 	auto map = AudioMapping(_film->audio_channels(), 2);
 	float const overall_gain = 2 / (4 + sqrt(2));
@@ -117,7 +117,7 @@ FFmpegEncoder::stereo_map() const
 
 
 AudioMapping
-FFmpegEncoder::many_channel_map() const
+FFmpegFilmEncoder::many_channel_map() const
 {
 	auto map = AudioMapping(_film->audio_channels(), _output_audio_channels);
 	for (int i = 0; i < _film->audio_channels(); ++i) {
@@ -128,7 +128,7 @@ FFmpegEncoder::many_channel_map() const
 
 
 void
-FFmpegEncoder::go ()
+FFmpegFilmEncoder::go()
 {
 	{
 		auto job = _job.lock ();
@@ -235,19 +235,19 @@ FFmpegEncoder::go ()
 }
 
 optional<float>
-FFmpegEncoder::current_rate () const
+FFmpegFilmEncoder::current_rate() const
 {
 	return _history.rate ();
 }
 
 Frame
-FFmpegEncoder::frames_done () const
+FFmpegFilmEncoder::frames_done() const
 {
 	boost::mutex::scoped_lock lm (_mutex);
 	return _last_time.frames_round (_film->video_frame_rate ());
 }
 
-FFmpegEncoder::FileEncoderSet::FileEncoderSet (
+FFmpegFilmEncoder::FileEncoderSet::FileEncoderSet(
 	dcp::Size video_frame_size,
 	int video_frame_rate,
 	int audio_frame_rate,
@@ -280,7 +280,7 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet (
 }
 
 shared_ptr<FFmpegFileEncoder>
-FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
+FFmpegFilmEncoder::FileEncoderSet::get(Eyes eyes) const
 {
 	if (_encoders.size() == 1) {
 		/* We are doing a 2D export... */
@@ -299,7 +299,7 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
 }
 
 void
-FFmpegEncoder::FileEncoderSet::flush ()
+FFmpegFilmEncoder::FileEncoderSet::flush()
 {
 	for (auto& i: _encoders) {
 		i.second->flush ();
@@ -307,7 +307,7 @@ FFmpegEncoder::FileEncoderSet::flush ()
 }
 
 void
-FFmpegEncoder::FileEncoderSet::audio (shared_ptr<AudioBuffers> a)
+FFmpegFilmEncoder::FileEncoderSet::audio(shared_ptr<AudioBuffers> a)
 {
 	for (auto& i: _encoders) {
 		i.second->audio (a);
diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_film_encoder.h
index 2d5c6af87..ec6bb4594 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_film_encoder.h
@@ -23,15 +23,15 @@
 
 #include "audio_mapping.h"
 #include "butler.h"
-#include "encoder.h"
 #include "event_history.h"
 #include "ffmpeg_file_encoder.h"
+#include "film_encoder.h"
 
 
-class FFmpegEncoder : public Encoder
+class FFmpegFilmEncoder : public FilmEncoder
 {
 public:
-	FFmpegEncoder (
+	FFmpegFilmEncoder(
 		std::shared_ptr<const Film> film,
 		std::weak_ptr<Job> job,
 		boost::filesystem::path output,
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 540d0b9b9..fd703a72a 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -36,7 +36,7 @@
 #include "cross.h"
 #include "dcp_content.h"
 #include "dcp_content_type.h"
-#include "dcp_encoder.h"
+#include "dcp_film_encoder.h"
 #include "dcpomatic_log.h"
 #include "digester.h"
 #include "environment_info.h"
diff --git a/src/lib/encoder.cc b/src/lib/film_encoder.cc
index 5268d8620..05b911daf 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/film_encoder.cc
@@ -19,7 +19,7 @@
 */
 
 
-/** @file  src/encoder.cc
+/** @file  src/film_encoder.cc
  *  @brief A class which takes a Film and some Options, then uses those to encode the film
  *  into some output format.
  *
@@ -28,17 +28,17 @@
  */
 
 
-#include "encoder.h"
+#include "film_encoder.h"
 #include "player.h"
 
 #include "i18n.h"
 
 
-/** Construct an encoder.
+/** Construct a FilmEncoder.
  *  @param film Film that we are encoding.
  *  @param job Job that this encoder is being used in.
  */
-Encoder::Encoder (std::shared_ptr<const Film> film, std::weak_ptr<Job> job)
+FilmEncoder::FilmEncoder(std::shared_ptr<const Film> film, std::weak_ptr<Job> job)
 	: _film (film)
 	, _job (job)
 	, _player(film, Image::Alignment::PADDED)
diff --git a/src/lib/encoder.h b/src/lib/film_encoder.h
index aeaf7f620..ed7626c68 100644
--- a/src/lib/encoder.h
+++ b/src/lib/film_encoder.h
@@ -19,8 +19,8 @@
 */
 
 
-#ifndef DCPOMATIC_ENCODER_H
-#define DCPOMATIC_ENCODER_H
+#ifndef DCPOMATIC_FILM_ENCODER_H
+#define DCPOMATIC_FILM_ENCODER_H
 
 
 #include "player.h"
@@ -29,24 +29,23 @@
 
 
 class Film;
-class Encoder;
 class Player;
 class Job;
 class PlayerVideo;
 class AudioBuffers;
 
 
-/** @class Encoder
+/** @class FilmEncoder
  *  @brief Parent class for something that can encode a film into some format
  */
-class Encoder
+class FilmEncoder
 {
 public:
-	Encoder (std::shared_ptr<const Film> film, std::weak_ptr<Job> job);
-	virtual ~Encoder () {}
+	FilmEncoder(std::shared_ptr<const Film> film, std::weak_ptr<Job> job);
+	virtual ~FilmEncoder() {}
 
-	Encoder (Encoder const&) = delete;
-	Encoder& operator= (Encoder const&) = delete;
+	FilmEncoder(FilmEncoder const&) = delete;
+	FilmEncoder& operator=(FilmEncoder const&) = delete;
 
 	virtual void go () = 0;
 
diff --git a/src/lib/hints.h b/src/lib/hints.h
index 0d65edc21..e7a6646ef 100644
--- a/src/lib/hints.h
+++ b/src/lib/hints.h
@@ -20,15 +20,16 @@
 
 
 #include "audio_analyser.h"
-#include "signaller.h"
-#include "player_text.h"
 #include "dcp_text_track.h"
 #include "dcpomatic_time.h"
+#include "player_text.h"
+#include "signaller.h"
+#include "text_type.h"
 #include "weak_film.h"
-#include <boost/signals2.hpp>
 #include <boost/atomic.hpp>
-#include <vector>
+#include <boost/signals2.hpp>
 #include <string>
+#include <vector>
 
 
 class Film;
diff --git a/src/lib/make_dcp.cc b/src/lib/make_dcp.cc
index ddd231243..41c5e8ec5 100644
--- a/src/lib/make_dcp.cc
+++ b/src/lib/make_dcp.cc
@@ -21,7 +21,7 @@
 
 #include "config.h"
 #include "dcp_content.h"
-#include "dcp_encoder.h"
+#include "dcp_film_encoder.h"
 #include "dcp_transcode_job.h"
 #include "dcpomatic_log.h"
 #include "environment_info.h"
@@ -94,7 +94,7 @@ make_dcp (shared_ptr<Film> film, TranscodeJob::ChangedBehaviour behaviour)
 	LOG_GENERAL ("J2K bandwidth %1", film->j2k_bandwidth());
 
 	auto tj = make_shared<DCPTranscodeJob>(film, behaviour);
-	tj->set_encoder (make_shared<DCPEncoder>(film, tj));
+	tj->set_encoder(make_shared<DCPFilmEncoder>(film, tj));
 	JobManager::instance()->add (tj);
 
 	return tj;
diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 0886482a8..6f47c6740 100644
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -27,6 +27,7 @@
 #include "player_text.h"
 #include "referenced_reel_asset.h"
 #include "render_text.h"
+#include "text_type.h"
 #include "weak_film.h"
 #include <dcp/atmos_asset_writer.h>
 #include <dcp/file.h>
diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_film_encoder.cc
index 8b1d9a15b..93ccc177b 100644
--- a/src/lib/subtitle_encoder.cc
+++ b/src/lib/subtitle_film_encoder.cc
@@ -23,7 +23,7 @@
 #include "film.h"
 #include "job.h"
 #include "player.h"
-#include "subtitle_encoder.h"
+#include "subtitle_film_encoder.h"
 #include <dcp/filesystem.h>
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/raw_convert.h>
@@ -51,8 +51,8 @@ using dcp::raw_convert;
  *  @param initial_name Hint that may be used to create filenames, if @ref output is a directory.
  *  @param include_font true to refer to and export any font file (for Interop; ignored for SMPTE).
  */
-SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> job, boost::filesystem::path output, string initial_name, bool split_reels, bool include_font)
-	: Encoder (film, job)
+SubtitleFilmEncoder::SubtitleFilmEncoder(shared_ptr<const Film> film, shared_ptr<Job> job, boost::filesystem::path output, string initial_name, bool split_reels, bool include_font)
+	: FilmEncoder(film, job)
 	, _split_reels (split_reels)
 	, _include_font (include_font)
 	, _reel_index (0)
@@ -61,7 +61,7 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> j
 	_player.set_play_referenced();
 	_player.set_ignore_video();
 	_player.set_ignore_audio();
-	_player.Text.connect(boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4));
+	_player.Text.connect(boost::bind(&SubtitleFilmEncoder::text, this, _1, _2, _3, _4));
 
 	string const extension = film->interop() ? ".xml" : ".mxf";
 
@@ -91,7 +91,7 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> j
 
 
 void
-SubtitleEncoder::go ()
+SubtitleFilmEncoder::go()
 {
 	{
 		shared_ptr<Job> job = _job.lock ();
@@ -133,7 +133,7 @@ SubtitleEncoder::go ()
 
 
 void
-SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period)
+SubtitleFilmEncoder::text(PlayerText subs, TextType type, optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period)
 {
 	if (type != TextType::OPEN_SUBTITLE) {
 		return;
@@ -193,7 +193,7 @@ SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> tr
 
 
 Frame
-SubtitleEncoder::frames_done () const
+SubtitleFilmEncoder::frames_done() const
 {
 	if (!_last) {
 		return 0;
diff --git a/src/lib/subtitle_encoder.h b/src/lib/subtitle_film_encoder.h
index 0815b1fff..54231794d 100644
--- a/src/lib/subtitle_encoder.h
+++ b/src/lib/subtitle_film_encoder.h
@@ -21,7 +21,7 @@
 
 #include "dcp_text_track.h"
 #include "dcpomatic_time.h"
-#include "encoder.h"
+#include "film_encoder.h"
 #include "player_text.h"
 
 
@@ -33,13 +33,13 @@ namespace dcp {
 class Film;
 
 
-/** @class SubtitleEncoder.
+/** @class SubtitleFilmEncoder.
  *  @brief An `encoder' which extracts a film's subtitles to DCP XML format.
  */
-class SubtitleEncoder : public Encoder
+class SubtitleFilmEncoder : public FilmEncoder
 {
 public:
-	SubtitleEncoder (std::shared_ptr<const Film> film, std::shared_ptr<Job> job, boost::filesystem::path output, std::string initial_name, bool split_reels, bool include_font);
+	SubtitleFilmEncoder(std::shared_ptr<const Film> film, std::shared_ptr<Job> job, boost::filesystem::path output, std::string initial_name, bool split_reels, bool include_font);
 
 	void go () override;
 
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index ba420ab94..98c6784a9 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -28,11 +28,11 @@
 #include "compose.hpp"
 #include "content.h"
 #include "config.h"
-#include "dcp_encoder.h"
+#include "dcp_film_encoder.h"
 #include "dcpomatic_log.h"
-#include "encoder.h"
 #include "examine_content_job.h"
 #include "film.h"
+#include "film_encoder.h"
 #include "job_manager.h"
 #include "log.h"
 #include "transcode_job.h"
@@ -84,7 +84,7 @@ TranscodeJob::json_name () const
 
 
 void
-TranscodeJob::set_encoder (shared_ptr<Encoder> e)
+TranscodeJob::set_encoder(shared_ptr<FilmEncoder> e)
 {
 	_encoder = e;
 }
@@ -133,7 +133,7 @@ TranscodeJob::run ()
 
 		LOG_GENERAL(N_("Transcode job completed successfully: %1 fps"), dcp::locale_convert<string>(frames_per_second(), 2, true));
 
-		if (dynamic_pointer_cast<DCPEncoder>(_encoder)) {
+		if (dynamic_pointer_cast<DCPFilmEncoder>(_encoder)) {
 			try {
 				Analytics::instance()->successful_dcp_encode();
 			} catch (FileError& e) {
diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index 35870231d..720d7f99b 100644
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -35,7 +35,7 @@
 #undef IGNORE
 
 
-class Encoder;
+class FilmEncoder;
 
 struct frames_not_lost_when_threads_disappear;
 
@@ -65,7 +65,7 @@ public:
 		return true;
 	}
 
-	void set_encoder (std::shared_ptr<Encoder> t);
+	void set_encoder(std::shared_ptr<FilmEncoder> encoder);
 
 private:
 	friend struct ::frames_not_lost_when_threads_disappear;
@@ -75,7 +75,7 @@ private:
 
 	int remaining_time () const override;
 
-	std::shared_ptr<Encoder> _encoder;
+	std::shared_ptr<FilmEncoder> _encoder;
 	ChangedBehaviour _changed;
 };
 
diff --git a/src/lib/wscript b/src/lib/wscript
index 4eeeb578e..5e49b1fbf 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -68,9 +68,9 @@ sources = """
           dcp_content.cc
           dcp_content_type.cc
           dcp_decoder.cc
-          dcp_encoder.cc
           dcp_examiner.cc
           dcp_digest_file.cc
+          dcp_film_encoder.cc
           dcp_subtitle.cc
           dcp_subtitle_content.cc
           dcp_subtitle_decoder.cc
@@ -89,7 +89,6 @@ sources = """
           dolby_cp750.cc
           email.cc
           empty.cc
-          encoder.cc
           encode_server.cc
           encode_server_finder.cc
           encoded_log_entry.cc
@@ -107,14 +106,15 @@ sources = """
           ffmpeg_audio_stream.cc
           ffmpeg_content.cc
           ffmpeg_decoder.cc
-          ffmpeg_encoder.cc
           ffmpeg_examiner.cc
           ffmpeg_file_encoder.cc
+          ffmpeg_film_encoder.cc
           ffmpeg_image_proxy.cc
           ffmpeg_stream.cc
           ffmpeg_subtitle_stream.cc
           ffmpeg_wrapper.cc
           film.cc
+          film_encoder.cc
           film_util.cc
           filter.cc
           font.cc
@@ -187,7 +187,7 @@ sources = """
           string_text_file_content.cc
           string_text_file_decoder.cc
           subtitle_analysis.cc
-          subtitle_encoder.cc
+          subtitle_film_encoder.cc
           territory_type.cc
           text_ring_buffers.cc
           text_type.cc
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 5f723ba0f..de4ddebc2 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -76,7 +76,7 @@
 #include "lib/email.h"
 #include "lib/encode_server_finder.h"
 #include "lib/exceptions.h"
-#include "lib/ffmpeg_encoder.h"
+#include "lib/ffmpeg_film_encoder.h"
 #include "lib/film.h"
 #include "lib/font_config.h"
 #ifdef DCPOMATIC_GROK
@@ -91,7 +91,7 @@
 #include "lib/screen.h"
 #include "lib/send_kdm_email_job.h"
 #include "lib/signal_manager.h"
-#include "lib/subtitle_encoder.h"
+#include "lib/subtitle_film_encoder.h"
 #include "lib/text_content.h"
 #include "lib/transcode_job.h"
 #include "lib/update_checker.h"
@@ -1029,7 +1029,7 @@ private:
 
 		auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 		job->set_encoder (
-			make_shared<FFmpegEncoder> (
+			make_shared<FFmpegFilmEncoder>(
 				_film, job, dialog.path(), dialog.format(), dialog.mixdown_to_stereo(), dialog.split_reels(), dialog.split_streams(), dialog.x264_crf())
 			);
 		JobManager::instance()->add (job);
@@ -1044,7 +1044,7 @@ private:
 		}
 		auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 		job->set_encoder(
-			make_shared<SubtitleEncoder>(_film, job, dialog.path(), _film->isdcf_name(true), dialog.split_reels(), dialog.include_font())
+			make_shared<SubtitleFilmEncoder>(_film, job, dialog.path(), _film->isdcf_name(true), dialog.split_reels(), dialog.include_font())
 			);
 		JobManager::instance()->add(job);
 	}
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index c087f89e7..9eec498f9 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -25,7 +25,7 @@
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/encode_server_finder.h"
-#include "lib/ffmpeg_encoder.h"
+#include "lib/ffmpeg_film_encoder.h"
 #include "lib/film.h"
 #include "lib/filter.h"
 #ifdef DCPOMATIC_GROK
@@ -519,7 +519,7 @@ main (int argc, char* argv[])
 	if (export_format) {
 		auto job = std::make_shared<TranscodeJob>(film, behaviour);
 		job->set_encoder (
-			std::make_shared<FFmpegEncoder> (
+			std::make_shared<FFmpegFilmEncoder>(
 				film, job, *export_filename, *export_format == "mp4" ? ExportFormat::H264_AAC : ExportFormat::PRORES_HQ, false, false, false, 23
 				)
 			);
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 6588b23b4..a28e063e5 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -30,6 +30,7 @@
 #include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/job_manager.h"
+#include "lib/util.h"
 #include <dcp/combine.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc
index e1f541fe8..fc04ce017 100644
--- a/src/tools/dcpomatic_editor.cc
+++ b/src/tools/dcpomatic_editor.cc
@@ -29,6 +29,7 @@
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/null_log.h"
+#include "lib/util.h"
 #include "lib/variant.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index d6c8b3945..1eda05162 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -53,6 +53,7 @@
 #include "lib/kdm_with_metadata.h"
 #include "lib/screen.h"
 #include "lib/send_kdm_email_job.h"
+#include "lib/util.h"
 #include "lib/variant.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 04bb26c2e..05c3f281c 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -27,6 +27,7 @@
 #include "static_text.h"
 #include "wx_variant.h"
 #include "lib/constants.h"
+#include "lib/util.h"
 #include <dcp/file.h>
 #include <dcp/filesystem.h>
 #include <dcp/raw_convert.h>
diff --git a/src/wx/dcp_timeline.h b/src/wx/dcp_timeline.h
index 3413c2814..23644c03f 100644
--- a/src/wx/dcp_timeline.h
+++ b/src/wx/dcp_timeline.h
@@ -25,6 +25,8 @@
 
 #include "timecode.h"
 #include "timeline.h"
+#include "lib/change_signaller.h"
+#include "lib/film_property.h"
 #include "lib/rect.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/src/wx/export_video_file_dialog.h b/src/wx/export_video_file_dialog.h
index beb33610b..4e626be6b 100644
--- a/src/wx/export_video_file_dialog.h
+++ b/src/wx/export_video_file_dialog.h
@@ -20,7 +20,7 @@
 
 
 #include "table_dialog.h"
-#include "lib/ffmpeg_encoder.h"
+#include "lib/ffmpeg_file_encoder.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 5824f8baa..63aa113d1 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -25,8 +25,10 @@
 
 
 #include "video_view.h"
+#include "lib/change_signaller.h"
 #include "lib/config.h"
 #include "lib/film_property.h"
+#include "lib/player.h"
 #include "lib/player_text.h"
 #include "lib/signaller.h"
 #include "lib/timer.h"
diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index 4e1eb8f34..523d0c369 100644
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -23,6 +23,7 @@
 #include "kdm_cpl_panel.h"
 #include "static_text.h"
 #include "wx_util.h"
+#include <dcp/filesystem.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index cb0d10240..69a675c42 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -23,6 +23,7 @@
 #include "timeline_content_view.h"
 #include "wx_util.h"
 #include "lib/content.h"
+#include "lib/util.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>