projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
exceptions.cc
diff --git
a/src/lib/exceptions.cc
b/src/lib/exceptions.cc
index bc6ac27c872a08c04c4de447a37f6f0cbcaedb0c..e05ac4ff04b3fdebb5617129f5c9a0eb6c9dc10e 100644
(file)
--- a/
src/lib/exceptions.cc
+++ b/
src/lib/exceptions.cc
@@
-25,29
+25,29
@@
using std::string;
/** @param f File that we were trying to open */
using std::string;
/** @param f File that we were trying to open */
-OpenFileError::OpenFileError (
string
f)
- : FileError (String::compose (_("could not open file %1"), f), f)
+OpenFileError::OpenFileError (
boost::filesystem::path
f)
+ : FileError (String::compose (_("could not open file %1"), f
.string()
), f)
{
}
/** @param f File that we were trying to create */
{
}
/** @param f File that we were trying to create */
-CreateFileError::CreateFileError (
string
f)
- : FileError (String::compose (_("could not create file %1"), f), f)
+CreateFileError::CreateFileError (
boost::filesystem::path
f)
+ : FileError (String::compose (_("could not create file %1"), f
.string()
), f)
{
}
{
}
-ReadFileError::ReadFileError (
string
f, int e)
- : FileError (
""
, f)
+ReadFileError::ReadFileError (
boost::filesystem::path
f, int e)
+ : FileError (
String::compose (_("could not read from file %1 (%2)"), f.string(), strerror (e))
, f)
{
{
- _what = String::compose (_("could not read from file %1 (%2)"), f, strerror (e));
+
}
}
-WriteFileError::WriteFileError (
std::string
f, int e)
- : FileError (
""
, f)
+WriteFileError::WriteFileError (
boost::filesystem::path
f, int e)
+ : FileError (
String::compose (_("could not write to file %1 (%2)"), f.string(), strerror (e))
, f)
{
{
- _what = String::compose (_("could not write to file %1 (%2)"), f, strerror (e));
+
}
MissingSettingError::MissingSettingError (string s)
}
MissingSettingError::MissingSettingError (string s)
@@
-56,8
+56,14
@@
MissingSettingError::MissingSettingError (string s)
}
}
-PixelFormatError::PixelFormatError (st
d::st
ring o, AVPixelFormat f)
+PixelFormatError::PixelFormatError (string o, AVPixelFormat f)
: StringError (String::compose (_("Cannot handle pixel format %1 during %2"), f, o))
{
}
: StringError (String::compose (_("Cannot handle pixel format %1 during %2"), f, o))
{
}
+
+SubRipError::SubRipError (string saw, string expecting, boost::filesystem::path f)
+ : FileError (String::compose (_("Error in SubRip file: saw %1 while expecting %2"), saw, expecting), f)
+{
+
+}