diff options
Diffstat (limited to 'src/lib/formats/x07_cas.cpp')
-rw-r--r-- | src/lib/formats/x07_cas.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/formats/x07_cas.cpp b/src/lib/formats/x07_cas.cpp index 131693f2da1..182a1303cd8 100644 --- a/src/lib/formats/x07_cas.cpp +++ b/src/lib/formats/x07_cas.cpp @@ -6,10 +6,10 @@ ********************************************************************/ -#include <cassert> - #include "x07_cas.h" +#include <cassert> + #define WAVEENTRY_LOW -32768 #define WAVEENTRY_HIGH 32767 @@ -19,7 +19,7 @@ #define X07_HEADER_BYTES 16 // image size -static int x07_image_size; +static int x07_image_size; // FIXME: global variable prevents multiple instances static int x07_put_samples(int16_t *buffer, int sample_pos, int count, int level) { @@ -140,7 +140,7 @@ static int x07_cassette_calculate_size_in_samples(const uint8_t *bytes, int leng return x07_handle_cassette(nullptr, bytes); } -static const struct CassetteLegacyWaveFiller x07_legacy_fill_wave = +static const cassette_image::LegacyWaveFiller x07_legacy_fill_wave = { x07_cassette_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -151,17 +151,17 @@ static const struct CassetteLegacyWaveFiller x07_legacy_fill_wave = 0 /* trailer_samples */ }; -static cassette_image::error x07_cassette_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error x07_cassette_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &x07_legacy_fill_wave); + return cassette->legacy_identify(opts, &x07_legacy_fill_wave); } static cassette_image::error x07_cassette_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &x07_legacy_fill_wave); + return cassette->legacy_construct(&x07_legacy_fill_wave); } -static const struct CassetteFormat x07_cassette_image_format = +static const cassette_image::Format x07_cassette_image_format = { "k7,lst,cas", x07_cassette_identify, |