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/csw_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/csw_cas.cpp')
-rw-r--r-- | src/lib/formats/csw_cas.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/formats/csw_cas.cpp b/src/lib/formats/csw_cas.cpp index 9edea5c3ff7..916817fee97 100644 --- a/src/lib/formats/csw_cas.cpp +++ b/src/lib/formats/csw_cas.cpp @@ -22,12 +22,13 @@ Offset Value Type Description */ -#include <cstring> +#include "csw_cas.h" +#include "uef_cas.h" #include <zlib.h> + #include <cassert> -#include "uef_cas.h" -#include "csw_cas.h" +#include <cstring> #define CSW_WAV_FREQUENCY 44100 @@ -262,7 +263,7 @@ cleanup: } -static const struct CassetteLegacyWaveFiller csw_legacy_fill_wave = { +static const cassette_image::LegacyWaveFiller csw_legacy_fill_wave = { csw_cas_fill_wave, /* fill_wave */ -1, /* chunk_size */ 0, /* chunk_samples */ @@ -272,23 +273,23 @@ static const struct CassetteLegacyWaveFiller csw_legacy_fill_wave = { 0 /* trailer_samples */ }; -static cassette_image::error csw_cassette_identify( cassette_image *cassette, struct CassetteOptions *opts ) +static cassette_image::error csw_cassette_identify( cassette_image *cassette, cassette_image::Options *opts ) { uint8_t header[22]; - cassette_image_read(cassette, header, 0, sizeof(header)); + cassette->image_read(header, 0, sizeof(header)); if (memcmp(&header[0], CSW_HEADER, sizeof(CSW_HEADER) - 1)) { return cassette_image::error::INVALID_IMAGE; } - return cassette_legacy_identify( cassette, opts, &csw_legacy_fill_wave ); + return cassette->legacy_identify( opts, &csw_legacy_fill_wave ); } static cassette_image::error csw_cassette_load( cassette_image *cassette ) { - return cassette_legacy_construct( cassette, &csw_legacy_fill_wave ); + return cassette->legacy_construct( &csw_legacy_fill_wave ); } -const struct CassetteFormat csw_cassette_format = { +const cassette_image::Format csw_cassette_format = { "csw", csw_cassette_identify, csw_cassette_load, |