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

48 files changed, 123 insertions, 123 deletions

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 6e0e2b78a..ec6905105 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_ANALYSIS_H
-#define DVDOMATIC_AUDIO_ANALYSIS_H
+#ifndef DCPOMATIC_AUDIO_ANALYSIS_H
+#define DCPOMATIC_AUDIO_ANALYSIS_H
 
 #include <iostream>
 #include <vector>
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index dbd55943d..2362786d9 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_CONTENT_H
-#define DVDOMATIC_AUDIO_CONTENT_H
+#ifndef DCPOMATIC_AUDIO_CONTENT_H
+#define DCPOMATIC_AUDIO_CONTENT_H
 
 #include "content.h"
 #include "util.h"
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 24e2796ae..418fc6da2 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for audio decoders.
  */
 
-#ifndef DVDOMATIC_AUDIO_DECODER_H
-#define DVDOMATIC_AUDIO_DECODER_H
+#ifndef DCPOMATIC_AUDIO_DECODER_H
+#define DCPOMATIC_AUDIO_DECODER_H
 
 #include "audio_source.h"
 #include "decoder.h"
diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 4f2cdb7f8..248d2570e 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_MAPPING_H
-#define DVDOMATIC_AUDIO_MAPPING_H
+#ifndef DCPOMATIC_AUDIO_MAPPING_H
+#define DCPOMATIC_AUDIO_MAPPING_H
 
 #include <list>
 #include <string>
diff --git a/src/lib/audio_sink.h b/src/lib/audio_sink.h
index 11d578a60..085491657 100644
--- a/src/lib/audio_sink.h
+++ b/src/lib/audio_sink.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_SINK_H
-#define DVDOMATIC_AUDIO_SINK_H
+#ifndef DCPOMATIC_AUDIO_SINK_H
+#define DCPOMATIC_AUDIO_SINK_H
 
 class AudioSink
 {
diff --git a/src/lib/audio_source.h b/src/lib/audio_source.h
index 5a1510d3c..ee5c606dc 100644
--- a/src/lib/audio_source.h
+++ b/src/lib/audio_source.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which emit audio data.
  */
 
-#ifndef DVDOMATIC_AUDIO_SOURCE_H
-#define DVDOMATIC_AUDIO_SOURCE_H
+#ifndef DCPOMATIC_AUDIO_SOURCE_H
+#define DCPOMATIC_AUDIO_SOURCE_H
 
 #include <boost/signals2.hpp>
 
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 2defa0539..354940b1c 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -155,9 +155,9 @@ Config::file (bool old) const
 	boost::filesystem::path p;
 	p /= g_get_user_config_dir ();
 	if (old) {
-		p /= ".dvdomatic";
+		p /= ".dcpomatic";
 	} else {
-		p /= ".dvdomatic.xml";
+		p /= ".dcpomatic.xml";
 	}
 	return p.string ();
 }
diff --git a/src/lib/config.h b/src/lib/config.h
index 13d36d236..57f4fb8a9 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -21,8 +21,8 @@
  *  @brief Class holding configuration.
  */
 
-#ifndef DVDOMATIC_CONFIG_H
-#define DVDOMATIC_CONFIG_H
+#ifndef DCPOMATIC_CONFIG_H
+#define DCPOMATIC_CONFIG_H
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/content.h b/src/lib/content.h
index c8aa6b0e0..d39fc9e1a 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_CONTENT_H
-#define DVDOMATIC_CONTENT_H
+#ifndef DCPOMATIC_CONTENT_H
+#define DCPOMATIC_CONTENT_H
 
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 2c66ab53a..f232f1779 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -18,20 +18,20 @@
 */
 
 #include "cross.h"
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 #include <unistd.h>
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 #include "windows.h"
 #endif
 
 void
-dvdomatic_sleep (int s)
+dcpomatic_sleep (int s)
 {
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 	sleep (s);
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 	Sleep (s * 1000);
 #endif
 }
diff --git a/src/lib/cross.h b/src/lib/cross.h
index 110660b16..00457c968 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)
 #endif
 
