X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexceptions.cc;h=c15e134ee598de24ba4122dbdb30385d49b6a96a;hb=b6a6cda147625ccd09738cd338136ea5911a95e8;hp=bc6ac27c872a08c04c4de447a37f6f0cbcaedb0c;hpb=b19e695723dc7f3a34b655414cad1a80f95b55b7;p=dcpomatic.git

diff --git a/src/lib/exceptions.cc b/src/lib/exceptions.cc
index bc6ac27c8..c15e134ee 100644
--- a/src/lib/exceptions.cc
+++ b/src/lib/exceptions.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,31 +23,32 @@
 #include "i18n.h"
 
 using std::string;
+using std::runtime_error;
 
 /** @param f File that we were trying to open */
-OpenFileError::OpenFileError (string f)
-	: FileError (String::compose (_("could not open file %1"), f), f)
+OpenFileError::OpenFileError (boost::filesystem::path f)
+	: FileError (String::compose (_("could not open file %1"), f.string()), f)
 {
 
 }
 
 /** @param f File that we were trying to create */
-CreateFileError::CreateFileError (string f)
-	: FileError (String::compose (_("could not create file %1"), f), f)
+CreateFileError::CreateFileError (boost::filesystem::path f)
+	: FileError (String::compose (_("could not create file %1"), f.string()), f)
 {
 
 }
 
-ReadFileError::ReadFileError (string f, int e)
-	: FileError ("", f)
+ReadFileError::ReadFileError (boost::filesystem::path f, int e)
+	: FileError (String::compose (_("could not read from file %1 (%2)"), f.string(), strerror (e)), f)
 {
-	_what = String::compose (_("could not read from file %1 (%2)"), f, strerror (e));
+
 }
 
-WriteFileError::WriteFileError (std::string f, int e)
-	: FileError ("", f)
+WriteFileError::WriteFileError (boost::filesystem::path f, int e)
+	: FileError (String::compose (_("could not write to file %1 (%2)"), f.string(), strerror (e)), f)
 {
-	_what = String::compose (_("could not write to file %1 (%2)"), f, strerror (e));
+
 }
 
 MissingSettingError::MissingSettingError (string s)
@@ -56,8 +57,26 @@ MissingSettingError::MissingSettingError (string s)
 
 }
 
-PixelFormatError::PixelFormatError (std::string o, AVPixelFormat f)
-	: StringError (String::compose (_("Cannot handle pixel format %1 during %2"), f, o))
+PixelFormatError::PixelFormatError (string o, AVPixelFormat f)
+	: runtime_error (String::compose (_("Cannot handle pixel format %1 during %2"), f, o))
+{
+
+}
+
+SubRipError::SubRipError (string saw, string expecting, boost::filesystem::path f)
+	: FileError (String::compose (_("Error in SubRip file: saw %1 while expecting %2"), saw.empty() ? "[nothing]" : saw, expecting), f)
+{
+
+}
+
+InvalidSignerError::InvalidSignerError ()
+	: runtime_error (_("The certificate chain for signing is invalid"))
+{
+
+}
+
+ProgrammingError::ProgrammingError (string file, int line)
+	: runtime_error (String::compose (_("Programming error at %1:%2"), file, line))
 {
 
 }