X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp_reader.cc;h=0c7a29a90aaa9d564f3f18932c00e305599fbd55;hb=fa12ed65527770e2adf300e39526dd0b36fce8c7;hp=6c35c05dc64ed5d057c387bff5fab1360885a863;hpb=af2520ec862edea39ac9d96c1fe8754ea2714bd4;p=libsub.git

diff --git a/src/dcp_reader.cc b/src/dcp_reader.cc
index 6c35c05..0c7a29a 100644
--- a/src/dcp_reader.cc
+++ b/src/dcp_reader.cc
@@ -25,12 +25,12 @@
 #include <dcp/smpte_subtitle_asset.h>
 #include <boost/filesystem.hpp>
 
-using std::cout;
-using std::string;
+using std::dynamic_pointer_cast;
 using std::exception;
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
 using boost::optional;
-using std::dynamic_pointer_cast;
 using namespace sub;
 
 static Time
@@ -52,21 +52,21 @@ DCPReader::DCPReader (boost::filesystem::path file)
 	string smpte_error;
 
 	try {
-		sc.reset (new dcp::InteropSubtitleAsset (file));
+		sc = make_shared<dcp::InteropSubtitleAsset>(file);
 	} catch (exception& e) {
 		interop_error = e.what ();
 	}
 
 	if (!sc) {
 		try {
-			sc.reset (new dcp::SMPTESubtitleAsset (file));
+			sc = make_shared<dcp::SMPTESubtitleAsset>(file);
 		} catch (exception& e) {
 			smpte_error = e.what();
 		}
 	}
 
 	if (!sc) {
-		throw DCPError (String::compose ("Could not read subtitles (%1 / %2)", interop_error, smpte_error));
+		throw DCPError(String::compose("Could not read subtitles (%1 / %2)", interop_error, smpte_error));
 	}
 
 
@@ -84,10 +84,10 @@ DCPReader::DCPReader (boost::filesystem::path file)
 		rs.font_size = FontSize::from_proportional (is->size() / (72.0 * 11.0));
 
 		switch (is->effect ()) {
-		case dcp::BORDER:
+		case dcp::Effect::BORDER:
 			rs.effect = BORDER;
 			break;
-		case dcp::SHADOW:
+		case dcp::Effect::SHADOW:
 			rs.effect = SHADOW;
 			break;
 		default:
@@ -102,26 +102,26 @@ DCPReader::DCPReader (boost::filesystem::path file)
 		rs.underline = is->underline ();
 
 		switch (is->h_align()) {
-		case dcp::HALIGN_LEFT:
+		case dcp::HAlign::LEFT:
 			rs.horizontal_position.reference = LEFT_OF_SCREEN;
 			break;
-		case dcp::HALIGN_CENTER:
+		case dcp::HAlign::CENTER:
 			rs.horizontal_position.reference = HORIZONTAL_CENTRE_OF_SCREEN;
 			break;
-		case dcp::HALIGN_RIGHT:
+		case dcp::HAlign::RIGHT:
 			rs.horizontal_position.reference = RIGHT_OF_SCREEN;
 			break;
 		}
 
 		rs.vertical_position.proportional = is->v_position();
 		switch (is->v_align()) {
-		case dcp::VALIGN_TOP:
+		case dcp::VAlign::TOP:
 			rs.vertical_position.reference = TOP_OF_SCREEN;
 			break;
-		case dcp::VALIGN_CENTER:
+		case dcp::VAlign::CENTER:
 			rs.vertical_position.reference = VERTICAL_CENTRE_OF_SCREEN;
 			break;
-		case dcp::VALIGN_BOTTOM:
+		case dcp::VAlign::BOTTOM:
 			rs.vertical_position.reference = BOTTOM_OF_SCREEN;
 			break;
 		}