diff options
Diffstat (limited to 'src/lib/formats/fmsx_cas.cpp')
-rw-r--r-- | src/lib/formats/fmsx_cas.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/formats/fmsx_cas.cpp b/src/lib/formats/fmsx_cas.cpp index 6da8fc47f81..c7969b28eca 100644 --- a/src/lib/formats/fmsx_cas.cpp +++ b/src/lib/formats/fmsx_cas.cpp @@ -1,8 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Sean Young -#include <assert.h> -#include "formats/fmsx_cas.h" +#include "fmsx_cas.h" + +#include <cstring> #define CAS_PERIOD (16) @@ -48,7 +49,7 @@ static int fmsx_cas_to_wav_size (const uint8_t *casdata, int caslen) /******************************************************************* Generate samples for the tape image ********************************************************************/ -static int fmsx_cas_fill_wave(int16_t *buffer, int sample_count, uint8_t *bytes) +static int fmsx_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int) { int cas_pos, bit, state = 1, samples_pos, size, n, i, p; @@ -104,7 +105,7 @@ static int fmsx_cas_fill_wave(int16_t *buffer, int sample_count, uint8_t *bytes) } -static const struct CassetteLegacyWaveFiller fmsx_legacy_fill_wave = +static const cassette_image::LegacyWaveFiller fmsx_legacy_fill_wave = { fmsx_cas_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -117,21 +118,21 @@ static const struct CassetteLegacyWaveFiller fmsx_legacy_fill_wave = -static cassette_image::error fmsx_cas_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error fmsx_cas_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &fmsx_legacy_fill_wave); + return cassette->legacy_identify(opts, &fmsx_legacy_fill_wave); } static cassette_image::error fmsx_cas_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &fmsx_legacy_fill_wave); + return cassette->legacy_construct(&fmsx_legacy_fill_wave); } -static const struct CassetteFormat fmsx_cas_format = +static const cassette_image::Format fmsx_cas_format = { "tap,cas", fmsx_cas_identify, |