Merge branch 'master' into content-rework-take5

[dcpomatic.git] / src / lib / exceptions.h

diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 6de8806e4e8debc24eeef6100235a9a44498f96f..6920556e5c05a95a24eadfe398c226a4c0df3cb3 100644 (file)
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -28,7 +28,9 @@
 #include <cstring>
 #include <boost/exception/all.hpp>
 #include <boost/thread.hpp>
-#include "compose.hpp"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
 
 /** @class StringError
  *  @brief A parent class for exceptions using messages held in a std::string
@@ -110,9 +112,8 @@ 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)
-       {}
+       /* XXX: should be boost::filesystem::path */
+       OpenFileError (std::string f);
 };
 
 /** @class CreateFileError.
@@ -122,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 (std::string f);
 };
 
 
@@ -137,11 +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 = 0)
-               : FileError ("", f)
-       {
-               _what = String::compose ("could not read from file %1 (%2)", f, strerror (e));
-       }
+       ReadFileError (std::string f, int e = 0);
 };
 
 /** @class WriteFileError.
@@ -153,11 +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)
-       {
-               _what = String::compose ("could not write to file %1 (%2)", f, strerror (e));
-       }
+       WriteFileError (std::string 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,6 +209,12 @@ public:
        {}
 };
 
+class PixelFormatError : public StringError
+{
+public:
+       PixelFormatError (std::string o, AVPixelFormat f);
+};
+
 class ExceptionStore
 {
 public:
@@ -245,4 +240,6 @@ private:
        mutable boost::mutex _mutex;
 };
 
+       
+
 #endif