X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fexceptions.cc;h=3d9b92cad993ecd5b37f781fb75c889b69cca96f;hb=488e3d1bd5e6b17d49f6db4df14c64f4b64db89b;hp=7f389f312ee4d5e93420e94d5532498d63271a08;hpb=314060f975dc9806f49ec8bbb1c11041a2ac111f;p=libdcp.git

diff --git a/src/exceptions.cc b/src/exceptions.cc
index 7f389f31..3d9b92ca 100644
--- a/src/exceptions.cc
+++ b/src/exceptions.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,18 +31,22 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/exceptions.cc
- *  @brief Exceptions thrown by libdcp.
+ *  @brief Exceptions thrown by libdcp
  */
 
+
 #include "exceptions.h"
 #include "compose.hpp"
 
+
 using std::string;
 using std::runtime_error;
 using boost::optional;
 using namespace dcp;
 
+
 FileError::FileError (string message, boost::filesystem::path filename, int number)
 	: runtime_error (String::compose ("%1 (%2) (error %3)", message, filename.string(), number))
 	, _filename (filename)
@@ -51,24 +55,28 @@ FileError::FileError (string message, boost::filesystem::path filename, int numb
 
 }
 
+
 UnresolvedRefError::UnresolvedRefError (string 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))
 {
 
 }
 
+
 BadContentKindError::BadContentKindError (string content_kind)
-	: DCPReadError (String::compose("Bad content kind '%1'", content_kind))
+	: ReadError (String::compose("Bad content kind '%1'", content_kind))
 {
 
 }
 
+
 NotEncryptedError::NotEncryptedError (string const & what)
 	: runtime_error (String::compose ("%1 is not encrypted", what))
 {
@@ -82,25 +90,29 @@ ProgrammingError::ProgrammingError (string file, int line)
 
 }
 
+
 KDMDecryptionError::KDMDecryptionError (std::string message, int cipher_length, int modulus_dmax)
 	: runtime_error (String::compose ("Could not decrypt KDM (%1) (%2/%3)", message, cipher_length, modulus_dmax))
 {
 
 }
 
+
 KDMFormatError::KDMFormatError (std::string message)
 	: runtime_error (String::compose ("Could not parse KDM (%1)", message))
 {
 
 }
 
+
 CertificateChainError::CertificateChainError (string message)
 	: runtime_error (message)
 {
 
 }
 
-DCPReadError::DCPReadError (string message, string detail)
+
+ReadError::ReadError (string message, string detail)
 	: runtime_error(String::compose("%1 (%2)", message, detail))
 	, _message(message)
 	, _detail(detail)
@@ -108,12 +120,14 @@ DCPReadError::DCPReadError (string message, string detail)
 
 }
 
+
 MissingSubtitleImageError::MissingSubtitleImageError (string id)
 	: runtime_error (String::compose("Could not load image for subtitle %1", id))
 {
 
 }
 
+
 BadKDMDateError::BadKDMDateError (bool starts_too_early)
 	: runtime_error (
 		starts_too_early ?
@@ -131,3 +145,56 @@ StartCompressionError::StartCompressionError (optional<int> code)
 	, _code (code)
 {}
 
+
+
+CombineError::CombineError (string message)
+	: runtime_error (message)
+{}
+
+
+LanguageTagError::LanguageTagError (std::string message)
+	: runtime_error (message)
+{}
+
+
+BadSettingError::BadSettingError (std::string message)
+	: runtime_error (message)
+{
+
+}
+
+
+DuplicateIdError::DuplicateIdError (std::string message)
+	: runtime_error (message)
+{
+
+}
+
+
+MainSoundConfigurationError::MainSoundConfigurationError (std::string s)
+	: runtime_error (String::compose("Could not parse MainSoundConfiguration %1", s))
+{
+
+}
+
+
+UnknownChannelIdError::UnknownChannelIdError (std::string id)
+	: runtime_error (String::compose("Unrecognised channel id '%1'", id))
+{
+
+}
+
+
+NoReelsError::NoReelsError ()
+	: runtime_error ("Cannot make a DCP when no reels have been added")
+{
+
+}
+
+
+MissingAssetmapError::MissingAssetmapError (boost::filesystem::path dir)
+	: ReadError (String::compose("Could not find ASSETMAP nor ASSETMAP.xml in '%1'", dir.string()))
+{
+
+}
+