X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fexceptions.h;h=b04d973dc7a62197571ce7d6697917f2023b23e0;hb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;hp=b66d7baa7593bdab18b60335d7d4d7b54c7afbd3;hpb=7893bb062e1ce158eafc51f9fa9c9c31f4cc1463;p=dcpomatic.git

diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index b66d7baa7..b04d973dc 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -17,13 +17,21 @@
 
 */
 
+#ifndef DCPOMATIC_EXCEPTIONS_H
+#define DCPOMATIC_EXCEPTIONS_H
+
 /** @file  src/exceptions.h
  *  @brief Our exceptions.
  */
 
 #include <stdexcept>
-#include <sstream>
 #include <cstring>
+#include <boost/exception/all.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/thread.hpp>
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
 
 /** @class StringError
  *  @brief A parent class for exceptions using messages held in a std::string
@@ -77,19 +85,24 @@ public:
 class FileError : public StringError
 {
 public:
-	FileError (std::string m, std::string f)
+	/** @param m Error message.
+	 *  @param f Name of the file that this exception concerns.
+	 */
+	FileError (std::string m, boost::filesystem::path f)
 		: StringError (m)
 		, _file (f)
 	{}
 
 	virtual ~FileError () throw () {}
 
-	std::string file () const {
+	/** @return name of the file that this exception concerns */
+	boost::filesystem::path file () const {
 		return _file;
 	}
 
 private:
-	std::string _file;
+	/** name of the file that this exception concerns */
+	boost::filesystem::path _file;
 };
 	
 
@@ -100,9 +113,7 @@ class OpenFileError : public FileError
 {
 public:
 	/** @param f File that we were trying to open */
-	OpenFileError (std::string f)
-		: FileError ("could not open file " + f, f)
-	{}
+	OpenFileError (boost::filesystem::path f);
 };
 
 /** @class CreateFileError.
@@ -112,9 +123,7 @@ class CreateFileError : public FileError
 {
 public:
 	/** @param f File that we were trying to create */
-	CreateFileError (std::string f)
-		: FileError ("could not create file " + f, f)
-	{}
+	CreateFileError (boost::filesystem::path f);
 };
 
 
@@ -127,16 +136,7 @@ public:
 	/** @param f File that we were trying to read from.
 	 *  @param e errno value, or 0.
 	 */
-	ReadFileError (std::string f, int e)
-		: FileError ("", f)
-	{
-		std::stringstream s;
-		s << "could not read from file " << f;
-		if (e) {
-			s << " (" << strerror (e) << ")";
-		}
-		_what = s.str ();
-	}
+	ReadFileError (boost::filesystem::path f, int e = 0);
 };
 
 /** @class WriteFileError.
@@ -148,16 +148,7 @@ public:
 	/** @param f File that we were trying to write to.
 	 *  @param e errno value, or 0.
 	 */
-	WriteFileError (std::string f, int e)
-		: FileError ("", f)
-	{
-		std::stringstream s;
-		s << "could not write to file " << f;
-		if (e) {
-			s << " (" << strerror (e) << ")";
-		}
-		_what = s.str ();
-	}
+	WriteFileError (boost::filesystem::path f, int e);
 };
 
 /** @class SettingError.
@@ -192,9 +183,7 @@ class MissingSettingError : public SettingError
 {
 public:
 	/** @param s Name of setting that was required */
-	MissingSettingError (std::string s)
-		: SettingError (s, "missing required setting " + s)
-	{}
+	MissingSettingError (std::string s);
 };
 
 /** @class BadSettingError
@@ -220,18 +209,45 @@ public:
 	{}
 };
 
-class PlayError : public StringError
+class KDMError : public StringError
 {
 public:
-	PlayError (std::string s)
+	KDMError (std::string s)
 		: StringError (s)
 	{}
 };
 
-class DVDError : public StringError
+class PixelFormatError : public StringError
 {
 public:
-	DVDError (std::string s)
-		: StringError (s)
-	{}
+	PixelFormatError (std::string o, AVPixelFormat f);
+};
+
+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);
+	}
+
+protected:	
+	
+	void store_current () {
+		boost::mutex::scoped_lock lm (_mutex);
+		_exception = boost::current_exception ();
+	}
+
+private:
+	boost::exception_ptr _exception;
+	mutable boost::mutex _mutex;
 };
+
+	
+
+#endif