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/mz_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/mz_cas.cpp')
-rw-r--r-- | src/lib/formats/mz_cas.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/formats/mz_cas.cpp b/src/lib/formats/mz_cas.cpp index e7af23aafb4..0ab4cec8e84 100644 --- a/src/lib/formats/mz_cas.cpp +++ b/src/lib/formats/mz_cas.cpp @@ -1,8 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Nathan Woods +#include "mz_cas.h" + #include <cstring> #include <cassert> -#include "mz_cas.h" #ifndef VERBOSE #define VERBOSE 0 @@ -301,7 +302,7 @@ static int fill_wave(int16_t *buffer, int length, uint8_t *code) -static const struct CassetteLegacyWaveFiller mz700_legacy_fill_wave = +static const cassette_image::LegacyWaveFiller mz700_legacy_fill_wave = { fill_wave, /* fill_wave */ 1, /* chunk_size */ @@ -314,21 +315,21 @@ static const struct CassetteLegacyWaveFiller mz700_legacy_fill_wave = -static cassette_image::error mz700_cas_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error mz700_cas_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &mz700_legacy_fill_wave); + return cassette->legacy_identify(opts, &mz700_legacy_fill_wave); } static cassette_image::error mz700_cas_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &mz700_legacy_fill_wave); + return cassette->legacy_construct(&mz700_legacy_fill_wave); } -static const struct CassetteFormat mz700_cas_format = +static const cassette_image::Format mz700_cas_format = { "m12,mzf,mzt", mz700_cas_identify, |