diff options
author | 2020-10-02 02:42:28 +1000 | |
---|---|---|
committer | 2020-10-02 02:42:28 +1000 | |
commit | 54048b3407d23af7959e4f94701aba7cb1119ad8 (patch) | |
tree | 7b984d5fac95fe03bafeb30860a9fa6995c3a3c0 /src/lib/formats/gtp_cas.cpp | |
parent | 7550749c670d6408384015274a557937d25b7b96 (diff) |
-imagedev/cassimg.cpp: Make the interface look something like C++.
-sound/tiasound.cpp: Use some vaguely C++-like code internally.
Diffstat (limited to 'src/lib/formats/gtp_cas.cpp')
-rw-r--r-- | src/lib/formats/gtp_cas.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/formats/gtp_cas.cpp b/src/lib/formats/gtp_cas.cpp index 0a5c34d140c..f8ac6917d64 100644 --- a/src/lib/formats/gtp_cas.cpp +++ b/src/lib/formats/gtp_cas.cpp @@ -6,10 +6,10 @@ Miodrag Milanovic */ -#include <cassert> - #include "gtp_cas.h" +#include <cassert> + #define GTP_WAV_FREQUENCY 44100 #define WAVE_LOW -0x5a9e @@ -20,7 +20,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 @@ -164,7 +164,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 +176,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, |