diff options
Diffstat (limited to 'src/lib/formats/gtp_cas.cpp')
-rw-r--r-- | src/lib/formats/gtp_cas.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/formats/gtp_cas.cpp b/src/lib/formats/gtp_cas.cpp index fd3a16932b3..dc996aa89db 100644 --- a/src/lib/formats/gtp_cas.cpp +++ b/src/lib/formats/gtp_cas.cpp @@ -6,7 +6,6 @@ Miodrag Milanovic */ -#include <assert.h> #include "gtp_cas.h" @@ -20,7 +19,7 @@ #define GTP_BLOCK_TURBO 0x01 #define GTP_BLOCK_NAME 0x10 -static int16_t wave_data; +static int16_t wave_data; // FIXME: global variable prevent multiple instances static int16_t len; #define PULSE_WIDTH 30 @@ -128,7 +127,7 @@ static int gtp_cas_to_wav_size( const uint8_t *casdata, int caslen ) { return size; } -static int gtp_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) { +static int gtp_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) { int i,size,n; size = 0; n = 0; @@ -164,7 +163,7 @@ static int gtp_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) { -static const struct CassetteLegacyWaveFiller gtp_legacy_fill_wave = { +static const cassette_image::LegacyWaveFiller gtp_legacy_fill_wave = { gtp_cas_fill_wave, /* fill_wave */ -1, /* chunk_size */ 0, /* chunk_samples */ @@ -176,19 +175,19 @@ static const struct CassetteLegacyWaveFiller gtp_legacy_fill_wave = { -static cassette_image::error gtp_cassette_identify( cassette_image *cassette, struct CassetteOptions *opts ) { - return cassette_legacy_identify( cassette, opts, >p_legacy_fill_wave ); +static cassette_image::error gtp_cassette_identify( cassette_image *cassette, cassette_image::Options *opts ) { + return cassette->legacy_identify( opts, >p_legacy_fill_wave ); } static cassette_image::error gtp_cassette_load( cassette_image *cassette ) { - return cassette_legacy_construct( cassette, >p_legacy_fill_wave ); + return cassette->legacy_construct( >p_legacy_fill_wave ); } -static const struct CassetteFormat gtp_cassette_format = { +static const cassette_image::Format gtp_cassette_format = { "gtp", gtp_cassette_identify, gtp_cassette_load, |