TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-14 04:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify CaptureThread error callback functions.

Browse Source
This commit is contained in:
Jared Boone 2016-06-21 11:13:58 -07:00
parent cfaa44b02a
commit 320d979924
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/application/ui_record_view.cpp
View File

@ -233,7 +233,7 @@ void RecordView::start() {
filename_stem + ".WAV" filename_stem + ".WAV"
); );
if( create_error.is_valid() ) { if( create_error.is_valid() ) {
report_error(create_error.value().what()); handle_error(create_error.value());
} else { } else {
writer = std::move(p); writer = std::move(p);
} }
@ -244,7 +244,7 @@ void RecordView::start() {
{ {
const auto metadata_file_error = write_metadata_file(filename_stem + ".TXT"); const auto metadata_file_error = write_metadata_file(filename_stem + ".TXT");
if( metadata_file_error.is_valid() ) { if( metadata_file_error.is_valid() ) {
report_error(metadata_file_error.value().what()); handle_error(metadata_file_error.value());
return; return;
} }
@ -253,7 +253,7 @@ void RecordView::start() {
filename_stem + ".C16" filename_stem + ".C16"
); );
if( create_error.is_valid() ) { if( create_error.is_valid() ) {
report_error(create_error.value().what()); handle_error(create_error.value());
} else { } else {
writer = std::move(p); writer = std::move(p);
} }
@ -326,10 +326,10 @@ void RecordView::on_tick_second() {
} }
} }
void RecordView::report_error(const std::string& message) { void RecordView::handle_error(const File::Error error) {
stop(); stop();
if( on_error ) { if( on_error ) {
on_error(message); on_error(error.what());
} }
} }

8
firmware/application/ui_record_view.hpp
View File

@ -79,7 +79,7 @@ private:
void on_tick_second(); void on_tick_second();
void report_error(const std::string& message); void handle_error(const File::Error error);
const std::string filename_stem_pattern; const std::string filename_stem_pattern;
const FileType file_type; const FileType file_type;
@ -120,13 +120,9 @@ private:
Message::ID::CaptureThreadError, Message::ID::CaptureThreadError,
[this](const Message* const p) { [this](const Message* const p) {
const auto message = *reinterpret_cast<const CaptureThreadErrorMessage*>(p); const auto message = *reinterpret_cast<const CaptureThreadErrorMessage*>(p);
this->on_capture_thread_error(message.error); this->handle_error(message.error);
} }
}; };
void on_capture_thread_error(File::Error error) {
report_error(error.what());
}
}; };
} /* namespace ui */ } /* namespace ui */