Merge branch 'content-rework-take5' of /home/carl/git/dvdomatic into content-rework-take5

10 files changed, 134 insertions, 712 deletions

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')