diff options
author | 2020-10-02 14:01:03 +1000 | |
---|---|---|
committer | 2020-10-02 14:01:03 +1000 | |
commit | d32834f1f7811494f312be32b05757695d2b7700 (patch) | |
tree | 3c1d53812875f8e5189d3e961e9d7644aa9259ce /src/lib/formats/sord_cas.cpp | |
parent | 0bfc5ed542f9c42b509be8635dabc825581c2d53 (diff) |
formats/cassimg.cpp: Finish encapsulation of cassette_image class.
Diffstat (limited to 'src/lib/formats/sord_cas.cpp')
-rw-r--r-- | src/lib/formats/sord_cas.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/formats/sord_cas.cpp b/src/lib/formats/sord_cas.cpp index ba4ad1faa24..f90daafd248 100644 --- a/src/lib/formats/sord_cas.cpp +++ b/src/lib/formats/sord_cas.cpp @@ -20,7 +20,7 @@ static const uint8_t SORDM5_CAS_HEADER[6] = { 'S', 'O', 'R', 'D', 'M', '5'}; static const cassette_image::Modulation sordm5_cas_modulation = { - CASSETTE_MODULATION_SINEWAVE, + cassette_image::MODULATION_SINEWAVE, 1575.0 - 300, 1575.0, 1575.0 + 300, 3150.0 - 600, 3150.0, 3150.0 + 600 }; @@ -34,7 +34,7 @@ static uint8_t cassette_image_read_uint8( cassette_image *cassette, uint64_t off static cassette_image::error sordm5_tap_identify( cassette_image *cassette, cassette_image::Options *opts) { - return cassette->modulation_identify(&sordm5_cas_modulation, opts); + return cassette->modulation_identify(sordm5_cas_modulation, opts); } static cassette_image::error sordm5_tap_load( cassette_image *cassette) @@ -79,7 +79,7 @@ static cassette_image::error sordm5_tap_load( cassette_image *cassette) } // add sync if (block_type == 'H') filler_length = 2.4 * (3150 / 8); else filler_length = 0.15 * (3150 / 8); - err = cassette->put_modulated_filler(0, time_index, 0xFF, filler_length, &sordm5_cas_modulation, &time_displacement); + err = cassette->put_modulated_filler(0, time_index, 0xFF, filler_length, sordm5_cas_modulation, &time_displacement); if (err != cassette_image::error::SUCCESS) return err; time_index += time_displacement; // process block @@ -108,13 +108,13 @@ static cassette_image::error sordm5_tap_load( cassette_image *cassette) bit = (byte >> (j-2)) & 1; } // add bit - err = cassette->put_modulated_data_bit(0, time_index, bit, &sordm5_cas_modulation, &time_displacement); + err = cassette->put_modulated_data_bit(0, time_index, bit, sordm5_cas_modulation, &time_displacement); if (err != cassette_image::error::SUCCESS) return err; time_index += time_displacement; } } // mark end of block - err = cassette->put_modulated_data_bit(0, time_index, 1, &sordm5_cas_modulation, &time_displacement); + err = cassette->put_modulated_data_bit(0, time_index, 1, sordm5_cas_modulation, &time_displacement); if (err != cassette_image::error::SUCCESS) return err; time_index += time_displacement; // next block |