summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/orao_cas.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-10-02 02:42:28 +1000
committer Vas Crabb <vas@vastheman.com>2020-10-02 02:42:28 +1000
commit54048b3407d23af7959e4f94701aba7cb1119ad8 (patch)
tree7b984d5fac95fe03bafeb30860a9fa6995c3a3c0 /src/lib/formats/orao_cas.cpp
parent7550749c670d6408384015274a557937d25b7b96 (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/orao_cas.cpp')
-rw-r--r--src/lib/formats/orao_cas.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/formats/orao_cas.cpp b/src/lib/formats/orao_cas.cpp
index 9a2ac05547e..a9c3f7473d4 100644
--- a/src/lib/formats/orao_cas.cpp
+++ b/src/lib/formats/orao_cas.cpp
@@ -5,10 +5,10 @@
Tape support for Orao TAP format
*/
-#include <cassert>
-
#include "orao_cas.h"
+#include <cassert>
+
#define ORAO_WAV_FREQUENCY 44100
#define WAVE_HIGH -32768
@@ -19,7 +19,7 @@
#define ORAO_HEADER_SIZE 360
-static int16_t wave_data;
+static int16_t wave_data; // FIXME: global variables prevent multiple instances
static int len;
static void orao_output_wave( int16_t **buffer, int length ) {
@@ -85,7 +85,7 @@ static int orao_cas_fill_wave( int16_t *buffer, int length, uint8_t *bytes ) {
-static const struct CassetteLegacyWaveFiller orao_legacy_fill_wave = {
+static const cassette_image::LegacyWaveFiller orao_legacy_fill_wave = {
orao_cas_fill_wave, /* fill_wave */
-1, /* chunk_size */
0, /* chunk_samples */
@@ -97,19 +97,19 @@ static const struct CassetteLegacyWaveFiller orao_legacy_fill_wave = {
-static cassette_image::error orao_cassette_identify( cassette_image *cassette, struct CassetteOptions *opts ) {
- return cassette_legacy_identify( cassette, opts, &orao_legacy_fill_wave );
+static cassette_image::error orao_cassette_identify( cassette_image *cassette, cassette_image::Options *opts ) {
+ return cassette->legacy_identify( opts, &orao_legacy_fill_wave );
}
static cassette_image::error orao_cassette_load( cassette_image *cassette ) {
- return cassette_legacy_construct( cassette, &orao_legacy_fill_wave );
+ return cassette->legacy_construct( &orao_legacy_fill_wave );
}
-static const struct CassetteFormat orao_cassette_format = {
+static const cassette_image::Format orao_cassette_format = {
"tap",
orao_cassette_identify,
orao_cassette_load,