6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-05 10:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Improves type safety within CSW file support.

Browse Source
This commit is contained in:
Thomas Harte 2017-11-12 16:42:53 -05:00
parent 5408efe9b5
commit ede47d4ba7
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Storage/Tape/Formats/CSW.cpp
View File

@ -36,7 +36,7 @@ CSW::CSW(const char *file_name) :
pulse_.length.clock_rate = file_.get16le(); pulse_.length.clock_rate = file_.get16le();
if(file_.get8() != 1) throw ErrorNotCSW; if(file_.get8() != 1) throw ErrorNotCSW;
compression_type_ = RLE; compression_type_ = CompressionType::RLE;
pulse_.type = (file_.get8() & 1) ? Pulse::High : Pulse::Low; 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(); pulse_.length.clock_rate = file_.get32le();
number_of_waves = file_.get32le(); number_of_waves = file_.get32le();
switch(file_.get8()) { switch(file_.get8()) {
case 1: compression_type_ = RLE; break; case 1: compression_type_ = CompressionType::RLE; break;
case 2: compression_type_ = ZRLE; break; case 2: compression_type_ = CompressionType::ZRLE; break;
default: throw ErrorNotCSW; default: throw ErrorNotCSW;
} }
@ -57,7 +57,7 @@ CSW::CSW(const char *file_name) :
file_.seek(0x34 + extension_length, SEEK_SET); 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 // 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 // number_of_waves waves. Waves are usually one byte, but may be five. So this code
// is pessimistic. // is pessimistic.
@ -83,8 +83,8 @@ CSW::CSW(const char *file_name) :
uint8_t CSW::get_next_byte() { uint8_t CSW::get_next_byte() {
switch(compression_type_) { switch(compression_type_) {
case RLE: return file_.get8(); case CompressionType::RLE: return file_.get8();
case ZRLE: { case CompressionType::ZRLE: {
if(source_data_pointer_ == source_data_.size()) return 0xff; if(source_data_pointer_ == source_data_.size()) return 0xff;
uint8_t result = source_data_[source_data_pointer_]; uint8_t result = source_data_[source_data_pointer_];
source_data_pointer_++; source_data_pointer_++;
@ -95,8 +95,8 @@ uint8_t CSW::get_next_byte() {
uint32_t CSW::get_next_int32le() { uint32_t CSW::get_next_int32le() {
switch(compression_type_) { switch(compression_type_) {
case RLE: return file_.get32le(); case CompressionType::RLE: return file_.get32le();
case ZRLE: { case CompressionType::ZRLE: {
if(source_data_pointer_ > source_data_.size() - 4) return 0xffff; if(source_data_pointer_ > source_data_.size() - 4) return 0xffff;
uint32_t result = (uint32_t)( uint32_t result = (uint32_t)(
(source_data_[source_data_pointer_ + 0] << 0) | (source_data_[source_data_pointer_ + 0] << 0) |
@ -115,15 +115,15 @@ void CSW::invert_pulse() {
bool CSW::is_at_end() { bool CSW::is_at_end() {
switch(compression_type_) { switch(compression_type_) {
case RLE: return file_.eof(); case CompressionType::RLE: return file_.eof();
case ZRLE: return source_data_pointer_ == source_data_.size(); case CompressionType::ZRLE: return source_data_pointer_ == source_data_.size();
} }
} }
void CSW::virtual_reset() { void CSW::virtual_reset() {
switch(compression_type_) { switch(compression_type_) {
case RLE: file_.seek(rle_start_, SEEK_SET); break; case CompressionType::RLE: file_.seek(rle_start_, SEEK_SET); break;
case ZRLE: source_data_pointer_ = 0; break; case CompressionType::ZRLE: source_data_pointer_ = 0; break;
} }
} }

2
Storage/Tape/Formats/CSW.hpp
View File

@ -44,7 +44,7 @@ class CSW: public Tape {
Pulse virtual_get_next_pulse(); Pulse virtual_get_next_pulse();
Pulse pulse_; Pulse pulse_;
enum CompressionType { enum class CompressionType {
RLE, RLE,
ZRLE ZRLE
} compression_type_; } compression_type_;