Remove swaroop variant.

11 files changed, 1 insertions, 1016 deletions

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 957fd32db..2319754f0 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1077,19 +1077,9 @@ LocationsPage::setup ()
 	table->Add (_kdm_directory, wxGBPosition (r, 1));
 	++r;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	add_label_to_sizer (table, _panel, _("Background image"), true, wxGBPosition (r, 0));
-	_background_image = new FilePickerCtrl (_panel, _("Select image file"), "*.png;*.jpg;*.jpeg;*.tif;*.tiff", true, false);
-	table->Add (_background_image, wxGBPosition (r, 1));
-	++r;
-#endif
-
 	_content_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::content_directory_changed, this));
 	_playlist_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::playlist_directory_changed, this));
 	_kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::kdm_directory_changed, this));
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	_background_image->Bind (wxEVT_FILEPICKER_CHANGED, bind(&LocationsPage::background_image_changed, this));
-#endif
 }
 
 void
@@ -1106,11 +1096,6 @@ LocationsPage::config_changed ()
 	if (config->player_kdm_directory()) {
 		checked_set (_kdm_directory, *config->player_kdm_directory());
 	}
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	if (config->player_background_image()) {
-		checked_set (_background_image, *config->player_background_image());
-	}
-#endif
 }
 
 void
@@ -1130,20 +1115,3 @@ LocationsPage::kdm_directory_changed ()
 {
 	Config::instance()->set_player_kdm_directory(wx_to_std(_kdm_directory->GetPath()));
 }
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-void
-LocationsPage::background_image_changed ()
-{
-	boost::filesystem::path const f = wx_to_std(_background_image->GetPath());
-	if (!boost::filesystem::is_regular_file(f) || !wxImage::CanRead(std_to_wx(f.string()))) {
-		error_dialog (0, _("Could not load image file."));
-		if (Config::instance()->player_background_image()) {
-			checked_set (_background_image, *Config::instance()->player_background_image());
-		}
-		return;
-	}
-
-	Config::instance()->set_player_background_image(f);
-}
-#endif
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index afbe9ed2e..a698b252a 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -232,15 +232,8 @@ private:
 	void playlist_directory_changed ();
 	void kdm_directory_changed ();
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	void background_image_changed ();
-#endif
-
 	wxDirPickerCtrl* _content_directory;
 	wxDirPickerCtrl* _playlist_directory;
 	wxDirPickerCtrl* _kdm_directory;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	FilePickerCtrl* _background_image;
-#endif
 };
 #endif
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 9561c32b5..ee0322d6f 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -93,9 +93,6 @@ FilmViewer::FilmViewer (wxWindow* p)
 	, _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
 	, _outline_content (false)
 	, _pad_black (false)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	, _background_image (false)
-#endif
 	, _idle_get (false)
 {
 	switch (Config::instance()->video_view_type()) {
@@ -507,13 +504,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
 void
 FilmViewer::config_changed (Config::Property p)
 {
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	if (p == Config::PLAYER_BACKGROUND_IMAGE) {
-		_video_view->update ();
-		return;
-	}
-#endif
-
 	if (p == Config::AUDIO_MAPPING) {
 		recreate_butler ();
 		return;
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index a0edafe95..15d6bfaf5 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -105,17 +105,6 @@ public:
 
 	int audio_callback (void* out, unsigned int frames);
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	void set_background_image (bool b) {
-		_background_image = b;
-		_video_view->update ();
-	}
-
-	bool background_image () const {
-		return _background_image;
-	}
-#endif
-
 	StateTimer const & state_timer () const {
 		return _video_view->state_timer ();
 	}
@@ -206,10 +195,6 @@ private:
 	*/
 	bool _pad_black;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	bool _background_image;
-#endif
-
 	/** true if an get() is required next time we are idle */
 	bool _idle_get;
 
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index a68376530..7af429326 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -133,28 +133,12 @@ private:
 		table->Add (_debug_log_file, wxGBPosition(r, 1));
 		++r;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		add_label_to_sizer (table, _panel, _("KDM server URL"), true, wxGBPosition(r, 0));
-		_kdm_server_url = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(400, -1));
-		table->Add (_kdm_server_url, wxGBPosition (r, 1));
-		++r;
-
-		add_label_to_sizer (table, _panel, _("Lock file"), true, wxGBPosition(r, 0));
-		_lock_file = new FilePickerCtrl (_panel, _("Select lock file"), "*", true, true);
-		table->Add (_lock_file, wxGBPosition (r, 1));
-		++r;
-#endif
-
 		_player_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::player_mode_changed, this));
 		_image_display->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::image_display_changed, this));
 		_video_display_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::video_display_mode_changed, this));
 		_respect_kdm->Bind (wxEVT_CHECKBOX, bind(&PlayerGeneralPage::respect_kdm_changed, this));
 		_activity_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::activity_log_file_changed, this));
 		_debug_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::debug_log_file_changed, this));
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		_kdm_server_url->Bind (wxEVT_TEXT, bind(&PlayerGeneralPage::kdm_server_url_changed, this));
-		_lock_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::lock_file_changed, this));
-#endif
 	}
 
 	void config_changed ()
