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/atom_tap.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/atom_tap.cpp')
-rw-r--r-- | src/lib/formats/atom_tap.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/formats/atom_tap.cpp b/src/lib/formats/atom_tap.cpp index 212208a6d37..9d2ac3dc627 100644 --- a/src/lib/formats/atom_tap.cpp +++ b/src/lib/formats/atom_tap.cpp @@ -40,11 +40,12 @@ */ -#include <cassert> - #include "atom_tap.h" #include "csw_cas.h" #include "uef_cas.h" + +#include <cassert> + /*************************************************************************** PARAMETERS ***************************************************************************/ @@ -59,7 +60,7 @@ CassetteModulation atom_tap_modulation -------------------------------------------------*/ -static const struct CassetteModulation atom_tap_modulation = +static const cassette_image::Modulation atom_tap_modulation = { CASSETTE_MODULATION_SINEWAVE, 1200.0 - 300, 1200.0, 1200.0 + 300, @@ -73,7 +74,7 @@ static const struct CassetteModulation atom_tap_modulation = static uint8_t cassette_image_read_uint8(cassette_image *cassette, uint64_t offset) { uint8_t data; - cassette_image_read(cassette, &data, offset, 1); + cassette->image_read(&data, offset, 1); return data; } @@ -81,9 +82,9 @@ static uint8_t cassette_image_read_uint8(cassette_image *cassette, uint64_t offs atom_tap_identify - identify cassette -------------------------------------------------*/ -static cassette_image::error atom_tap_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error atom_tap_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_modulation_identify( cassette, &atom_tap_modulation, opts); + return cassette->modulation_identify(&atom_tap_modulation, opts); } /*------------------------------------------------- @@ -92,7 +93,7 @@ static cassette_image::error atom_tap_identify(cassette_image *cassette, struct #define MODULATE(_value) \ for (int i = 0; i < (_value ? 8 : 4); i++) { \ - err = cassette_put_modulated_data_bit(cassette, 0, time_index, _value, &atom_tap_modulation, &time_displacement);\ + err = cassette->put_modulated_data_bit(0, time_index, _value, &atom_tap_modulation, &time_displacement);\ if (err != cassette_image::error::SUCCESS) return err;\ time_index += time_displacement;\ } @@ -102,7 +103,7 @@ static cassette_image::error atom_tap_identify(cassette_image *cassette, struct static cassette_image::error atom_tap_load(cassette_image *cassette) { cassette_image::error err; - uint64_t image_size = cassette_image_size(cassette); + uint64_t image_size = cassette->image_size(); uint64_t image_pos = 0; double time_index = 0.0; double time_displacement; @@ -134,7 +135,7 @@ static cassette_image::error atom_tap_load(cassette_image *cassette) CassetteFormat atom_tap_cassette_format -------------------------------------------------*/ -const struct CassetteFormat atom_tap_format = +const cassette_image::Format atom_tap_format = { "tap", atom_tap_identify, |