From 320d979924e121595237d1878c607a2710e637ab Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Tue, 21 Jun 2016 11:13:58 -0700
Subject: [PATCH] Simplify CaptureThread error callback functions.

---
 firmware/application/ui_record_view.cpp | 10 +++++-----
 firmware/application/ui_record_view.hpp |  8 ++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/firmware/application/ui_record_view.cpp b/firmware/application/ui_record_view.cpp
index a11aefd32..829d8b0f5 100644
--- a/firmware/application/ui_record_view.cpp
+++ b/firmware/application/ui_record_view.cpp
@@ -233,7 +233,7 @@ void RecordView::start() {
 				filename_stem + ".WAV"
 			);
 			if( create_error.is_valid() ) {
-				report_error(create_error.value().what());
+				handle_error(create_error.value());
 			} else {
 				writer = std::move(p);
 			}
@@ -244,7 +244,7 @@ void RecordView::start() {
 		{
 			const auto metadata_file_error = write_metadata_file(filename_stem + ".TXT");
 			if( metadata_file_error.is_valid() ) {
-				report_error(metadata_file_error.value().what());
+				handle_error(metadata_file_error.value());
 				return;
 			}
 
@@ -253,7 +253,7 @@ void RecordView::start() {
 				filename_stem + ".C16"
 			);
 			if( create_error.is_valid() ) {
-				report_error(create_error.value().what());
+				handle_error(create_error.value());
 			} else {
 				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();
 	if( on_error ) {
-		on_error(message);
+		on_error(error.what());
 	}
 }
 
diff --git a/firmware/application/ui_record_view.hpp b/firmware/application/ui_record_view.hpp
index d6111bf13..14f498773 100644
--- a/firmware/application/ui_record_view.hpp
+++ b/firmware/application/ui_record_view.hpp
@@ -79,7 +79,7 @@ private:
 
 	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 FileType file_type;
@@ -120,13 +120,9 @@ private:
 		Message::ID::CaptureThreadError,
 		[this](const Message* const 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 */