Try to fix comparison of encrypted sound assets.

[libdcp.git] / src / exceptions.cc

diff --git a/src/exceptions.cc b/src/exceptions.cc
index e5a46948ce504ef14f8164a3ab8ec585ec3586fa..ed6edaa4a77fe520ed79e8a6a1edfda77172c1be 100644 (file)
--- 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 (error %2) (%3)", message, filename.string(), number))
+       : runtime_error (String::compose ("%1 (%2) (error %3)", message, filename.string(), number))
        , _filename (filename)
        , _number (number)
 {
@@ -36,8 +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)
+       : runtime_error (String::compose ("Bad time string %1", bad_time))
+{
+
+}
+
+MissingAssetError::MissingAssetError (boost::filesystem::path path, AssetType 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()))))
+{
+
+}
+
+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))
+{
+
+}