diff options
Diffstat (limited to 'src/lib/formats/apf_apt.cpp')
-rw-r--r-- | src/lib/formats/apf_apt.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/lib/formats/apf_apt.cpp b/src/lib/formats/apf_apt.cpp index de919b0bddd..9930d501652 100644 --- a/src/lib/formats/apf_apt.cpp +++ b/src/lib/formats/apf_apt.cpp @@ -34,8 +34,6 @@ e. A checksum byte (8-bit addition) ********************************************************************/ -#include <assert.h> - #include "formats/apf_apt.h" #define WAVEENTRY_LOW -32768 @@ -154,12 +152,12 @@ static int apf_cpf_handle_cassette(int16_t *buffer, const uint8_t *bytes) Generate samples for the tape image ********************************************************************/ -static int apf_apt_fill_wave(int16_t *buffer, int length, uint8_t *bytes) +static int apf_apt_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int) { return apf_apt_handle_cassette(buffer, bytes); } -static int apf_cpf_fill_wave(int16_t *buffer, int length, uint8_t *bytes) +static int apf_cpf_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int) { return apf_cpf_handle_cassette(buffer, bytes); } @@ -184,7 +182,7 @@ static int apf_cpf_calculate_size_in_samples(const uint8_t *bytes, int length) //********************************************************************************* -static const struct CassetteLegacyWaveFiller apf_cpf_fill_intf = +static const cassette_image::LegacyWaveFiller apf_cpf_fill_intf = { apf_cpf_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -195,17 +193,17 @@ static const struct CassetteLegacyWaveFiller apf_cpf_fill_intf = 0 /* trailer_samples */ }; -static cassette_image::error apf_cpf_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error apf_cpf_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &apf_cpf_fill_intf); + return cassette->legacy_identify(opts, &apf_cpf_fill_intf); } static cassette_image::error apf_cpf_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &apf_cpf_fill_intf); + return cassette->legacy_construct(&apf_cpf_fill_intf); } -static const struct CassetteFormat apf_cpf_format = +static const cassette_image::Format apf_cpf_format = { "cas,cpf", apf_cpf_identify, @@ -215,7 +213,7 @@ static const struct CassetteFormat apf_cpf_format = //********************************************************************************* -static const struct CassetteLegacyWaveFiller apf_apt_fill_intf = +static const cassette_image::LegacyWaveFiller apf_apt_fill_intf = { apf_apt_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -226,17 +224,17 @@ static const struct CassetteLegacyWaveFiller apf_apt_fill_intf = 0 /* trailer_samples */ }; -static cassette_image::error apf_apt_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error apf_apt_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &apf_apt_fill_intf); + return cassette->legacy_identify(opts, &apf_apt_fill_intf); } static cassette_image::error apf_apt_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &apf_apt_fill_intf); + return cassette->legacy_construct(&apf_apt_fill_intf); } -static const struct CassetteFormat apf_apt_format = +static const cassette_image::Format apf_apt_format = { "apt", apf_apt_identify, |