diff options
Diffstat (limited to 'src/lib/formats/tvc_cas.cpp')
-rw-r--r-- | src/lib/formats/tvc_cas.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/formats/tvc_cas.cpp b/src/lib/formats/tvc_cas.cpp index 3cea37cc1bf..e6d05451d9d 100644 --- a/src/lib/formats/tvc_cas.cpp +++ b/src/lib/formats/tvc_cas.cpp @@ -7,10 +7,10 @@ http://tvc.homeserver.hu/html/konvertformatum.html ********************************************************************/ +#include "tvc_cas.h" #include <cassert> -#include "tvc_cas.h" #define TVC64_BIT0_FREQ 1812 #define TVC64_BIT1_FREQ 2577 @@ -24,7 +24,7 @@ static void tvc64_emit_level(cassette_image *cass, double &time, int freq, int level) { double period = 1.0 / freq; - cassette_put_sample(cass, 0, time, period, level * WAVE_AMPLITUDE); + cass->put_sample(0, time, period, level * WAVE_AMPLITUDE); time += period; } @@ -89,7 +89,7 @@ static cassette_image::error tvc64_cassette_load(cassette_image *cassette) double time = 0.0; uint8_t header[TVC64_HEADER_BYTES]; - cassette_image_read(cassette, header, 0, TVC64_HEADER_BYTES); + cassette->image_read(header, 0, TVC64_HEADER_BYTES); uint16_t cas_size = (header[0x83]<<8) | header[0x82]; // tape header @@ -172,7 +172,7 @@ static cassette_image::error tvc64_cassette_load(cassette_image *cassette) // sector data int sector_size = (i == sector_num) ? (cas_size % 256) : 256; for (int z=0; z < sector_size; z++) - cassette_image_read(cassette, &tmp_buff[buff_idx++], TVC64_HEADER_BYTES + i*256 + z, 1); + cassette->image_read(&tmp_buff[buff_idx++], TVC64_HEADER_BYTES + i*256 + z, 1); if (i == sector_num || ((i+1) == sector_num && (cas_size % 256 ) == 0)) tmp_buff[buff_idx++] = 0xff; // last sector @@ -200,10 +200,10 @@ static cassette_image::error tvc64_cassette_load(cassette_image *cassette) return cassette_image::error::SUCCESS; } -static cassette_image::error tvc64_cassette_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error tvc64_cassette_identify(cassette_image *cassette, cassette_image::Options *opts) { uint8_t byte; - cassette_image_read(cassette, &byte, 0, 1); + cassette->image_read(&byte, 0, 1); if (byte == 0x11) { @@ -216,7 +216,7 @@ static cassette_image::error tvc64_cassette_identify(cassette_image *cassette, s return cassette_image::error::INVALID_IMAGE; } -static const struct CassetteFormat tvc64_cassette_image_format = +static const cassette_image::Format tvc64_cassette_image_format = { "cas", tvc64_cassette_identify, |