X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fexceptions.cc;h=ed6edaa4a77fe520ed79e8a6a1edfda77172c1be;hb=1caefd8541e12e7d205c3d5bb46f3ec84719baa0;hp=28846e1617b0523a43f31b7fcaf0f897ee91f518;hpb=fe9bbdf3f5223ee94cb51ba00ddab7f4a6ddb754;p=libdcp.git

diff --git a/src/exceptions.cc b/src/exceptions.cc
index 28846e16..ed6edaa4 100644
--- a/src/exceptions.cc
+++ b/src/exceptions.cc
@@ -25,10 +25,11 @@
 #include "compose.hpp"
 
 using std::string;
+using std::runtime_error;
 using namespace dcp;
 
 FileError::FileError (string message, boost::filesystem::path filename, int number)
-	: _message (String::compose ("%1 (%2) (error %3)", message, filename.string(), number))
+	: runtime_error (String::compose ("%1 (%2) (error %3)", message, filename.string(), number))
 	, _filename (filename)
 	, _number (number)
 {
@@ -36,35 +37,36 @@ FileError::FileError (string message, boost::filesystem::path filename, int numb
 }
 
 UnresolvedRefError::UnresolvedRefError (string id)
-	: _message (String::compose ("Unresolved reference to asset id %1", id))
+	: runtime_error (String::compose ("Unresolved reference to asset id %1", id))
 {
 
 }
 
 TimeFormatError::TimeFormatError (string bad_time)
-	: _message (String::compose ("Bad time string %1", bad_time))
+	: runtime_error (String::compose ("Bad time string %1", bad_time))
 {
 
 }
 
 MissingAssetError::MissingAssetError (boost::filesystem::path path, AssetType type)
-	: _path (path)
-	, _type (type)
+	: DCPReadError (
+		type == MAIN_PICTURE    ? String::compose ("Missing asset %1 for main picture", path.string()) :
+		(type == MAIN_SOUND     ? String::compose ("Missing asset %1 for main sound", path.string()) :
+		 (type == MAIN_SUBTITLE ? String::compose ("Missing asset %1 for main subtitle", path.string()) :
+		  String::compose ("Missing asset %1", path.string()))))
 {
-	string type_name;
-	switch (_type) {
-	case MAIN_PICTURE:
-		type_name = " for main picture";
-		break;
-	case MAIN_SOUND:
-		type_name = " for main sound";
-		break;
-	case MAIN_SUBTITLE:
-		type_name = " for main subtitle";
-		break;
-	case UNKNOWN:
-		break;
-	}
-	
-	_message = String::compose ("Missing asset %1%2", path.string(), type_name);
+
+}
+
+NotEncryptedError::NotEncryptedError (string const & what)
+	: runtime_error (String::compose ("%1 is not encrypted", what))
+{
+
+}
+
+
+ProgrammingError::ProgrammingError (string file, int line)
+	: runtime_error (String::compose ("Programming error at %1:%2", file, line))
+{
+
 }