projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump ffmpeg to 5.1.2 "Riemann"
[dcpomatic.git]
/
src
/
lib
/
exceptions.h
diff --git
a/src/lib/exceptions.h
b/src/lib/exceptions.h
index a8f095c22a2fba730ceb941286229424114d7236..10231f59acaf24571c890361ec15f8094d33e3c6 100644
(file)
--- a/
src/lib/exceptions.h
+++ b/
src/lib/exceptions.h
@@
-253,19
+253,19
@@
public:
class NetworkError : public std::runtime_error
{
public:
class NetworkError : public std::runtime_error
{
public:
- explicit NetworkError (std::string s,
std::string d = ""
);
+ explicit NetworkError (std::string s,
boost::optional<std::string> d = boost::optional<std::string>()
);
std::string summary () const {
return _summary;
}
std::string summary () const {
return _summary;
}
-
std::string
detail () const {
+
boost::optional<std::string>
detail () const {
return _detail;
}
private:
std::string _summary;
return _detail;
}
private:
std::string _summary;
-
std::string
_detail;
+
boost::optional<std::string>
_detail;
};
};
@@
-335,6
+335,15
@@
public:
};
};
+class CPLNotFoundError : public DCPError
+{
+public:
+ CPLNotFoundError(std::string id)
+ : DCPError(String::compose("CPL %1 not found", id))
+ {}
+};
+
+
class InvalidSignerError : public std::runtime_error
{
public:
class InvalidSignerError : public std::runtime_error
{
public:
@@
-342,8
+351,8
@@
public:
explicit InvalidSignerError (std::string reason);
};
explicit InvalidSignerError (std::string reason);
};
-class ProgrammingError : public std::runtime_error
+class ProgrammingError : public std::runtime_error
{
public:
ProgrammingError (std::string file, int line, std::string message = "");
{
public:
ProgrammingError (std::string file, int line, std::string message = "");
@@
-398,25
+407,30
@@
public:
class CopyError : public std::runtime_error
{
public:
class CopyError : public std::runtime_error
{
public:
- CopyError (std::string s, boost::optional<int>
n
= boost::optional<int>());
+ CopyError (std::string s, boost::optional<int>
ext4_error = boost::optional<int>(), boost::optional<int> platform_error
= boost::optional<int>());
virtual ~CopyError () throw () {}
std::string message () const {
return _message;
}
virtual ~CopyError () throw () {}
std::string message () const {
return _message;
}
- boost::optional<int> number () const {
- return _number;
+ boost::optional<int> ext4_number() const {
+ return _ext4_number;
+ }
+
+ boost::optional<int> platform_number() const {
+ return _platform_number;
}
private:
std::string _message;
}
private:
std::string _message;
- boost::optional<int> _number;
+ boost::optional<int> _ext4_number;
+ boost::optional<int> _platform_number;
};
/** @class CommunicationFailedError
};
/** @class CommunicationFailedError
- * @brief Communcation between dcpomatic2_disk and _disk_writer failed somehow.
+ * @brief Commun
i
cation between dcpomatic2_disk and _disk_writer failed somehow.
*/
class CommunicationFailedError : public CopyError
{
*/
class CommunicationFailedError : public CopyError
{
@@
-452,8
+466,17
@@
class PrivilegeError : public std::runtime_error
{
public:
explicit PrivilegeError (std::string s)
{
public:
explicit PrivilegeError (std::string s)
- : std::runtime_error (s)
- {}
+ : std::runtime_error (s)
+ {}
+};
+
+
+class MissingConfigurationError : public std::runtime_error
+{
+public:
+ explicit MissingConfigurationError(std::string s)
+ : std::runtime_error(s)
+ {}
};
};