X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexceptions.h;h=52f257a8d3f558550ccba9724dfe612e3eca55c0;hb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;hp=f4631c09b67310bcf75492daca3b2b58dfd5e835;hpb=c3da7c64f01420447dbab7f5c2ea42ff1b911cc5;p=dcpomatic.git

diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index f4631c09b..52f257a8d 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 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
@@ -17,13 +17,13 @@
 
 */
 
-#ifndef DCPOMATIC_EXCEPTIONS_H
-#define DCPOMATIC_EXCEPTIONS_H
-
-/** @file  src/exceptions.h
+/** @file  src/lib/exceptions.h
  *  @brief Our exceptions.
  */
 
+#ifndef DCPOMATIC_EXCEPTIONS_H
+#define DCPOMATIC_EXCEPTIONS_H
+
 #include <stdexcept>
 #include <cstring>
 #include <boost/exception/all.hpp>
@@ -205,7 +205,7 @@ public:
 	{}
 };
 
-/** @class NetworkError.
+/** @class NetworkError
  *  @brief Indicates some problem with communication on the network.
  */
 class NetworkError : public StringError
@@ -216,6 +216,9 @@ public:
 	{}
 };
 
+/** @class KDMError
+ *  @brief A problem with a KDM.
+ */
 class KDMError : public StringError
 {
 public:
@@ -224,23 +227,66 @@ public:
 	{}
 };
 
+/** @class PixelFormatError
+ *  @brief A problem with an unsupported pixel format.
+ */
 class PixelFormatError : public StringError
 {
 public:
 	PixelFormatError (std::string o, AVPixelFormat f);
 };
 
+/** @class SubRipError
+ *  @brief An error that occurs while parsing a SubRip file.
+ */
+class SubRipError : public FileError
+{
+public:
+	SubRipError (std::string, std::string, boost::filesystem::path);
+};
+
+class DCPError : public StringError
+{
+public:
+	DCPError (std::string s)
+		: StringError (s)
+	{}
+};
+
+class InvalidSignerError : public StringError
+{
+public:
+	InvalidSignerError ();
+};
+
+/** @class ExceptionStore
+ *  @brief A parent class for classes which have a need to catch and
+ *  re-throw exceptions.
+ *
+ *  This is intended for classes which run their own thread; they should do
+ *  something like
+ *
+ *  void my_thread ()
+ *  try {
+ *    // do things which might throw exceptions
+ *  } catch (...) {
+ *    store_current ();
+ *  }
+ *
+ *  and then in another thread call rethrow().  If any
+ *  exception was thrown by my_thread it will be stored by
+ *  store_current() and then rethrow() will re-throw it where
+ *  it can be handled.
+ */
 class ExceptionStore
 {
 public:
-	bool thrown () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _exception;
-	}
-	
 	void rethrow () {
 		boost::mutex::scoped_lock lm (_mutex);
-		boost::rethrow_exception (_exception);
+		if (_exception) {
+			boost::rethrow_exception (_exception);
+			_exception = boost::exception_ptr ();
+		}
 	}
 
 protected:	
@@ -255,6 +301,4 @@ private:
 	mutable boost::mutex _mutex;
 };
 
-	
-
 #endif