Update for newer libdcp; add start of manual.

3 files changed, 17 insertions, 17 deletions

diff --git a/src/lib/dcp_content_type.cc b/src/lib/dcp_content_type.cc
index 03712cb0d..1f50c8dc4 100644
--- a/src/lib/dcp_content_type.cc
+++ b/src/lib/dcp_content_type.cc
@@ -28,9 +28,9 @@ using namespace std;
 
 vector<DCPContentType const *> DCPContentType::_dcp_content_types;
 
-DCPContentType::DCPContentType (string p, libdcp::DCP::ContentType c)
+DCPContentType::DCPContentType (string p, libdcp::ContentKind k)
 	: _pretty_name (p)
-	, _libdcp_type (c)
+	, _libdcp_kind (k)
 {
 
 }
@@ -38,16 +38,16 @@ DCPContentType::DCPContentType (string p, libdcp::DCP::ContentType c)
 void
 DCPContentType::setup_dcp_content_types ()
 {
-	_dcp_content_types.push_back (new DCPContentType ("Feature", libdcp::DCP::FEATURE));
-	_dcp_content_types.push_back (new DCPContentType ("Short", libdcp::DCP::SHORT));
-	_dcp_content_types.push_back (new DCPContentType ("Trailer", libdcp::DCP::TRAILER));
-	_dcp_content_types.push_back (new DCPContentType ("Test", libdcp::DCP::TEST));
-	_dcp_content_types.push_back (new DCPContentType ("Transitional", libdcp::DCP::TRANSITIONAL));
-	_dcp_content_types.push_back (new DCPContentType ("Rating", libdcp::DCP::RATING));
-	_dcp_content_types.push_back (new DCPContentType ("Teaser", libdcp::DCP::TEASER));
-	_dcp_content_types.push_back (new DCPContentType ("Policy", libdcp::DCP::POLICY));
-	_dcp_content_types.push_back (new DCPContentType ("Public Service Announcement", libdcp::DCP::PUBLIC_SERVICE_ANNOUNCEMENT));
-	_dcp_content_types.push_back (new DCPContentType ("Advertisement", libdcp::DCP::ADVERTISEMENT));
+	_dcp_content_types.push_back (new DCPContentType ("Feature", libdcp::FEATURE));
+	_dcp_content_types.push_back (new DCPContentType ("Short", libdcp::SHORT));
+	_dcp_content_types.push_back (new DCPContentType ("Trailer", libdcp::TRAILER));
+	_dcp_content_types.push_back (new DCPContentType ("Test", libdcp::TEST));
+	_dcp_content_types.push_back (new DCPContentType ("Transitional", libdcp::TRANSITIONAL));
+	_dcp_content_types.push_back (new DCPContentType ("Rating", libdcp::RATING));
+	_dcp_content_types.push_back (new DCPContentType ("Teaser", libdcp::TEASER));
+	_dcp_content_types.push_back (new DCPContentType ("Policy", libdcp::POLICY));
+	_dcp_content_types.push_back (new DCPContentType ("Public Service Announcement", libdcp::PUBLIC_SERVICE_ANNOUNCEMENT));
+	_dcp_content_types.push_back (new DCPContentType ("Advertisement", libdcp::ADVERTISEMENT));
 }
 
 DCPContentType const *
diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index 2c6d1879b..cb858cf5a 100644
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -31,15 +31,15 @@
 class DCPContentType
 {
 public:
-	DCPContentType (std::string, libdcp::DCP::ContentType);
+	DCPContentType (std::string, libdcp::ContentKind);
 
 	/** @return user-visible `pretty' name */
 	std::string pretty_name () const {
 		return _pretty_name;
 	}
 
-	libdcp::DCP::ContentType libdcp_type () const {
-		return _libdcp_type;
+	libdcp::ContentKind libdcp_kind () const {
+		return _libdcp_kind;
 	}
 
 	static DCPContentType const * from_pretty_name (std::string);
@@ -50,7 +50,7 @@ public:
 
 private:
 	std::string _pretty_name;
-	libdcp::DCP::ContentType _libdcp_type;
+	libdcp::ContentKind _libdcp_kind;
 
 	/** All available DCP content types */
 	static std::vector<DCPContentType const *> _dcp_content_types;
diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
index a6d0c2d10..4f42e13f1 100644
--- a/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@ -84,7 +84,7 @@ MakeDCPJob::run ()
 		break;
 	}
 	
-	libdcp::DCP dcp (_fs->dir (_fs->name), _fs->name, _fs->dcp_content_type->libdcp_type (), rint (_fs->frames_per_second), frames);
+	libdcp::DCP dcp (_fs->dir (_fs->name), _fs->name, _fs->dcp_content_type->libdcp_kind (), rint (_fs->frames_per_second), frames);
 	dcp.Progress.connect (sigc::mem_fun (*this, &MakeDCPJob::dcp_progress));
 
 	descend (0.9);