diff options
Diffstat (limited to 'src/lib/formats/pmd_cas.cpp')
-rw-r--r-- | src/lib/formats/pmd_cas.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/formats/pmd_cas.cpp b/src/lib/formats/pmd_cas.cpp index 79e8820b4bb..224a3b0af5b 100644 --- a/src/lib/formats/pmd_cas.cpp +++ b/src/lib/formats/pmd_cas.cpp @@ -10,10 +10,10 @@ ********************************************************************/ -#include <assert.h> - #include "pmd_cas.h" +#include "multibyte.h" + #define WAVEENTRY_LOW -32768 #define WAVEENTRY_HIGH 32767 @@ -26,7 +26,7 @@ #define PMD85_BITS_PER_BYTE 11 // image size -static int pmd85_image_size; +static int pmd85_image_size; // FIXME: global variable prevents multiple instances static int pmd85_emit_level(int16_t *buffer, int sample_pos, int count, int level) { @@ -91,7 +91,7 @@ static void pmd85_printf_image_info(const uint8_t *bytes, int sample_count) #if 0 char track_name[9]; uint32_t sec = (uint32_t)(sample_count/PMD85_WAV_FREQUENCY); - uint16_t addr = (bytes[0x33]<<8) | bytes[0x32]; + uint16_t addr = get_u16le(&bytes[0x32]); strncpy(track_name, (char*)&bytes[0x36], 8); track_name[8] = '\0'; @@ -137,7 +137,7 @@ static int pmd85_handle_cassette(int16_t *buffer, const uint8_t *bytes) int data_pos = 0; while (data_pos < pmd85_image_size) { - uint16_t block_size = (bytes[data_pos + 1]<<8) | bytes[data_pos]; + uint16_t block_size = get_u16le(&bytes[data_pos]); int pause_len = PMD85_PAUSE_BITS; data_pos += 2; @@ -168,7 +168,7 @@ static int pmd85_handle_cassette(int16_t *buffer, const uint8_t *bytes) Generate samples for the tape image ********************************************************************/ -static int pmd85_cassette_fill_wave(int16_t *buffer, int length, uint8_t *bytes) +static int pmd85_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int) { return pmd85_handle_cassette(buffer, bytes); } @@ -184,7 +184,7 @@ static int pmd85_cassette_calculate_size_in_samples(const uint8_t *bytes, int le return pmd85_handle_cassette(nullptr, bytes); } -static const struct CassetteLegacyWaveFiller pmd85_legacy_fill_wave = +static const cassette_image::LegacyWaveFiller pmd85_legacy_fill_wave = { pmd85_cassette_fill_wave, /* fill_wave */ -1, /* chunk_size */ @@ -195,17 +195,17 @@ static const struct CassetteLegacyWaveFiller pmd85_legacy_fill_wave = 0 /* trailer_samples */ }; -static cassette_image::error pmd85_cassette_identify(cassette_image *cassette, struct CassetteOptions *opts) +static cassette_image::error pmd85_cassette_identify(cassette_image *cassette, cassette_image::Options *opts) { - return cassette_legacy_identify(cassette, opts, &pmd85_legacy_fill_wave); + return cassette->legacy_identify(opts, &pmd85_legacy_fill_wave); } static cassette_image::error pmd85_cassette_load(cassette_image *cassette) { - return cassette_legacy_construct(cassette, &pmd85_legacy_fill_wave); + return cassette->legacy_construct(&pmd85_legacy_fill_wave); } -static const struct CassetteFormat pmd85_cassette_image_format = +static const cassette_image::Format pmd85_cassette_image_format = { "pmd,tap,ptp", pmd85_cassette_identify, |