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/sc3000_bit.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/sc3000_bit.cpp')
-rw-r--r-- | src/lib/formats/sc3000_bit.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/formats/sc3000_bit.cpp b/src/lib/formats/sc3000_bit.cpp index 6e3600b7aeb..636d93543c6 100644 --- a/src/lib/formats/sc3000_bit.cpp +++ b/src/lib/formats/sc3000_bit.cpp @@ -7,10 +7,10 @@ Cassette code for Sega SC-3000 *.bit files *********************************************************************/ +#include "sc3000_bit.h" #include <cassert> -#include "sc3000_bit.h" /*************************************************************************** PARAMETERS @@ -26,7 +26,7 @@ CassetteModulation sc3000_bit_modulation -------------------------------------------------*/ -static const struct CassetteModulation sc3000_bit_modulation = +static const cassette_image::Modulation sc3000_bit_modulation = { CASSETTE_MODULATION_SINEWAVE, 1200.0 - 300, 1200.0, 1200.0 + 300, @@ -37,9 +37,9 @@ static const struct CassetteModulation sc3000_bit_modulation = sc3000_bit_identify - identify cassette -------------------------------------------------*/ -static cassette_image::error sc3000_bit_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error sc3000_bit_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_modulation_identify( cassette, &sc3000_bit_modulation, opts); + return cassette->modulation_identify(&sc3000_bit_modulation, opts); } /*------------------------------------------------- @@ -48,7 +48,7 @@ static cassette_image::error sc3000_bit_identify(cassette_image *cassette, struc #define MODULATE(_value) \ for (int i = 0; i < (_value ? 2 : 1); i++) { \ - err = cassette_put_modulated_data_bit(cassette, 0, time_index, _value, &sc3000_bit_modulation, &time_displacement);\ + err = cassette->put_modulated_data_bit(0, time_index, _value, &sc3000_bit_modulation, &time_displacement);\ if (err != cassette_image::error::SUCCESS) return err;\ time_index += time_displacement;\ } @@ -56,7 +56,7 @@ static cassette_image::error sc3000_bit_identify(cassette_image *cassette, struc static cassette_image::error sc3000_bit_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; @@ -64,7 +64,7 @@ static cassette_image::error sc3000_bit_load(cassette_image *cassette) while (image_pos < image_size) { - cassette_image_read(cassette, &data, image_pos, 1); + cassette->image_read(&data, image_pos, 1); switch (data) { @@ -77,7 +77,7 @@ static cassette_image::error sc3000_bit_load(cassette_image *cassette) break; case ' ': - err = cassette_put_sample( cassette, 0, time_index, 1/1200.0, 0); + err = cassette->put_sample(0, time_index, 1/1200.0, 0); if (err != cassette_image::error::SUCCESS) return err; time_index += 1/1200.0; break; @@ -93,7 +93,7 @@ static cassette_image::error sc3000_bit_load(cassette_image *cassette) CassetteFormat sc3000_bit_cassette_format -------------------------------------------------*/ -const struct CassetteFormat sc3000_bit_format = +const cassette_image::Format sc3000_bit_format = { "bit", sc3000_bit_identify, |