From ede47d4ba71ce6f61b337203caa1fe131206e3dd Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sun, 12 Nov 2017 16:42:53 -0500
Subject: [PATCH] Improves type safety within CSW file support.

---
 Storage/Tape/Formats/CSW.cpp | 24 ++++++++++++------------
 Storage/Tape/Formats/CSW.hpp |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Storage/Tape/Formats/CSW.cpp b/Storage/Tape/Formats/CSW.cpp
index 5b15b0f7b..3df5f9592 100644
--- a/Storage/Tape/Formats/CSW.cpp
+++ b/Storage/Tape/Formats/CSW.cpp
@@ -36,7 +36,7 @@ CSW::CSW(const char *file_name) :
 		pulse_.length.clock_rate = file_.get16le();
 
 		if(file_.get8() != 1) throw ErrorNotCSW;
-		compression_type_ = RLE;
+		compression_type_ = CompressionType::RLE;
 
 		pulse_.type = (file_.get8() & 1) ? Pulse::High : Pulse::Low;
 
@@ -45,8 +45,8 @@ CSW::CSW(const char *file_name) :
 		pulse_.length.clock_rate = file_.get32le();
 		number_of_waves = file_.get32le();
 		switch(file_.get8()) {
-			case 1: compression_type_ = RLE;	break;
-			case 2: compression_type_ = ZRLE;	break;
+			case 1: compression_type_ = CompressionType::RLE;	break;
+			case 2: compression_type_ = CompressionType::ZRLE;	break;
 			default: throw ErrorNotCSW;
 		}
 
@@ -57,7 +57,7 @@ CSW::CSW(const char *file_name) :
 		file_.seek(0x34 + extension_length, SEEK_SET);
 	}
 
-	if(compression_type_ == ZRLE) {
+	if(compression_type_ == CompressionType::ZRLE) {
 		// The only clue given by CSW as to the output size in bytes is that there will be
 		// number_of_waves waves. Waves are usually one byte, but may be five. So this code
 		// is pessimistic.
@@ -83,8 +83,8 @@ CSW::CSW(const char *file_name) :
 
 uint8_t CSW::get_next_byte() {
 	switch(compression_type_) {
-		case RLE: return file_.get8();
-		case ZRLE: {
+		case CompressionType::RLE: return file_.get8();
+		case CompressionType::ZRLE: {
 			if(source_data_pointer_ == source_data_.size()) return 0xff;
 			uint8_t result = source_data_[source_data_pointer_];
 			source_data_pointer_++;
@@ -95,8 +95,8 @@ uint8_t CSW::get_next_byte() {
 
 uint32_t CSW::get_next_int32le() {
 	switch(compression_type_) {
-		case RLE: return file_.get32le();
-		case ZRLE: {
+		case CompressionType::RLE: return file_.get32le();
+		case CompressionType::ZRLE: {
 			if(source_data_pointer_ > source_data_.size() - 4) return 0xffff;
 			uint32_t result = (uint32_t)(
 				(source_data_[source_data_pointer_ + 0] << 0) |
@@ -115,15 +115,15 @@ void CSW::invert_pulse() {
 
 bool CSW::is_at_end() {
 	switch(compression_type_) {
-		case RLE: return file_.eof();
-		case ZRLE: return source_data_pointer_ == source_data_.size();
+		case CompressionType::RLE: return file_.eof();
+		case CompressionType::ZRLE: return source_data_pointer_ == source_data_.size();
 	}
 }
 
 void CSW::virtual_reset() {
 	switch(compression_type_) {
-		case RLE:	file_.seek(rle_start_, SEEK_SET);	break;
-		case ZRLE:	source_data_pointer_ = 0;			break;
+		case CompressionType::RLE:	file_.seek(rle_start_, SEEK_SET);	break;
+		case CompressionType::ZRLE:	source_data_pointer_ = 0;			break;
 	}
 }
 
diff --git a/Storage/Tape/Formats/CSW.hpp b/Storage/Tape/Formats/CSW.hpp
index c5df8e7bb..f05df8c3a 100644
--- a/Storage/Tape/Formats/CSW.hpp
+++ b/Storage/Tape/Formats/CSW.hpp
@@ -44,7 +44,7 @@ class CSW: public Tape {
 		Pulse virtual_get_next_pulse();
 
 		Pulse pulse_;
-		enum CompressionType {
+		enum class CompressionType {
 			RLE,
 			ZRLE
 		} compression_type_;