diff options
Diffstat (limited to 'src/lib/formats/kc_cas.cpp')
-rw-r--r-- | src/lib/formats/kc_cas.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/formats/kc_cas.cpp b/src/lib/formats/kc_cas.cpp index ee3d392e86f..74397e3f89a 100644 --- a/src/lib/formats/kc_cas.cpp +++ b/src/lib/formats/kc_cas.cpp @@ -13,10 +13,10 @@ ********************************************************************/ -#include <cassert> - #include "kc_cas.h" +#include <cassert> + #define SMPLO -32768 #define SMPHI 32767 #define SILENCE 0 @@ -38,7 +38,7 @@ enum }; // image size -static int kc_image_size; +static int kc_image_size; // FIXME: global variable prevents multiple instances /******************************************************************* Generate one high-low cycle of sample data @@ -249,7 +249,7 @@ static int kc_kcc_to_wav_size(const uint8_t *casdata, int caslen) } -static const struct CassetteLegacyWaveFiller kc_kcc_legacy_fill_wave = +static const cassette_image::LegacyWaveFiller kc_kcc_legacy_fill_wave = { kc_kcc_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -260,19 +260,19 @@ static const struct CassetteLegacyWaveFiller kc_kcc_legacy_fill_wave = 0 /* trailer_samples */ }; -static cassette_image::error kc_kcc_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error kc_kcc_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &kc_kcc_legacy_fill_wave); + return cassette->legacy_identify(opts, &kc_kcc_legacy_fill_wave); } static cassette_image::error kc_kcc_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &kc_kcc_legacy_fill_wave); + return cassette->legacy_construct(&kc_kcc_legacy_fill_wave); } -static const struct CassetteFormat kc_kcc_format = +static const cassette_image::Format kc_kcc_format = { "kcc,kcb", kc_kcc_identify, @@ -301,7 +301,7 @@ static int kc_tap_to_wav_size(const uint8_t *casdata, int caslen) } -static const struct CassetteLegacyWaveFiller kc_tap_legacy_fill_wave = +static const cassette_image::LegacyWaveFiller kc_tap_legacy_fill_wave = { kc_tap_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -312,19 +312,19 @@ static const struct CassetteLegacyWaveFiller kc_tap_legacy_fill_wave = 0 /* trailer_samples */ }; -static cassette_image::error kc_tap_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error kc_tap_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &kc_tap_legacy_fill_wave); + return cassette->legacy_identify(opts, &kc_tap_legacy_fill_wave); } static cassette_image::error kc_tap_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &kc_tap_legacy_fill_wave); + return cassette->legacy_construct(&kc_tap_legacy_fill_wave); } -static const struct CassetteFormat kc_tap_format = +static const cassette_image::Format kc_tap_format = { "tap,853,854,855,tp2,kcm", kc_tap_identify, @@ -353,7 +353,7 @@ static int kc_sss_to_wav_size(const uint8_t *casdata, int caslen) } -static const struct CassetteLegacyWaveFiller kc_sss_legacy_fill_wave = +static const cassette_image::LegacyWaveFiller kc_sss_legacy_fill_wave = { kc_sss_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -364,18 +364,18 @@ static const struct CassetteLegacyWaveFiller kc_sss_legacy_fill_wave = 0 /* trailer_samples */ }; -static cassette_image::error kc_sss_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error kc_sss_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &kc_sss_legacy_fill_wave); + return cassette->legacy_identify(opts, &kc_sss_legacy_fill_wave); } static cassette_image::error kc_sss_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &kc_sss_legacy_fill_wave); + return cassette->legacy_construct(&kc_sss_legacy_fill_wave); } -static const struct CassetteFormat kc_sss_format = +static const cassette_image::Format kc_sss_format = { "sss", kc_sss_identify, |