-void dvdomatic_sleep (int);
+void dcpomatic_sleep (int);
diff --git a/src/lib/dci_metadata.h b/src/lib/dci_metadata.h
index f61dae5a8..b87609ed0 100644
--- a/src/lib/dci_metadata.h
+++ b/src/lib/dci_metadata.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_DCI_METADATA_H
-#define DVDOMATIC_DCI_METADATA_H
+#ifndef DCPOMATIC_DCI_METADATA_H
+#define DCPOMATIC_DCI_METADATA_H
 
 #include <string>
 #include <libxml++/libxml++.h>
diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index 960bb0129..14204bd72 100644
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_DCP_CONTENT_TYPE_H
-#define DVDOMATIC_DCP_CONTENT_TYPE_H
+#ifndef DCPOMATIC_DCP_CONTENT_TYPE_H
+#define DCPOMATIC_DCP_CONTENT_TYPE_H
 
 /** @file src/content_type.h
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index e9499871a..da51665d1 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -266,7 +266,7 @@ DCPVideoFrame::encode_locally ()
 	_parameters->tcp_numlayers++;
 	_parameters->cp_disto_alloc = 1;
 	_parameters->cp_rsiz = CINEMA2K;
-	_parameters->cp_comment = strdup (N_("DVD-o-matic"));
+	_parameters->cp_comment = strdup (N_("DCP-o-matic"));
 	_parameters->cp_cinema = CINEMA2K_24;
 
 	/* 3 components, so use MCT */
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 0fffef257..72b866ffe 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for decoders of content.
  */
 
-#ifndef DVDOMATIC_DECODER_H
-#define DVDOMATIC_DECODER_H
+#ifndef DCPOMATIC_DECODER_H
+#define DCPOMATIC_DECODER_H
 
 #include <vector>
 #include <string>
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index d6a57ae6b..3201e6ecb 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -423,7 +423,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		if (remote_backoff > 0) {
-			dvdomatic_sleep (remote_backoff);
+			dcpomatic_sleep (remote_backoff);
 		}
 
 		lock.lock ();
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 70e6eea9a..56007fd48 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_ENCODER_H
-#define DVDOMATIC_ENCODER_H
+#ifndef DCPOMATIC_ENCODER_H
+#define DCPOMATIC_ENCODER_H
 
 /** @file src/encoder.h
  *  @brief Encoder to J2K and WAV for DCP.
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 6920556e5..6bad7c924 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_EXCEPTIONS_H
-#define DVDOMATIC_EXCEPTIONS_H
+#ifndef DCPOMATIC_EXCEPTIONS_H
+#define DCPOMATIC_EXCEPTIONS_H
 
 /** @file  src/exceptions.h
  *  @brief Our exceptions.
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index b49e5790e..8bf4d42a5 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_FFMPEG_CONTENT_H
-#define DVDOMATIC_FFMPEG_CONTENT_H
+#ifndef DCPOMATIC_FFMPEG_CONTENT_H
+#define DCPOMATIC_FFMPEG_CONTENT_H
 
 #include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 6ab6551da..67605ffca 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -254,7 +254,7 @@ Film::make_dcp ()
 		throw BadSettingError (_("name"), _("cannot contain slashes"));
 	}
 	
-	log()->log (String::compose ("DVD-o-matic %1 git %2 using %3", dvdomatic_version, dvdomatic_git_commit, dependency_version_summary()));
+	log()->log (String::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary()));
 
 	{
 		char buffer[128];
@@ -270,10 +270,10 @@ Film::make_dcp ()
 //	log()->log (String::compose ("Content at %1 fps, DCP at %2 fps", source_frame_rate(), dcp_frame_rate()));
 	log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
 	log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
-#ifdef DVDOMATIC_DEBUG
-	log()->log ("DVD-o-matic built in debug mode.");
+#ifdef DCPOMATIC_DEBUG
+	log()->log ("DCP-o-matic built in debug mode.");
 #else
-	log()->log ("DVD-o-matic built in optimised mode.");
+	log()->log ("DCP-o-matic built in optimised mode.");
 #endif
 #ifdef LIBDCP_DEBUG
 	log()->log ("libdcp built in debug mode.");
@@ -432,7 +432,7 @@ Film::read_metadata ()
 	boost::mutex::scoped_lock lm (_state_mutex);
 
 	if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) {
-		throw StringError (_("This film was created with an older version of DVD-o-matic, and unfortunately it cannot be loaded into this version.  You will need to create a new Film, re-add your content and set it up again.  Sorry!"));
+		throw StringError (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version.  You will need to create a new Film, re-add your content and set it up again.  Sorry!"));
 	}
 
 	cxml::File f (file ("metadata.xml"), "Metadata");
diff --git a/src/lib/film.h b/src/lib/film.h
index 4d994996e..ffa5d0690 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -22,8 +22,8 @@
  *  how they should be presented in a DCP.
  */
 
