projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Barely-functioning GL playback with new arrangement.
[dcpomatic.git]
/
src
/
lib
/
exceptions.h
diff --git
a/src/lib/exceptions.h
b/src/lib/exceptions.h
index 99a8c0dc47dcb585b95a25f436e64c1fdee3c85b..ddd1e36035f9dfb6a5e71827a2b47f8c978da3f0 100644
(file)
--- a/
src/lib/exceptions.h
+++ b/
src/lib/exceptions.h
@@
-39,7
+39,15
@@
extern "C" {
class DecodeError : public std::runtime_error
{
public:
class DecodeError : public std::runtime_error
{
public:
- DecodeError (std::string s)
+ explicit DecodeError (std::string s)
+ : std::runtime_error (s)
+ {}
+};
+
+class CryptoError : public std::runtime_error
+{
+public:
+ explicit CryptoError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-50,7
+58,7
@@
public:
class EncodeError : public std::runtime_error
{
public:
class EncodeError : public std::runtime_error
{
public:
- EncodeError (std::string s)
+
explicit
EncodeError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-84,7
+92,7
@@
private:
class JoinError : public std::runtime_error
{
public:
class JoinError : public std::runtime_error
{
public:
- JoinError (std::string s)
+
explicit
JoinError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-95,11
+103,17
@@
public:
class OpenFileError : public FileError
{
public:
class OpenFileError : public FileError
{
public:
+ enum Mode {
+ READ,
+ WRITE,
+ READ_WRITE
+ };
+
/** @param f File that we were trying to open.
* @param error Code of error that occurred.
/** @param f File that we were trying to open.
* @param error Code of error that occurred.
- * @param
reading true if we were opening to read, false if opening to write
.
+ * @param
mode Mode that we tried to open the file in
.
*/
*/
- OpenFileError (boost::filesystem::path f, int error,
bool reading
);
+ OpenFileError (boost::filesystem::path f, int error,
Mode mode
);
};
/** @class ReadFileError.
};
/** @class ReadFileError.
@@
-158,7
+172,7
@@
class MissingSettingError : public SettingError
{
public:
/** @param s Name of setting that was required */
{
public:
/** @param s Name of setting that was required */
- MissingSettingError (std::string s);
+
explicit
MissingSettingError (std::string s);
};
/** @class BadSettingError
};
/** @class BadSettingError
@@
-167,7
+181,9
@@
public:
class BadSettingError : public SettingError
{
public:
class BadSettingError : public SettingError
{
public:
- /** @param s Name of setting that is bad */
+ /** @param s Name of setting that is bad.
+ * @param m Error message.
+ */
BadSettingError (std::string s, std::string m)
: SettingError (s, m)
{}
BadSettingError (std::string s, std::string m)
: SettingError (s, m)
{}
@@
-179,7
+195,7
@@
public:
class NetworkError : public std::runtime_error
{
public:
class NetworkError : public std::runtime_error
{
public:
- NetworkError (std::string s)
+
explicit
NetworkError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-190,9
+206,20
@@
public:
class KDMError : public std::runtime_error
{
public:
class KDMError : public std::runtime_error
{
public:
- KDMError (std::string s)
- : std::runtime_error (s)
- {}
+ KDMError (std::string s, std::string d);
+ ~KDMError () throw() {}
+
+ std::string summary () const {
+ return _summary;
+ }
+
+ std::string detail () const {
+ return _detail;
+ }
+
+private:
+ std::string _summary;
+ std::string _detail;
};
/** @class PixelFormatError
};
/** @class PixelFormatError
@@
-216,7
+243,7
@@
public:
class DCPError : public std::runtime_error
{
public:
class DCPError : public std::runtime_error
{
public:
- DCPError (std::string s)
+
explicit
DCPError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-225,19
+252,27
@@
class InvalidSignerError : public std::runtime_error
{
public:
InvalidSignerError ();
{
public:
InvalidSignerError ();
- InvalidSignerError (std::string reason);
+
explicit
InvalidSignerError (std::string reason);
};
class ProgrammingError : public std::runtime_error
{
public:
};
class ProgrammingError : public std::runtime_error
{
public:
- ProgrammingError (std::string file, int line);
+ ProgrammingError (std::string file, int line
, std::string message = ""
);
};
class TextEncodingError : public std::runtime_error
{
public:
};
class TextEncodingError : public std::runtime_error
{
public:
- TextEncodingError (std::string s)
+ explicit TextEncodingError (std::string s)
+ : std::runtime_error (s)
+ {}
+};
+
+class MetadataError : public std::runtime_error
+{
+public:
+ explicit MetadataError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
@@
-245,9
+280,22
@@
public:
class OldFormatError : public std::runtime_error
{
public:
class OldFormatError : public std::runtime_error
{
public:
- OldFormatError (std::string s)
+
explicit
OldFormatError (std::string s)
: std::runtime_error (s)
{}
};
: std::runtime_error (s)
{}
};
+class KDMAsContentError : public std::runtime_error
+{
+public:
+ KDMAsContentError ();
+};
+
+class GLError : public std::runtime_error
+{
+public:
+ GLError (char const * last, int e);
+};
+
+
#endif
#endif