@@ -192,12 +176,6 @@ private:
 		if (config->player_debug_log_file()) {
 			checked_set (_debug_log_file, *config->player_debug_log_file());
 		}
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		checked_set (_kdm_server_url, config->kdm_server_url());
-		if (config->player_lock_file()) {
-			checked_set (_lock_file, config->player_lock_file().get());
-		}
-#endif
 	}
 
 private:
@@ -245,28 +223,12 @@ private:
 		Config::instance()->set_player_debug_log_file(wx_to_std(_debug_log_file->GetPath()));
 	}
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	void kdm_server_url_changed ()
-	{
-		Config::instance()->set_kdm_server_url(wx_to_std(_kdm_server_url->GetValue()));
-	}
-
-	void lock_file_changed ()
-	{
-		Config::instance()->set_player_lock_file(wx_to_std(_lock_file->GetPath()));
-	}
-#endif
-
 	wxChoice* _player_mode;
 	wxChoice* _image_display;
 	wxChoice* _video_display_mode;
 	wxCheckBox* _respect_kdm;
 	FilePickerCtrl* _activity_log_file;
 	FilePickerCtrl* _debug_log_file;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	wxTextCtrl* _kdm_server_url;
-	FilePickerCtrl* _lock_file;
-#endif
 };
 
 