-#ifndef DVDOMATIC_FILM_H
-#define DVDOMATIC_FILM_H
+#ifndef DCPOMATIC_FILM_H
+#define DCPOMATIC_FILM_H
 
 #include <string>
 #include <vector>
@@ -336,7 +336,7 @@ private:
 	/** Mutex for _directory */
 	mutable boost::mutex _directory_mutex;
 	
-	/** Name for DVD-o-matic */
+	/** Name for DCP-o-matic */
 	std::string _name;
 	/** True if a auto-generated DCI-compliant name should be used for our DCP */
 	bool _use_dci_name;
diff --git a/src/lib/filter.h b/src/lib/filter.h
index 205d92482..7587312c2 100644
--- a/src/lib/filter.h
+++ b/src/lib/filter.h
@@ -21,8 +21,8 @@
  *  @brief A class to describe one of FFmpeg's video or post-processing filters.
  */
 
-#ifndef DVDOMATIC_FILTER_H
-#define DVDOMATIC_FILTER_H
+#ifndef DCPOMATIC_FILTER_H
+#define DCPOMATIC_FILTER_H
 
 #include <string>
 #include <vector>
diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index db86a677d..1ff5527ab 100644
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -21,8 +21,8 @@
  *  @brief A graph of FFmpeg filters.
  */
 
-#ifndef DVDOMATIC_FILTER_GRAPH_H
-#define DVDOMATIC_FILTER_GRAPH_H
+#ifndef DCPOMATIC_FILTER_GRAPH_H
+#define DCPOMATIC_FILTER_GRAPH_H
 
 #include "util.h"
 #include "ffmpeg_compatibility.h"
diff --git a/src/lib/i18n.h b/src/lib/i18n.h
index 46bb1d565..890313bc6 100644
--- a/src/lib/i18n.h
+++ b/src/lib/i18n.h
@@ -19,5 +19,5 @@
 
 #include <libintl.h>
 
-#define _(x) dgettext ("libdvdomatic", x)
+#define _(x) dgettext ("libdcpomatic", x)
 #define N_(x) x
diff --git a/src/lib/image.h b/src/lib/image.h
index 6b9ade99e..1d7d75dfc 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -21,8 +21,8 @@
  *  @brief A set of classes to describe video images.
  */
 
-#ifndef DVDOMATIC_IMAGE_H
-#define DVDOMATIC_IMAGE_H
+#ifndef DCPOMATIC_IMAGE_H
+#define DCPOMATIC_IMAGE_H
 
 #include <string>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/job.cc b/src/lib/job.cc
index f830975af..812380594 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -91,7 +91,7 @@ Job::run_wrapper ()
 		set_state (FINISHED_ERROR);
 		set_error (
 			e.what (),
-			_("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)")
 			);
 
 	} catch (...) {
@@ -100,7 +100,7 @@ Job::run_wrapper ()
 		set_state (FINISHED_ERROR);
 		set_error (
 			_("Unknown error"),
-			_("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)")
 			);
 
 	}
diff --git a/src/lib/job.h b/src/lib/job.h
index f5175c525..2119db2f3 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -21,8 +21,8 @@
  *  @brief A parent class to represent long-running tasks which are run in their own thread.
  */
 
-#ifndef DVDOMATIC_JOB_H
-#define DVDOMATIC_JOB_H
+#ifndef DCPOMATIC_JOB_H
+#define DCPOMATIC_JOB_H
 
 #include <string>
 #include <boost/thread/mutex.hpp>
diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 910597628..f96275467 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -126,7 +126,7 @@ JobManager::scheduler ()
 			}
 		}
 
-		dvdomatic_sleep (1);
+		dcpomatic_sleep (1);
 	}
 }
 
diff --git a/src/lib/log.h b/src/lib/log.h
index 3a2cfcbfd..3ad6516c1 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_LOG_H
-#define DVDOMATIC_LOG_H
+#ifndef DCPOMATIC_LOG_H
+#define DCPOMATIC_LOG_H
 
 /** @file src/log.h
  *  @brief A very simple logging class.
diff --git a/src/lib/player.h b/src/lib/player.h
index 7a99d6561..9a55b8599 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_PLAYER_H
-#define DVDOMATIC_PLAYER_H
+#ifndef DCPOMATIC_PLAYER_H
+#define DCPOMATIC_PLAYER_H
 
 #include <list>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 17051bd98..5c8d642e3 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LIBDVDOMATIC\n"
+"Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-02 19:10-0500\n"
@@ -250,10 +250,10 @@ msgstr "Horizontal deblocking filter A"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
 "Error desconocido. La mejor idea es informar del problema a la lista de "
-"correo de DVD-O-matic (dvdomatic@carlh.net)"
+"correo de DCP-o-matic (dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index d9d945b52..af6890d97 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic FRENCH\n"
+"Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-20 00:39+0100\n"
@@ -248,10 +248,10 @@ msgstr "Filtre dé-bloc horizontal"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
-"Erreur indéterminée. Merci de rapporter le problème à la liste DVD-o-matic "
-"(dvdomatic@carlh.net)"
+"Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic "
+"(dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 992eda107..c1ca26ea3 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -248,10 +248,10 @@ msgstr "Filtro A sblocco orizzontale"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
 "Non sappiamo cosa ha causato questo errore. La cosa migliore è inviare un "
-"report del problema alla mailing list di DVD-o-matic (dvdomatic@carlh.net)"
+"report del problema alla mailing list di DCP-o-matic (dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index d574261c8..c8695ce4d 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic\n"
+"Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-09 10:13+0100\n"
@@ -249,10 +249,10 @@ msgstr "Filter för horisontal kantighetsutjämning A"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
 "Det är inte känt vad som orsakade detta fel. Bästa sättet att rapportera "
-"problemet är till DVD-o-matics mejl-lista (dvdomatic@carlh.net)"
+"problemet är till DCP-o-matics mejl-lista (dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/processor.h b/src/lib/processor.h
index 1ba396f2f..5dbafab7f 100644
--- a/src/lib/processor.h
+++ b/src/lib/processor.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which accept and then emit video or audio data.
  */
 
-#ifndef DVDOMATIC_PROCESSOR_H
-#define DVDOMATIC_PROCESSOR_H
+#ifndef DCPOMATIC_PROCESSOR_H
+#define DCPOMATIC_PROCESSOR_H
 
 #include "video_source.h"
 #include "video_sink.h"
diff --git a/src/lib/scaler.h b/src/lib/scaler.h
index c80f4b7db..a736e92de 100644
--- a/src/lib/scaler.h
+++ b/src/lib/scaler.h
@@ -21,8 +21,8 @@
  *  @brief A class to describe one of FFmpeg's software scalers.
  */
 
-#ifndef DVDOMATIC_SCALER_H
-#define DVDOMATIC_SCALER_H
+#ifndef DCPOMATIC_SCALER_H
+#define DCPOMATIC_SCALER_H
 
 #include <string>
 #include <vector>
diff --git a/src/lib/sound_processor.h b/src/lib/sound_processor.h
index 2edf38840..bdbe72ba2 100644
--- a/src/lib/sound_processor.h
+++ b/src/lib/sound_processor.h
@@ -21,8 +21,8 @@
  *  @brief A class to describe a sound processor.
  */
 
-#ifndef DVDOMATIC_SOUND_PROCESSOR_H
-#define DVDOMATIC_SOUND_PROCESSOR_H
+#ifndef DCPOMATIC_SOUND_PROCESSOR_H
+#define DCPOMATIC_SOUND_PROCESSOR_H
 
 #include <string>
 #include <vector>
