projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add AudioMapping::take_from().
[dcpomatic.git]
/
src
/
lib
/
disk_writer_messages.h
diff --git
a/src/lib/disk_writer_messages.h
b/src/lib/disk_writer_messages.h
index 8bd1837a83946c6882d55d1b70bbe0ec3e901394..2fa225d851a5d9624003fa21b01007cf49582301 100644
(file)
--- a/
src/lib/disk_writer_messages.h
+++ b/
src/lib/disk_writer_messages.h
@@
-58,6
+58,7
@@
class Nanomsg;
#define DISK_WRITER_ERROR "E"
// Error message
// Error number
#define DISK_WRITER_ERROR "E"
// Error message
// Error number
+// Additional error number (a platform-specific error from lwext4)
// the drive is being formatted, 40% done
#define DISK_WRITER_FORMAT_PROGRESS "F"
// the drive is being formatted, 40% done
#define DISK_WRITER_FORMAT_PROGRESS "F"
@@
-106,10
+107,11
@@
public:
return DiskWriterBackEndResponse(Type::OK);
}
return DiskWriterBackEndResponse(Type::OK);
}
- static DiskWriterBackEndResponse error(std::string message, int number) {
+ static DiskWriterBackEndResponse error(std::string message, int
ext4_number, int platform_
number) {
auto r = DiskWriterBackEndResponse(Type::ERROR);
r._error_message = message;
auto r = DiskWriterBackEndResponse(Type::ERROR);
r._error_message = message;
- r._error_number = number;
+ r._ext4_error_number = ext4_number;
+ r._platform_error_number = platform_number;
return r;
}
return r;
}
@@
-147,8
+149,12
@@
public:
return _error_message;
}
return _error_message;
}
- int error_number() const {
- return _error_number;
+ int ext4_error_number() const {
+ return _ext4_error_number;
+ }
+
+ int platform_error_number() const {
+ return _platform_error_number;
}
float progress() const {
}
float progress() const {
@@
-162,7
+168,8
@@
private:
Type _type;
std::string _error_message;
Type _type;
std::string _error_message;
- int _error_number = 0;
+ int _ext4_error_number = 0;
+ int _platform_error_number = 0;
float _progress = 0;
};
float _progress = 0;
};