projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 1.0 in.
[dcpomatic.git]
/
src
/
lib
/
exceptions.h
diff --git
a/src/lib/exceptions.h
b/src/lib/exceptions.h
index e45a62353bf57fa7085701828ccfbc6eec1d2791..b04d973dc7a62197571ce7d6697917f2023b23e0 100644
(file)
--- a/
src/lib/exceptions.h
+++ b/
src/lib/exceptions.h
@@
-17,8
+17,8
@@
*/
*/
-#ifndef D
VD
OMATIC_EXCEPTIONS_H
-#define D
VD
OMATIC_EXCEPTIONS_H
+#ifndef D
CP
OMATIC_EXCEPTIONS_H
+#define D
CP
OMATIC_EXCEPTIONS_H
/** @file src/exceptions.h
* @brief Our exceptions.
/** @file src/exceptions.h
* @brief Our exceptions.
@@
-27,6
+27,7
@@
#include <stdexcept>
#include <cstring>
#include <boost/exception/all.hpp>
#include <stdexcept>
#include <cstring>
#include <boost/exception/all.hpp>
+#include <boost/filesystem.hpp>
#include <boost/thread.hpp>
extern "C" {
#include <libavutil/pixfmt.h>
#include <boost/thread.hpp>
extern "C" {
#include <libavutil/pixfmt.h>
@@
-87,7
+88,7
@@
public:
/** @param m Error message.
* @param f Name of the file that this exception concerns.
*/
/** @param m Error message.
* @param f Name of the file that this exception concerns.
*/
- FileError (std::string m,
std::string
f)
+ FileError (std::string m,
boost::filesystem::path
f)
: StringError (m)
, _file (f)
{}
: StringError (m)
, _file (f)
{}
@@
-95,13
+96,13
@@
public:
virtual ~FileError () throw () {}
/** @return name of the file that this exception concerns */
virtual ~FileError () throw () {}
/** @return name of the file that this exception concerns */
-
std::string
file () const {
+
boost::filesystem::path
file () const {
return _file;
}
private:
/** name of the file that this exception concerns */
return _file;
}
private:
/** name of the file that this exception concerns */
-
std::string
_file;
+
boost::filesystem::path
_file;
};
};
@@
-112,7
+113,7
@@
class OpenFileError : public FileError
{
public:
/** @param f File that we were trying to open */
{
public:
/** @param f File that we were trying to open */
- OpenFileError (
std::string
f);
+ OpenFileError (
boost::filesystem::path
f);
};
/** @class CreateFileError.
};
/** @class CreateFileError.
@@
-122,7
+123,7
@@
class CreateFileError : public FileError
{
public:
/** @param f File that we were trying to create */
{
public:
/** @param f File that we were trying to create */
- CreateFileError (
std::string
f);
+ CreateFileError (
boost::filesystem::path
f);
};
};
@@
-135,7
+136,7
@@
public:
/** @param f File that we were trying to read from.
* @param e errno value, or 0.
*/
/** @param f File that we were trying to read from.
* @param e errno value, or 0.
*/
- ReadFileError (
std::string
f, int e = 0);
+ ReadFileError (
boost::filesystem::path
f, int e = 0);
};
/** @class WriteFileError.
};
/** @class WriteFileError.
@@
-147,7
+148,7
@@
public:
/** @param f File that we were trying to write to.
* @param e errno value, or 0.
*/
/** @param f File that we were trying to write to.
* @param e errno value, or 0.
*/
- WriteFileError (
std::string
f, int e);
+ WriteFileError (
boost::filesystem::path
f, int e);
};
/** @class SettingError.
};
/** @class SettingError.
@@
-208,6
+209,14
@@
public:
{}
};
{}
};
+class KDMError : public StringError
+{
+public:
+ KDMError (std::string s)
+ : StringError (s)
+ {}
+};
+
class PixelFormatError : public StringError
{
public:
class PixelFormatError : public StringError
{
public: