From d1227cb38f2a943fbaf7152bd1b7d9ab946609b5 Mon Sep 17 00:00:00 2001 From: Nathan Woods Date: Sat, 20 Aug 2016 19:59:04 -0400 Subject: casserr_t ==> enum class cassette_image::error --- src/lib/formats/sc3000_bit.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib/formats/sc3000_bit.cpp') 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; } /*------------------------------------------------- -- cgit v1.2.3-70-g09d2