X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdisk_writer_messages.h;h=2fa225d851a5d9624003fa21b01007cf49582301;hb=cc39c4f57fc48c581a25dc4c37f26adf95278914;hp=ff6a0b394196f620dcc0b400d52645205646ca9d;hpb=50314d71c36895cab87c44be772589fafea894f8;p=dcpomatic.git diff --git a/src/lib/disk_writer_messages.h b/src/lib/disk_writer_messages.h index ff6a0b394..2fa225d85 100644 --- 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 +// Additional error number (a platform-specific error from lwext4) // the drive is being formatted, 40% done #define DISK_WRITER_FORMAT_PROGRESS "F" @@ -106,10 +107,11 @@ public: 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; - r._error_number = number; + r._ext4_error_number = ext4_number; + r._platform_error_number = platform_number; return r; } @@ -137,6 +139,8 @@ public: static boost::optional read_from_nanomsg(Nanomsg& nanomsg, int timeout); + bool write_to_nanomsg(Nanomsg& nanomsg, int timeout) const; + Type type() const { return _type; } @@ -145,8 +149,12 @@ public: 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 { @@ -160,7 +168,8 @@ private: Type _type; std::string _error_message; - int _error_number = 0; + int _ext4_error_number = 0; + int _platform_error_number = 0; float _progress = 0; };