@@ -392,169 +354,6 @@ private:
 };
 
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-class WatermarkPage : public StandardPage
-{
-public:
-	WatermarkPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
-	{}
-
-	wxString GetName () const
-	{
-		return _("Watermark");
-	}
-
-#ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
-	{
-		/* XXX: this icon doesn't exist; this is just to make the swaroop variant build on OS X */
-		return wxBitmap ("watermark", wxBITMAP_TYPE_PNG_RESOURCE);
-	}
-#endif
-
-private:
-	void setup ()
-	{
-		wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-		_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
-
-		int r = 0;
-
-		add_label_to_sizer (table, _panel, _("Theatre name"), true, wxGBPosition(r, 0));
-		_theatre = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(300, -1));
-		table->Add (_theatre, wxGBPosition(r, 1), wxGBSpan(1, 2));
-		++r;
-
-		add_label_to_sizer (table, _panel, _("Period"), true, wxGBPosition(r, 0));
-		_period = new wxSpinCtrl (_panel, wxID_ANY);
-		_period->SetRange (1, 60);
-		table->Add (_period, wxGBPosition(r, 1));
-		add_label_to_sizer (table, _panel, _("minutes"), false, wxGBPosition(r, 2));
-		++r;
-
-		add_label_to_sizer (table, _panel, _("Duration"), true, wxGBPosition(r, 0));
-		_duration = new wxSpinCtrl (_panel, wxID_ANY);
-		_duration->SetRange (100, 5000);
-		table->Add (_duration, wxGBPosition(r, 1));
-		add_label_to_sizer (table, _panel, _("milliseconds"), false, wxGBPosition(r, 2));
-		++r;
-
-		_theatre->Bind (wxEVT_TEXT, bind(&WatermarkPage::theatre_changed, this));
-		_duration->Bind (wxEVT_SPINCTRL, bind(&WatermarkPage::duration_changed, this));
-		_period->Bind (wxEVT_SPINCTRL, bind(&WatermarkPage::period_changed, this));
-	}
-
-	void config_changed ()
-	{
-		Config* config = Config::instance ();
-		checked_set (_theatre, config->player_watermark_theatre());
-		checked_set (_duration, config->player_watermark_duration());
-		checked_set (_period, config->player_watermark_period());
-	}
-
-	void theatre_changed ()
-	{
-		Config::instance()->set_player_watermark_theatre(wx_to_std(_theatre->GetValue()));
-	}
-
-	void period_changed ()
-	{
-		Config::instance()->set_player_watermark_period(_period->GetValue());
-	}
-
-	void duration_changed ()
-	{
-		Config::instance()->set_player_watermark_duration(_duration->GetValue());
-	}
-
-	wxTextCtrl* _theatre;
-	wxSpinCtrl* _period;
-	wxSpinCtrl* _duration;
-};
-
-class DevicesPage : public StandardPage
-{
-public:
-	DevicesPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
-	{}
-
-	wxString GetName () const
-	{
-		return _("Devices");
-	}
-
-#ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
-	{
-		/* XXX: this icon doesn't exist; this is just to make the swaroop variant build on OS X */
-		return wxBitmap ("devices", wxBITMAP_TYPE_PNG_RESOURCE);
-	}
-#endif
-
-private:
-	void setup ()
-	{
-		vector<EditableListColumn> columns;
-		columns.push_back(EditableListColumn(_("Manufacturer ID")));
-		columns.push_back(EditableListColumn(_("Product code")));
-		columns.push_back(EditableListColumn(_("Serial")));
-		columns.push_back(EditableListColumn(_("Manufacture week")));
-		columns.push_back(EditableListColumn(_("Manufacture year")));
-		_monitor_list = new EditableList<Monitor, MonitorDialog> (
-			_panel,
-			columns,
-			boost::bind (&Config::required_monitors, Config::instance()),
-			boost::bind (&Config::set_required_monitors, Config::instance(), _1),
-			boost::bind (&DevicesPage::monitor_column, this, _1, _2),
-			true,
-			true
-			);
-		_panel->GetSizer()->Add(_monitor_list, 1, wxEXPAND | wxALL, _border);
-
-		wxButton* get = new Button(_panel, _("Read current devices"));
-		_panel->GetSizer()->Add(get, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
-		get->Bind(wxEVT_BUTTON, bind(&DevicesPage::get_clicked, this));
-	}
-
-	void get_clicked ()
-	{
-		Config::instance()->set_required_monitors(get_monitors());
-		_monitor_list->refresh ();
-	}
-
-	string monitor_column (Monitor m, int c)
-	{
-		switch (c) {
-		case 0:
-			return m.manufacturer_id;
-		case 1:
-			return locale_convert<string>(m.manufacturer_product_code);
-		case 2:
-			return locale_convert<string>(m.serial_number);
-		case 3:
-			return locale_convert<string>(m.week_of_manufacture);
-		case 4:
-			return locale_convert<string>(m.year_of_manufacture);
-		default:
-			DCPOMATIC_ASSERT(false);
-		}
-
-		return "";
-	}
-
-	void config_changed ()
-	{
-		_monitor_list->refresh ();
-	}
-
-private:
-	EditableList<Monitor, MonitorDialog>* _monitor_list;
-};
-
-#endif
-
 wxPreferencesEditor*
 create_player_config_dialog ()
 {
@@ -576,10 +375,6 @@ create_player_config_dialog ()
 	e->AddPage (new SoundPage(ps, border));
 	e->AddPage (new LocationsPage(ps, border));
 	e->AddPage (new KeysPage(ps, border));
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	e->AddPage (new WatermarkPage(ps, border));
-	e->AddPage (new DevicesPage(ps, border));
-#endif
 	e->AddPage (new PlayerAdvancedPage(ps, border));
 	return e;
 }
diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index dd1296ed6..117eee218 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -66,19 +66,6 @@ SimpleVideoView::paint ()
 	dcp::Size const out_size = _viewer->out_size ();
 	wxSize const panel_size = _panel->GetSize ();
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	if (_viewer->background_image()) {
-		dc.Clear ();
-		optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
-		if (bg) {
-			wxImage image (std_to_wx(bg->string()));
-			wxBitmap bitmap (image);
-			dc.DrawBitmap (bitmap, max(0, (panel_size.GetWidth() - image.GetSize().GetWidth()) / 2), max(0, (panel_size.GetHeight() - image.GetSize().GetHeight()) / 2));
-		}
-		return;
-	}
-#endif
-
 	if (!out_size.width || !out_size.height || !_image || out_size != _image->size()) {
 		dc.Clear ();
 	} else {
@@ -86,27 +73,6 @@ SimpleVideoView::paint ()
 		wxImage frame (out_size.width, out_size.height, _image->data()[0], true);
 		wxBitmap frame_bitmap (frame);
 		dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
-		int64_t n = position().get() / period.get();
-		DCPTime from(n * period.get());
-		DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
-		if (from <= position() && position() <= to) {
-			if (!_in_watermark) {
-				_in_watermark = true;
-				_watermark_x = rand() % panel_size.GetWidth();
-				_watermark_y = rand() % panel_size.GetHeight();
-			}
-			dc.SetTextForeground(*wxWHITE);
-			string wm = Config::instance()->player_watermark_theatre();
-			boost::posix_time::ptime t = boost::posix_time::second_clock::local_time();
-			wm += "\n" + boost::posix_time::to_iso_extended_string(t);
-			dc.DrawText(std_to_wx(wm), _watermark_x, _watermark_y);
-		} else {
-			_in_watermark = false;
-		}
-#endif
 	}
 
 	if (out_size.width < panel_size.GetWidth()) {
diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
deleted file mode 100644
index add9bf3e0..000000000
--- a/src/wx/swaroop_controls.cc
+++ /dev/null
@@ -1,610 +0,0 @@
-/*
-    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
-
-    This file is part of DCP-o-matic.
-
-    DCP-o-matic 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.
-
-    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "swaroop_controls.h"
-#include "film_viewer.h"
-#include "wx_util.h"
-#include "content_view.h"
-#include "dcpomatic_button.h"
-#include "static_text.h"
-#include "lib/player_video.h"
-#include "lib/dcp_content.h"
-#include "lib/cross.h"
-#include "lib/scoped_temporary.h"
-#include "lib/internet.h"
-#include "lib/ffmpeg_content.h"
-#include "lib/compose.hpp"
-#include <dcp/raw_convert.h>
-#include <dcp/exceptions.h>
-#include <wx/listctrl.h>
-#include <wx/progdlg.h>
-
-using std::string;
-using std::cout;
-using std::exception;
-using std::sort;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-using boost::optional;
-using namespace dcpomatic;
-
-SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewer)
-	: Controls (parent, viewer, false)
-	, _play_button (new Button(this, _("Play")))
-	, _pause_button (new Button(this, _("Pause")))
-	, _stop_button (new Button(this, _("Stop")))
-	, _next_button (new Button(this, "Next"))
-	, _previous_button (new Button(this, "Previous"))
-	, _current_disable_timeline (false)
-	, _current_disable_next (false)
-	, _timer (this)
-{
-	_button_sizer->Add (_previous_button, 0, wxEXPAND);
-	_button_sizer->Add (_play_button, 0, wxEXPAND);
-	_button_sizer->Add (_pause_button, 0, wxEXPAND);
-	_button_sizer->Add (_stop_button, 0, wxEXPAND);
-	_button_sizer->Add (_next_button, 0, wxEXPAND);
-
-	_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
-	_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740);
-
-	wxBoxSizer* left_sizer = new wxBoxSizer (wxVERTICAL);
-	wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL);
-
-	wxFont subheading_font (*wxNORMAL_FONT);
-	subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
-
-	wxBoxSizer* spl_header = new wxBoxSizer (wxHORIZONTAL);
-	{
-		wxStaticText* m = new StaticText (this, "Playlists");
-		m->SetFont (subheading_font);
-		spl_header->Add (m, 1, wxALIGN_CENTER_VERTICAL);
-	}
-	_refresh_spl_view = new Button (this, "Refresh");
-	spl_header->Add (_refresh_spl_view, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP / 2);
-
-	left_sizer->Add (spl_header, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_GAP);
-	left_sizer->Add (_spl_view, 1, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
-	_content_view = new ContentView (this);
-
-	wxBoxSizer* content_header = new wxBoxSizer (wxHORIZONTAL);
-	{
-		wxStaticText* m = new StaticText (this, "Content");
-		m->SetFont (subheading_font);
-		content_header->Add (m, 1, wxALIGN_CENTER_VERTICAL);
-	}
-	_refresh_content_view = new Button (this, "Refresh");
-	content_header->Add (_refresh_content_view, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP / 2);
-
-	left_sizer->Add (content_header, 0, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_GAP);
-	left_sizer->Add (_content_view, 1, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
-	_current_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
-	_current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 500);
-	_current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
-	e_sizer->Add (left_sizer, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-	e_sizer->Add (_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-
-	_v_sizer->Add (e_sizer, 1, wxEXPAND);
-
-	_play_button->Bind     (wxEVT_BUTTON, boost::bind(&SwaroopControls::play_clicked,  this));
-	_pause_button->Bind    (wxEVT_BUTTON, boost::bind(&SwaroopControls::pause_clicked, this));
-	_stop_button->Bind     (wxEVT_BUTTON, boost::bind(&SwaroopControls::stop_clicked,  this));
-	_next_button->Bind     (wxEVT_BUTTON, boost::bind(&SwaroopControls::next_clicked,  this));
-	_previous_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::previous_clicked,  this));
-	_spl_view->Bind        (wxEVT_LIST_ITEM_SELECTED,   boost::bind(&SwaroopControls::spl_selection_changed, this));
-	_spl_view->Bind        (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&SwaroopControls::spl_selection_changed, this));
-	_viewer->Finished.connect (boost::bind(&SwaroopControls::viewer_finished, this));
-	_refresh_spl_view->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::update_playlist_directory, this));
-	_refresh_content_view->Bind (wxEVT_BUTTON, boost::bind(&ContentView::update, _content_view));
-
-	/* Write position every two minutes if we're playing */
-	Bind (wxEVT_TIMER, boost::bind(&SwaroopControls::write_position, this));
-	_timer.Start (2 * 60 * 1000, wxTIMER_CONTINUOUS);
-
-	_content_view->update ();
-	update_playlist_directory ();
-
-	_viewer->set_background_image (true);
-}
-
-void
-SwaroopControls::check_restart ()
-{
-	cout << "check_restart called\n";
-	FILE* f = fopen_boost (Config::path("position"), "r");
-	if (!f) {
-		cout << "could not open position file (" << errno << ")\n";
-		return;
-	}
-
-	char id[64];
-	int index;
-	int64_t time;
-	fscanf (f, "%63s %d %ld", id, &index, &time);
-
-	cout << "Looking for playlist " << id << " to restart.\n";
-
-	for (size_t i = 0; i < _playlists.size(); ++i) {
-		if (_playlists[i].id() == id) {
-			cout << "Found playlist " << id << "\n";
-			select_playlist (i, index);
-			update_current_content ();
-			_viewer->seek (DCPTime(time), false);
-			_viewer->start ();
-		}
-	}
-
-	fclose (f);
-}
-
-void
-SwaroopControls::write_position ()
-{
-	if (!_selected_playlist || !_viewer->playing()) {
-		return;
-	}
-
-	FILE* f = fopen_boost (Config::path("position"), "w");
-	if (f) {
-		string const p = _playlists[*_selected_playlist].id()
-			+ " " + dcp::raw_convert<string>(_selected_playlist_position)
-			+ " " + dcp::raw_convert<string>(_viewer->position().get());
-
-		checked_fwrite (p.c_str(), p.length(), f, Config::path("position"));
-#ifdef DCPOMATIC_LINUX
-		fflush (f);
-		fsync (fileno(f));
-#endif
-		fclose (f);
-	}
-}
-
-void
-SwaroopControls::started ()
-{
-	Controls::started ();
-	_play_button->Enable (false);
-	_pause_button->Enable (true);
-	_viewer->set_background_image (false);
-}
-
-/** Called when the viewer finishes a single piece of content, or it is explicitly stopped */
-void
-SwaroopControls::stopped ()
-{
-	Controls::stopped ();
-	_play_button->Enable (true);
-	_pause_button->Enable (false);
-}
-
-void
-SwaroopControls::deselect_playlist ()
-{
-	long int const selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	if (selected != -1) {
-		_selected_playlist = boost::none;
-		_spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED);
-	}
-	ResetFilm (shared_ptr<Film>(new Film(optional<boost::filesystem::path>())));
-}
-
-void
-SwaroopControls::decrement_allowed_shows ()
-{
-	if (_selected_playlist) {
-		SPL& spl = _playlists[*_selected_playlist];
-		spl.decrement_allowed_shows();
-		if (spl.path()) {
-			spl.write (*spl.path());
-		}
-	}
-}
-
-void
-SwaroopControls::play_clicked ()
-{
-	_viewer->start ();
-}
-
-void
-SwaroopControls::setup_sensitivity ()
-{
-	Controls::setup_sensitivity ();
-	bool const active_job = _active_job && *_active_job != "examine_content";
-	bool const c = _film && !_film->content().empty() && !active_job;
-	_play_button->Enable (c && !_viewer->playing());
-	_pause_button->Enable (_viewer->playing());
-	_slider->Enable (!_current_disable_timeline);
-	_spl_view->Enable (!_viewer->playing());
-	_next_button->Enable (!_current_disable_next && can_do_next());
-	_previous_button->Enable (can_do_previous());
-}
-
-void
-SwaroopControls::pause_clicked ()
-{
-	_viewer->stop ();
-}
-
-void
-SwaroopControls::stop_clicked ()
-{
-	_viewer->stop ();
-	_viewer->seek (DCPTime(), true);
-	if (_selected_playlist) {
-		_selected_playlist_position = 0;
-		update_current_content ();
-	}
-	_viewer->set_background_image (true);
-	decrement_allowed_shows ();
-	deselect_playlist ();
-}
-
-bool
-SwaroopControls::can_do_previous ()
-{
-	return _selected_playlist && (_selected_playlist_position - 1) >= 0;
-}
-
-void
-SwaroopControls::previous_clicked ()
-{
-	if (!can_do_previous ()) {
-		return;
-	}
-
-	_selected_playlist_position--;
-	update_current_content ();
-}
-
-bool
-SwaroopControls::can_do_next ()
-{
-	return _selected_playlist && (_selected_playlist_position + 1) < int(_playlists[*_selected_playlist].get().size());
-}
-
-void
-SwaroopControls::next_clicked ()
-{
-	if (!can_do_next ()) {
-		return;
-	}
-
-	_selected_playlist_position++;
-	update_current_content ();
-}
-
-void
-SwaroopControls::log (wxString s)
-{
-	optional<boost::filesystem::path> log = Config::instance()->player_activity_log_file();
-	if (!log) {
-		return;
-	}
-
-	struct timeval time;
-	gettimeofday (&time, 0);
-	char buffer[64];
-	time_t const sec = time.tv_sec;
-	struct tm* t = localtime (&sec);
-	strftime (buffer, 64, "%c", t);
-	wxString ts = std_to_wx(string(buffer)) + N_(": ");
-	FILE* f = fopen_boost (*log, "a");
-	if (!f) {
-		return;
-	}
-	fprintf (f, "%s%s\n", wx_to_std(ts).c_str(), wx_to_std(s).c_str());
-	fclose (f);
-}
-
-void
-SwaroopControls::add_playlist_to_list (SPL spl)
-{
-	int const N = _spl_view->GetItemCount();
-
-	wxListItem it;
-	it.SetId(N);
-	it.SetColumn(0);
-	string t = spl.name();
-	if (spl.missing()) {
-		t += " (content missing)";
-	}
-	it.SetText (std_to_wx(t));
-	_spl_view->InsertItem (it);
-}
-
-struct SPLComparator
-{
-	bool operator() (SPL const & a, SPL const & b) {
-		return a.name() < b.name();
-	}
-};
-
-void
-SwaroopControls::update_playlist_directory ()
-{
-	using namespace boost::filesystem;
-
-	_spl_view->DeleteAllItems ();
-	optional<path> dir = Config::instance()->player_playlist_directory();
-	if (!dir) {
-		return;
-	}
-
-	_playlists.clear ();
-
-	for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
-		try {
-			if (is_regular_file(i->path()) && i->path().extension() == ".xml") {
-				SPL spl;
-				spl.read (i->path(), _content_view);
-				_playlists.push_back (spl);
-			}
-		} catch (exception& e) {
-			/* Never mind */
-		}
-	}
-
-	sort (_playlists.begin(), _playlists.end(), SPLComparator());
-	BOOST_FOREACH (SPL i, _playlists) {
-		add_playlist_to_list (i);
-	}
-
-	_selected_playlist = boost::none;
-}
-
-optional<dcp::EncryptedKDM>
-SwaroopControls::get_kdm_from_url (shared_ptr<DCPContent> dcp)
-{
-	ScopedTemporary temp;
-	string url = Config::instance()->kdm_server_url();
-	boost::algorithm::replace_all (url, "{CPL}", *dcp->cpl());
-	optional<dcp::EncryptedKDM> kdm;
-	if (dcp->cpl() && !get_from_url(url, false, false, temp)) {
-		try {
-			kdm = dcp::EncryptedKDM (dcp::file_to_string(temp.file()));
-			if (kdm->cpl_id() != dcp->cpl()) {
-				kdm = boost::none;
-			}
-		} catch (std::exception& e) {
-			/* Hey well */
-		}
-	}
-	return kdm;
-}
-
-optional<dcp::EncryptedKDM>
-SwaroopControls::get_kdm_from_directory (shared_ptr<DCPContent> dcp)
-{
-	using namespace boost::filesystem;
-	optional<path> kdm_dir = Config::instance()->player_kdm_directory();
-	if (!kdm_dir) {
-		return optional<dcp::EncryptedKDM>();
-	}
-	for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) {
-		try {
-			if (file_size(i->path()) < MAX_KDM_SIZE) {
-				dcp::EncryptedKDM kdm (dcp::file_to_string(i->path()));
-				if (kdm.cpl_id() == dcp->cpl()) {
-					return kdm;
-				}
-			}
-		} catch (std::exception& e) {
-			/* Hey well */
-		}
-	}
-	return optional<dcp::EncryptedKDM>();
-}
-
-optional<EncryptedECinemaKDM>
-SwaroopControls::get_kdm_from_directory (shared_ptr<FFmpegContent> ffmpeg)
-{
-	using namespace boost::filesystem;
-	optional<path> kdm_dir = Config::instance()->player_kdm_directory();
-	if (!kdm_dir) {
-		return optional<EncryptedECinemaKDM>();
-	}
-	for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) {
-		try {
-			if (file_size(i->path()) < MAX_KDM_SIZE) {
-				EncryptedECinemaKDM kdm (dcp::file_to_string(i->path()));
-				if (kdm.id() == ffmpeg->id().get_value_or("")) {
-					return kdm;
-				}
-			}
-		} catch (std::exception& e) {
-			/* Hey well */
-		}
-	}
-	return optional<EncryptedECinemaKDM>();
-}
-void
-SwaroopControls::spl_selection_changed ()
-{
-	long int selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-	if (selected == -1) {
-		_current_spl_view->DeleteAllItems ();
-		_selected_playlist = boost::none;
-		return;
-	}
-
-	if (_playlists[selected].missing()) {
-		error_dialog (this, "This playlist cannot be loaded as some content is missing.");
-		deselect_playlist ();
-		return;
-	}
-
-	if (_playlists[selected].get().empty()) {
-		error_dialog (this, "This playlist is empty.");
-		return;
-	}
-
-	if (!_playlists[selected].have_allowed_shows()) {
-		error_dialog (this, "There are no more allowed shows of this playlist.");
-		return;
-	}
-
-	select_playlist (selected, 0);
-}
-
-void
-SwaroopControls::select_playlist (int selected, int position)
-{
-	log (wxString::Format("load-playlist %s", std_to_wx(_playlists[selected].name()).data()));
-
-	wxProgressDialog dialog (_("DCP-o-matic"), "Loading playlist and KDMs");
-
-	BOOST_FOREACH (SPLEntry const & i, _playlists[selected].get()) {
-		dialog.Pulse ();
-		shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (i.content);
-		if (dcp && dcp->needs_kdm()) {
-			optional<dcp::EncryptedKDM> kdm;
-			kdm = get_kdm_from_url (dcp);
-			if (!kdm) {
-				kdm = get_kdm_from_directory (dcp);
-			}
-			if (kdm) {
-				try {
-					dcp->add_kdm (*kdm);
-					dcp->examine (_film, shared_ptr<Job>());
-				} catch (KDMError& e) {
-					error_dialog (this, "Could not load KDM.");
-				}
-			}
-			if (dcp->needs_kdm()) {
-				/* We didn't get a KDM for this */
-				error_dialog (this, "This playlist cannot be loaded as a KDM is missing or incorrect.");
-				deselect_playlist ();
-				return;
-			}
-		}
-		shared_ptr<FFmpegContent> ffmpeg = dynamic_pointer_cast<FFmpegContent> (i.content);
-		if (ffmpeg && ffmpeg->encrypted()) {
-			optional<EncryptedECinemaKDM> kdm = get_kdm_from_directory (ffmpeg);
-			if (kdm) {
-				try {
-					ffmpeg->add_kdm (*kdm);
-					ffmpeg->examine (_film, shared_ptr<Job>());
-				} catch (KDMError& e) {
-					error_dialog (this, "This playlist cannot be loaded as a KDM is missing or incorrect.");
-					deselect_playlist ();
-					return;
-				}
-			} else {
-				error_dialog (this, "This playlist cannot be loaded as a KDM is missing or incorrect.");
-				deselect_playlist ();
-				return;
-			}
-		}
-	}
-
-	_current_spl_view->DeleteAllItems ();
-
-	int N = 0;
-	BOOST_FOREACH (SPLEntry i, _playlists[selected].get()) {
-		wxListItem it;
-		it.SetId (N);
-		it.SetColumn (0);
-		it.SetText (std_to_wx(i.name));
-		_current_spl_view->InsertItem (it);
-		++N;
-	}
-
-	_selected_playlist = selected;
-	_selected_playlist_position = position;
- 	dialog.Pulse ();
-	reset_film ();
- 	dialog.Pulse ();
-	update_current_content ();
-}
-
-void
-SwaroopControls::reset_film ()
-{
-	DCPOMATIC_ASSERT (_selected_playlist);
-	shared_ptr<Film> film (new Film(optional<boost::filesystem::path>()));
-	film->add_content (_playlists[*_selected_playlist].get()[_selected_playlist_position].content);
-	ResetFilm (film);
-}
-
-void
-SwaroopControls::config_changed (int property)
-{
-	Controls::config_changed (property);
-
-	if (property == Config::PLAYER_CONTENT_DIRECTORY) {
-		_content_view->update ();
-	} else if (property == Config::PLAYER_PLAYLIST_DIRECTORY) {
-		update_playlist_directory ();
-	}
-}
-
-void
-SwaroopControls::set_film (shared_ptr<Film> film)
-{
-	Controls::set_film (film);
-	setup_sensitivity ();
-}
-
-void
-SwaroopControls::update_current_content ()
-{
-	DCPOMATIC_ASSERT (_selected_playlist);
-
-	wxProgressDialog dialog (_("DCP-o-matic"), "Loading content");
-
-	SPLEntry const & e = _playlists[*_selected_playlist].get()[_selected_playlist_position];
-	_current_disable_timeline = e.disable_timeline;
-	_current_disable_next = !e.skippable;
-
-	setup_sensitivity ();
-	dialog.Pulse ();
-	reset_film ();
-}
-
-/** One piece of content in our SPL has finished playing */
-void
-SwaroopControls::viewer_finished ()
-{
-	if (!_selected_playlist) {
-		return;
-	}
-
-	bool const stop = _playlists[*_selected_playlist].get()[_selected_playlist_position].stop_after_play;
-
-	_selected_playlist_position++;
-	if (_selected_playlist_position < int(_playlists[*_selected_playlist].get().size())) {
-		/* Next piece of content on the SPL */
-		update_current_content ();
-		if (!stop) {
-			_viewer->start ();
-		}
-	} else {
-		/* Finished the whole SPL */
-		_selected_playlist_position = 0;
-		_viewer->set_background_image (true);
-		ResetFilm (shared_ptr<Film>(new Film(optional<boost::filesystem::path>())));
-		decrement_allowed_shows ();
-		_play_button->Enable (true);
-		_pause_button->Enable (false);
-	}
-}
diff --git a/src/wx/swaroop_controls.h b/src/wx/swaroop_controls.h
deleted file mode 100644
index f773bf901..000000000
--- a/src/wx/swaroop_controls.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
-
-    This file is part of DCP-o-matic.
-
-    DCP-o-matic 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.
-
-    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "controls.h"
-#include "lib/swaroop_spl.h"
-
-class DCPContent;
-class EncryptedECinemaKDM;
-
-class SwaroopControls : public Controls
-{
-public:
-	SwaroopControls (wxWindow* parent, boost::shared_ptr<FilmViewer> viewer);
-
-	void log (wxString s);
-	void set_film (boost::shared_ptr<Film> film);
-	void check_restart ();
-
-	/** This is so that we can tell our parent player to reset the film
-	    when we have created one from a SPL.  We could call a method
-	    in the player's DOMFrame but we don't have that in a header.
-	*/
-	boost::signals2::signal<void (boost::weak_ptr<Film>)> ResetFilm;
-
-private:
-	void play_clicked ();
-	void pause_clicked ();
-	void stop_clicked ();
-	void next_clicked ();
-	void previous_clicked ();
-	void add_playlist_to_list (SPL spl);
-	void update_content_directory ();
-	void update_playlist_directory ();
-	void spl_selection_changed ();
-	void select_playlist (int selected, int position);
-	void started ();
-	void stopped ();
-	void setup_sensitivity ();
-	void config_changed (int);
-	void viewer_finished ();
-	void write_position ();
-	void reset_film ();
-	void update_current_content ();
-	bool can_do_previous ();
-	bool can_do_next ();
-	void decrement_allowed_shows ();
-	void deselect_playlist ();
-
-	boost::optional<dcp::EncryptedKDM> get_kdm_from_url (boost::shared_ptr<DCPContent> dcp);
-	boost::optional<dcp::EncryptedKDM> get_kdm_from_directory (boost::shared_ptr<DCPContent> dcp);
-	boost::optional<EncryptedECinemaKDM> get_kdm_from_directory (boost::shared_ptr<FFmpegContent> ffmpeg);
-
-	wxButton* _play_button;
-	wxButton* _pause_button;
-	wxButton* _stop_button;
-	wxButton* _next_button;
-	wxButton* _previous_button;
-
-	ContentView* _content_view;
-	wxButton* _refresh_content_view;
-	wxListCtrl* _spl_view;
-	wxButton* _refresh_spl_view;
-	wxListCtrl* _current_spl_view;
-
-	bool _current_disable_timeline;
-	bool _current_disable_next;
-
-	std::vector<SPL> _playlists;
-	boost::optional<int> _selected_playlist;
-	int _selected_playlist_position;
-
-	wxTimer _timer;
-};
diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc
index 7eea4b786..aa3a469da 100644
--- a/src/wx/video_view.cc
+++ b/src/wx/video_view.cc
@@ -31,9 +31,6 @@ using boost::optional;
 
 VideoView::VideoView (FilmViewer* viewer)
 	: _viewer (viewer)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	, _in_watermark (false)
-#endif
 	, _state_timer ("viewer")
 	, _video_frame_rate (0)
 	, _eyes (EYES_LEFT)
diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 50ea40fc7..4e0b89ed7 100644
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -142,12 +142,6 @@ protected:
 
 	FilmViewer* _viewer;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	bool _in_watermark;
-	int _watermark_x;
-	int _watermark_y;
-#endif
-
 	StateTimer _state_timer;
 
 private:
diff --git a/src/wx/wscript b/src/wx/wscript
index dee54e038..429e9c857 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -304,10 +304,7 @@ def build(bld):
     if bld.env.TARGET_OSX:
         obj.framework = ['CoreAudio', 'OpenGL']
     obj.use = 'libdcpomatic2'
-    if not len(bld.env.VARIANT) == 0 and bld.env.VARIANT.startswith('swaroop-'):
-        obj.source = sources + " swaroop_controls.cc"
-    else:
-        obj.source = sources
+    obj.source = sources
     obj.target = 'dcpomatic2-wx'
 
     i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)