X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fexceptions.cc;h=f07354ca109cb953b61e3f4c53e9eaa21870c5cc;hp=95d4c8cce3d3a7283763010af483957319b0242c;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hpb=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2

diff --git a/src/lib/exceptions.cc b/src/lib/exceptions.cc
index 95d4c8cce..f07354ca1 100644
--- a/src/lib/exceptions.cc
+++ b/src/lib/exceptions.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,6 +24,7 @@
 #include "i18n.h"
 
 using std::string;
+using std::runtime_error;
 
 /** @param f File that we were trying to open */
 OpenFileError::OpenFileError (boost::filesystem::path f)
@@ -47,7 +49,7 @@ ReadFileError::ReadFileError (boost::filesystem::path f, int e)
 WriteFileError::WriteFileError (boost::filesystem::path f, int e)
 	: FileError (String::compose (_("could not write to file %1 (%2)"), f.string(), strerror (e)), f)
 {
-	
+
 }
 
 MissingSettingError::MissingSettingError (string s)
@@ -57,19 +59,25 @@ MissingSettingError::MissingSettingError (string s)
 }
 
 PixelFormatError::PixelFormatError (string o, AVPixelFormat f)
-	: StringError (String::compose (_("Cannot handle pixel format %1 during %2"), f, o))
+	: runtime_error (String::compose (_("Cannot handle pixel format %1 during %2"), (int) 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)
+TextSubtitleError::TextSubtitleError (string saw, string expecting, boost::filesystem::path f)
+	: FileError (String::compose (_("Error in subtitle file: saw %1 while expecting %2"), saw.empty() ? "[nothing]" : saw, expecting), f)
 {
-	
+
 }
 
 InvalidSignerError::InvalidSignerError ()
-	: StringError (_("The certificate chain for signing is invalid"))
+	: 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))
 {
 
 }