summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/sc3000_bit.cpp
diff options
context:
space:
mode:
author Nathan Woods <npwoods@mess.org>2016-08-20 19:59:04 -0400
committer Nathan Woods <npwoods@mess.org>2016-08-20 19:59:04 -0400
commitd1227cb38f2a943fbaf7152bd1b7d9ab946609b5 (patch)
treecb650bd84857250710aefe3ad63938c7da62e6ec /src/lib/formats/sc3000_bit.cpp
parent02b9749216c061ab7f648d363585e30c07a64af5 (diff)
casserr_t ==> enum class cassette_image::error
Diffstat (limited to 'src/lib/formats/sc3000_bit.cpp')
-rw-r--r--src/lib/formats/sc3000_bit.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/formats/sc3000_bit.cpp b/src/lib/formats/sc3000_bit.cpp
index f15488bda68..8143c52e14d 100644
--- a/src/lib/formats/sc3000_bit.cpp
+++ b/src/lib/formats/sc3000_bit.cpp
@@ -37,7 +37,7 @@ static const struct CassetteModulation sc3000_bit_modulation =
sc3000_bit_identify - identify cassette
-------------------------------------------------*/
-static casserr_t sc3000_bit_identify(cassette_image *cassette, struct CassetteOptions *opts)
+static cassette_image::error sc3000_bit_identify(cassette_image *cassette, struct CassetteOptions *opts)
{
return cassette_modulation_identify( cassette, &sc3000_bit_modulation, opts);
}
@@ -49,13 +49,13 @@ static casserr_t sc3000_bit_identify(cassette_image *cassette, struct CassetteOp
#define MODULATE(_value) \
for (int i = 0; i < (_value ? 2 : 1); i++) { \
err = cassette_put_modulated_data_bit(cassette, 0, time_index, _value, &sc3000_bit_modulation, &time_displacement);\
- if (err) return err;\
+ if (err != cassette_image::error::SUCCESS) return err;\
time_index += time_displacement;\
}
-static casserr_t sc3000_bit_load(cassette_image *cassette)
+static cassette_image::error sc3000_bit_load(cassette_image *cassette)
{
- casserr_t err;
+ cassette_image::error err;
UINT64 image_size = cassette_image_size(cassette);
UINT64 image_pos = 0;
double time_index = 0.0;
@@ -78,7 +78,7 @@ static casserr_t sc3000_bit_load(cassette_image *cassette)
case ' ':
err = cassette_put_sample( cassette, 0, time_index, 1/1200.0, 0);
- if (err) return err;
+ if (err != cassette_image::error::SUCCESS) return err;
time_index += 1/1200.0;
break;
}
@@ -86,7 +86,7 @@ static casserr_t sc3000_bit_load(cassette_image *cassette)
image_pos++;
}
- return CASSETTE_ERROR_SUCCESS;
+ return cassette_image::error::SUCCESS;
}
/*-------------------------------------------------