projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make FileError say what path the problem was with.
[dcpomatic.git]
/
src
/
lib
/
exceptions.h
diff --git
a/src/lib/exceptions.h
b/src/lib/exceptions.h
index fe87ababcad292335b52ed07d0328c19484420bb..99f0a5d8735e83c9fca7a57f8b4f2fafc40846ba 100644
(file)
--- a/
src/lib/exceptions.h
+++ b/
src/lib/exceptions.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-25,6
+25,7
@@
#ifndef DCPOMATIC_EXCEPTIONS_H
#define DCPOMATIC_EXCEPTIONS_H
#ifndef DCPOMATIC_EXCEPTIONS_H
#define DCPOMATIC_EXCEPTIONS_H
+#include "compose.hpp"
extern "C" {
#include <libavutil/pixfmt.h>
}
extern "C" {
#include <libavutil/pixfmt.h>
}
@@
-73,7
+74,7
@@
public:
* @param f Name of the file that this exception concerns.
*/
FileError (std::string m, boost::filesystem::path f)
* @param f Name of the file that this exception concerns.
*/
FileError (std::string m, boost::filesystem::path f)
- : std::runtime_error (
m
)
+ : std::runtime_error (
String::compose("%1 with %2", m, f.string())
)
, _file (f)
{}
, _file (f)
{}
@@
-103,11
+104,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.