diff --git a/src/lib/timer.h b/src/lib/timer.h
index f509a7492..173d0d961 100644
--- a/src/lib/timer.h
+++ b/src/lib/timer.h
@@ -22,8 +22,8 @@
  *  @brief Some timing classes for debugging and profiling.
  */
 
-#ifndef DVDOMATIC_TIMER_H
-#define DVDOMATIC_TIMER_H
+#ifndef DCPOMATIC_TIMER_H
+#define DCPOMATIC_TIMER_H
 
 #include <string>
 #include <map>
diff --git a/src/lib/types.h b/src/lib/types.h
index f821a74ac..c2bb9d853 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_TYPES_H
-#define DVDOMATIC_TYPES_H
+#ifndef DCPOMATIC_TYPES_H
+#define DCPOMATIC_TYPES_H
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/ui_signaller.h b/src/lib/ui_signaller.h
index 221bcbe95..428ab698f 100644
--- a/src/lib/ui_signaller.h
+++ b/src/lib/ui_signaller.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_UI_SIGNALLER_H
-#define DVDOMATIC_UI_SIGNALLER_H
+#ifndef DCPOMATIC_UI_SIGNALLER_H
+#define DCPOMATIC_UI_SIGNALLER_H
 
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 06da94294..ad08c6ab4 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <fstream>
 #include <climits>
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 #include <execinfo.h>
 #include <cxxabi.h>
 #endif
@@ -148,7 +148,7 @@ seconds_to_approximate_hms (int s)
 	return ap.str ();
 }
 
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 /** @param l Mangled C++ identifier.
  *  @return Demangled version.
  */
@@ -247,11 +247,11 @@ seconds (struct timeval t)
 	return t.tv_sec + (double (t.tv_usec) / 1e6);
 }
 
-/** Call the required functions to set up DVD-o-matic's static arrays, etc.
+/** Call the required functions to set up DCP-o-matic's static arrays, etc.
  *  Must be called from the UI thread, if there is one.
  */
 void
-dvdomatic_setup ()
+dcpomatic_setup ()
 {
 	avfilter_register_all ();
 	
@@ -264,7 +264,7 @@ dvdomatic_setup ()
 	ui_thread = boost::this_thread::get_id ();
 }
 
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 boost::filesystem::path
 mo_path ()
 {
@@ -279,9 +279,9 @@ mo_path ()
 #endif
 
 void
-dvdomatic_setup_i18n (string lang)
+dcpomatic_setup_i18n (string lang)
 {
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 	lang += ".UTF8";
 #endif
 
@@ -297,15 +297,15 @@ dvdomatic_setup_i18n (string lang)
 	}
 
 	setlocale (LC_ALL, "");
-	textdomain ("libdvdomatic");
+	textdomain ("libdcpomatic");
 
-#ifdef DVDOMATIC_WINDOWS
-	bindtextdomain ("libdvdomatic", mo_path().string().c_str());
-	bind_textdomain_codeset ("libdvdomatic", "UTF8");
+#ifdef DCPOMATIC_WINDOWS
+	bindtextdomain ("libdcpomatic", mo_path().string().c_str());
+	bind_textdomain_codeset ("libdcpomatic", "UTF8");
 #endif	
 
-#ifdef DVDOMATIC_POSIX
-	bindtextdomain ("libdvdomatic", POSIX_LOCALE_PREFIX);
+#ifdef DCPOMATIC_POSIX
+	bindtextdomain ("libdcpomatic", POSIX_LOCALE_PREFIX);
 #endif
 }
 
@@ -909,7 +909,7 @@ cpu_info ()
 	pair<string, int> info;
 	info.second = 0;
 	
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 	ifstream f (N_("/proc/cpuinfo"));
 	while (f.good ()) {
 		string l;
diff --git a/src/lib/util.h b/src/lib/util.h
index f4af7c22b..065801a88 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -22,8 +22,8 @@
  *  @brief Some utility functions and classes.
  */
 
-#ifndef DVDOMATIC_UTIL_H
-#define DVDOMATIC_UTIL_H
+#ifndef DCPOMATIC_UTIL_H
+#define DCPOMATIC_UTIL_H
 
 #include <string>
 #include <vector>
@@ -39,7 +39,7 @@ extern "C" {
 #include "compose.hpp"
 #include "types.h"
 
-#ifdef DVDOMATIC_DEBUG
+#ifdef DCPOMATIC_DEBUG
 #define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
 #else
 #define TIMING(...)
@@ -55,14 +55,14 @@ extern std::string seconds_to_approximate_hms (int);
 extern void stacktrace (std::ostream &, int);
 extern std::string dependency_version_summary ();
 extern double seconds (struct timeval);
-extern void dvdomatic_setup ();
-extern void dvdomatic_setup_i18n (std::string);
+extern void dcpomatic_setup ();
+extern void dcpomatic_setup_i18n (std::string);
 extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
 extern std::string md5_digest (boost::filesystem::path);
 extern std::string md5_digest (void const *, int);
 extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 extern boost::filesystem::path mo_path ();
 #endif
 
@@ -117,7 +117,7 @@ extern std::string get_optional_string (std::multimap<std::string, std::string>
 
 /** @class Socket
  *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
- *  that are useful for DVD-o-matic.
+ *  that are useful for DCP-o-matic.
  *
  *  This class wraps some things that I could not work out how to do with boost;
  *  most notably, sync read/write calls with timeouts.
diff --git a/src/lib/version.h b/src/lib/version.h
index 71639e3bc..518862fc4 100644
--- a/src/lib/version.h
+++ b/src/lib/version.h
@@ -1,3 +1,3 @@
 
-extern char const * dvdomatic_version;
-extern char const * dvdomatic_git_commit;
+extern char const * dcpomatic_version;
+extern char const * dcpomatic_git_commit;
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 3d2c4cab2..75e507d4d 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_CONTENT_H
-#define DVDOMATIC_VIDEO_CONTENT_H
+#ifndef DCPOMATIC_VIDEO_CONTENT_H
+#define DCPOMATIC_VIDEO_CONTENT_H
 
 #include "content.h"
 #include "util.h"
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 05cf99a96..23817c055 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
 #include "decoder.h"
diff --git a/src/lib/video_sink.h b/src/lib/video_sink.h
index 7c128cf73..c68651005 100644
--- a/src/lib/video_sink.h
+++ b/src/lib/video_sink.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_SINK_H
-#define DVDOMATIC_VIDEO_SINK_H
+#ifndef DCPOMATIC_VIDEO_SINK_H
+#define DCPOMATIC_VIDEO_SINK_H
 
 #include <boost/shared_ptr.hpp>
 #include "util.h"
diff --git a/src/lib/video_source.h b/src/lib/video_source.h
index e60e7dfd0..e7c9805ef 100644
--- a/src/lib/video_source.h
+++ b/src/lib/video_source.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which emit video data.
  */
 
-#ifndef DVDOMATIC_VIDEO_SOURCE_H
-#define DVDOMATIC_VIDEO_SOURCE_H
+#ifndef DCPOMATIC_VIDEO_SOURCE_H
+#define DCPOMATIC_VIDEO_SOURCE_H
 
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
diff --git a/src/lib/wscript b/src/lib/wscript
index 2a26c2bfe..fddebe8e6 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -66,7 +66,7 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libdvdomatic'
+    obj.name = 'libdcpomatic'
     obj.export_includes = ['.']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
@@ -78,12 +78,12 @@ def build(bld):
     if bld.env.STATIC:
         obj.uselib += ' XML++'
     obj.source = sources + " version.cc"
-    obj.target = 'dvdomatic'
+    obj.target = 'dcpomatic'
 
-    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdvdomatic', bld)
+    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'lib'), sources, 'libdvdomatic')
+    i18n.pot(os.path.join('src', 'lib'), sources, 'libdcpomatic')
 
 def pot_merge(bld):
-    i18n.pot_merge(os.path.join('src', 'lib'), 'libdvdomatic')
+    i18n.pot_merge(os.path.join('src', 'lib'), 'libdcpomatic')