diff options
Diffstat (limited to 'src/lib/formats/mbee_cas.cpp')
-rw-r--r-- | src/lib/formats/mbee_cas.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/formats/mbee_cas.cpp b/src/lib/formats/mbee_cas.cpp index 24024f66f5d..f8c42602b2b 100644 --- a/src/lib/formats/mbee_cas.cpp +++ b/src/lib/formats/mbee_cas.cpp @@ -56,8 +56,6 @@ TAP - has an ID header of TAP_DGOS_BEE or MBEE, null terminated. ********************************************************************/ -#include <assert.h> - #include "mbee_cas.h" #define WAVEENTRY_LOW -32768 @@ -211,7 +209,7 @@ static int mbee_handle_tap(int16_t *buffer, const uint8_t *bytes) Generate samples for the tape image ********************************************************************/ -static int mbee_tap_fill_wave(int16_t *buffer, int length, uint8_t *bytes) +static int mbee_tap_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int) { return mbee_handle_tap(buffer, bytes); } @@ -227,7 +225,7 @@ static int mbee_tap_calculate_size_in_samples(const uint8_t *bytes, int length) return mbee_handle_tap(nullptr, bytes); } -static const struct CassetteLegacyWaveFiller mbee_tap_config = +static const cassette_image::LegacyWaveFiller mbee_tap_config = { mbee_tap_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -238,17 +236,17 @@ static const struct CassetteLegacyWaveFiller mbee_tap_config = 0 /* trailer_samples */ }; -static cassette_image::error mbee_tap_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error mbee_tap_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &mbee_tap_config); + return cassette->legacy_identify(opts, &mbee_tap_config); } static cassette_image::error mbee_tap_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &mbee_tap_config); + return cassette->legacy_construct(&mbee_tap_config); } -static const struct CassetteFormat mbee_tap_image_format = +static const cassette_image::Format mbee_tap_image_format = { "tap", mbee_tap_identify, |