Skip to content

Commit da4a3f4

Browse files
holubholub
committed
changed fill_wave API
1 parent 55f3af2 commit da4a3f4

38 files changed

+59
-56
lines changed

‎src/lib/formats/a26_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static int a26_cas_do_work( int16_t **buffer, const uint8_t *bytes ) {
120120
return size;
121121
}
122122

123-
static int a26_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes ) {
123+
static int a26_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) {
124124
int16_t *p = buffer;
125125

126126
return a26_cas_do_work( &p, (const uint8_t *)bytes );

‎src/lib/formats/ace_tap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static int ace_handle_tap(int16_t *buffer, const uint8_t *casdata)
135135
/*******************************************************************
136136
Generate samples for the tape image
137137
********************************************************************/
138-
static int ace_tap_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
138+
static int ace_tap_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
139139
{
140140
return ace_handle_tap( buffer, bytes );
141141
}

‎src/lib/formats/apf_apt.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,12 @@ static int apf_cpf_handle_cassette(int16_t *buffer, const uint8_t *bytes)
152152
Generate samples for the tape image
153153
********************************************************************/
154154

155-
static int apf_apt_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
155+
static int apf_apt_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
156156
{
157157
return apf_apt_handle_cassette(buffer, bytes);
158158
}
159159

160-
static int apf_cpf_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
160+
static int apf_cpf_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
161161
{
162162
return apf_cpf_handle_cassette(buffer, bytes);
163163
}

‎src/lib/formats/camplynx_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static int camplynx_handle_cassette(int16_t *buffer, const uint8_t *bytes)
179179
Generate samples for the tape image
180180
********************************************************************/
181181

182-
static int camplynx_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
182+
static int camplynx_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
183183
{
184184
return camplynx_handle_cassette(buffer, bytes);
185185
}

‎src/lib/formats/cassimg.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ cassette_image::error cassette_image::legacy_construct(const LegacyWaveFiller *l
799799
/* sanity check the args */
800800
assert(legacy_args->header_samples >= -1);
801801
assert(legacy_args->trailer_samples >= 0);
802-
assert(legacy_args->fill_wave || legacy_args->fill_wave_ext);
802+
assert(legacy_args->fill_wave);
803803

804804
const uint64_t size = image_size();
805805

@@ -859,7 +859,7 @@ cassette_image::error cassette_image::legacy_construct(const LegacyWaveFiller *l
859859
/* if there has to be a header */
860860
if (args.header_samples > 0)
861861
{
862-
length = args.fill_wave(&samples[pos], sample_count - pos, CODE_HEADER);
862+
length = args.fill_wave(&samples[pos], sample_count - pos, CODE_HEADER, -1);
863863
if (length < 0)
864864
{
865865
err = error::INVALID_IMAGE;
@@ -877,6 +877,11 @@ cassette_image::error cassette_image::legacy_construct(const LegacyWaveFiller *l
877877
}
878878
while ((pos < sample_count) && (offset < size))
879879
{
880+
const int slice = std::min<int>(args.chunk_size, size - offset);
881+
882+
image_read(&chunk[0], offset, slice);
883+
offset += slice;
884+
880885
length = args.fill_wave(&samples[pos], sample_count - pos, chunk.get(), slice);
881886
if (length < 0)
882887
{
@@ -892,7 +897,7 @@ cassette_image::error cassette_image::legacy_construct(const LegacyWaveFiller *l
892897
/* if there has to be a trailer */
893898
if (args.trailer_samples > 0)
894899
{
895-
length = args.fill_wave(&samples[pos], sample_count - pos, CODE_TRAILER);
900+
length = args.fill_wave(&samples[pos], sample_count - pos, CODE_TRAILER, -1);
896901
if (length < 0)
897902
{
898903
err = error::INVALID_IMAGE;

‎src/lib/formats/cassimg.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,13 @@ class cassette_image
120120
/* code to adapt existing legacy fill_wave functions */
121121
struct LegacyWaveFiller
122122
{
123-
int (*fill_wave)(int16_t *, int, const uint8_t *) = nullptr;
123+
int (*fill_wave)(int16_t *, int, const uint8_t *, int) = nullptr;
124124
int chunk_size = 0;
125125
int chunk_samples = 0;
126126
int (*chunk_sample_calc)(const uint8_t *bytes, int length) = nullptr;
127127
uint32_t sample_frequency = 0;
128128
int header_samples = 0;
129129
int trailer_samples = 0;
130-
int (*fill_wave_ext)(int16_t *, int, const uint8_t *, int) = nullptr;
131130
};
132131

133132
~cassette_image();

‎src/lib/formats/cbm_tap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ static int cbm_tap_to_wav_size( const uint8_t *tapdata, int taplen )
330330
return size;
331331
}
332332

333-
static int cbm_tap_fill_wave( int16_t *buffer, int length, const uint8_t *bytes )
333+
static int cbm_tap_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int )
334334
{
335335
int16_t *p = buffer;
336336

‎src/lib/formats/cgen_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static int cgenie_handle_cas(int16_t *buffer, const uint8_t *casdata)
108108
/*******************************************************************
109109
Generate samples for the tape image
110110
********************************************************************/
111-
static int cgenie_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
111+
static int cgenie_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
112112
{
113113
return cgenie_handle_cas(buffer, bytes);
114114
}

‎src/lib/formats/fc100_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static int fc100_handle_cassette(int16_t *buffer, const uint8_t *bytes)
104104
Generate samples for the tape image
105105
********************************************************************/
106106

107-
static int fc100_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
107+
static int fc100_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
108108
{
109109
return fc100_handle_cassette(buffer, bytes);
110110
}

‎src/lib/formats/fm7_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static int fm7_cas_to_wav_size (const uint8_t *casdata, int caslen)
7272
/*******************************************************************
7373
Generate samples for the tape image
7474
********************************************************************/
75-
static int fm7_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
75+
static int fm7_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
7676
{
7777
return fm7_handle_t77(buffer,bytes);
7878
}

‎src/lib/formats/fmsx_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static int fmsx_cas_to_wav_size (const uint8_t *casdata, int caslen)
4949
/*******************************************************************
5050
Generate samples for the tape image
5151
********************************************************************/
52-
static int fmsx_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
52+
static int fmsx_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
5353
{
5454
int cas_pos, bit, state = 1, samples_pos, size, n, i, p;
5555

‎src/lib/formats/gtp_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static int gtp_cas_to_wav_size( const uint8_t *casdata, int caslen ) {
127127
return size;
128128
}
129129

130-
static int gtp_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes ) {
130+
static int gtp_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) {
131131
int i,size,n;
132132
size = 0;
133133
n = 0;

‎src/lib/formats/h8_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static int h8_handle_cassette(int16_t *buffer, const uint8_t *bytes)
102102
Generate samples for the tape image
103103
********************************************************************/
104104

105-
static int h8_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
105+
static int h8_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
106106
{
107107
return h8_handle_cassette(buffer, bytes);
108108
}

‎src/lib/formats/hect_tap.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static int hector_handle_forth_tap(int16_t *buffer, const uint8_t *casdata)
203203
/*******************************************************************
204204
Generate samples for the tape image
205205
********************************************************************/
206-
static int hector_tap_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
206+
static int hector_tap_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
207207
{
208208
return hector_handle_tap( buffer, bytes );
209209
}
@@ -222,7 +222,7 @@ static int hector_tap_forth_to_wav_size(const uint8_t *casdata, int caslen)
222222
/*******************************************************************
223223
Generate samples for the tape image FORTH
224224
********************************************************************/
225-
static int hector_tap_forth_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
225+
static int hector_tap_forth_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
226226
{
227227
return hector_handle_forth_tap( buffer, bytes ); //forth removed here !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
228228
}

‎src/lib/formats/kc_cas.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static int kc_handle_sss(int16_t *buffer, const uint8_t *casdata)
232232
/*******************************************************************
233233
Generate samples for the tape image
234234
********************************************************************/
235-
static int kc_kcc_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
235+
static int kc_kcc_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
236236
{
237237
return kc_handle_kcc(buffer, bytes);
238238
}
@@ -284,7 +284,7 @@ static const cassette_image::Format kc_kcc_format =
284284
/*******************************************************************
285285
Generate samples for the tape image
286286
********************************************************************/
287-
static int kc_tap_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
287+
static int kc_tap_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
288288
{
289289
return kc_handle_tap(buffer, bytes);
290290
}
@@ -336,7 +336,7 @@ static const cassette_image::Format kc_tap_format =
336336
/*******************************************************************
337337
Generate samples for the tape image
338338
********************************************************************/
339-
static int kc_sss_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
339+
static int kc_sss_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
340340
{
341341
return kc_handle_sss(buffer, bytes);
342342
}

‎src/lib/formats/kim1_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static int kim1_handle_kim(int16_t *buffer, const uint8_t *casdata)
145145
/*******************************************************************
146146
Generate samples for the tape image
147147
********************************************************************/
148-
static int kim1_kim_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
148+
static int kim1_kim_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
149149
{
150150
return kim1_handle_kim( buffer, bytes );
151151
}

‎src/lib/formats/lviv_lvt.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static int lviv_cassette_calculate_size_in_samples(const uint8_t *bytes, int len
7171

7272
/*************************************************************************************/
7373

74-
static int lviv_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
74+
static int lviv_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
7575
{
7676
int16_t * p = buffer;
7777

‎src/lib/formats/mbee_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ static int mbee_handle_tap(int16_t *buffer, const uint8_t *bytes)
209209
Generate samples for the tape image
210210
********************************************************************/
211211

212-
static int mbee_tap_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
212+
static int mbee_tap_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
213213
{
214214
return mbee_handle_tap(buffer, bytes);
215215
}

‎src/lib/formats/mz_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static int fill_wave_b(int16_t *buffer, int offs, int byte)
6969
return count;
7070
}
7171

72-
static int fill_wave(int16_t *buffer, int length, const uint8_t *code)
72+
static int fill_wave(int16_t *buffer, int length, const uint8_t *code, int)
7373
{
7474
static int16_t *beg;
7575
static uint16_t csum = 0;

‎src/lib/formats/orao_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static int orao_cas_to_wav_size( const uint8_t *casdata, int caslen ) {
6262
return size;
6363
}
6464

65-
static int orao_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes ) {
65+
static int orao_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) {
6666
int i,j,size,k;
6767
uint8_t b;
6868
size = 0;

‎src/lib/formats/oric_tap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ static int oric_cassette_calculate_size_in_samples(const uint8_t *bytes, int len
345345
}
346346

347347
/* length is length of sample buffer to fill! */
348-
static int oric_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
348+
static int oric_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
349349
{
350350
unsigned char header[9];
351351
int16_t *p = buffer;

‎src/lib/formats/p6001_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static int pc6001_cas_to_wav_size (const uint8_t *casdata, int caslen)
5353
/*******************************************************************
5454
Generate samples for the tape image
5555
********************************************************************/
56-
static int pc6001_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
56+
static int pc6001_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
5757
{
5858
return pc6001_handle_cas(buffer,bytes);
5959
}

‎src/lib/formats/phc25_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ static int phc25_handle_cassette(int16_t *buffer, const uint8_t *bytes)
129129
Generate samples for the tape image
130130
********************************************************************/
131131

132-
static int phc25_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
132+
static int phc25_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
133133
{
134134
return phc25_handle_cassette(buffer, bytes);
135135
}

‎src/lib/formats/pmd_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static int pmd85_handle_cassette(int16_t *buffer, const uint8_t *bytes)
168168
Generate samples for the tape image
169169
********************************************************************/
170170

171-
static int pmd85_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
171+
static int pmd85_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
172172
{
173173
return pmd85_handle_cassette(buffer, bytes);
174174
}

‎src/lib/formats/primoptp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static int primo_cassette_calculate_size_in_samples(const uint8_t *bytes, int le
138138
return size_in_samples;
139139
}
140140

141-
static int primo_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
141+
static int primo_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
142142
{
143143
int i = 0, j = 0, k;
144144

‎src/lib/formats/rk_cas.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static int gam_cas_to_wav_size( const uint8_t *casdata, int caslen ) {
7777
return (RK_HEADER_LEN * 8 * 2 + caslen * 8 * 2) * RK_SIZE_20;
7878
}
7979

80-
static int rk20_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes ) {
80+
static int rk20_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) {
8181
int i;
8282
int16_t * p = buffer;
8383

@@ -93,7 +93,7 @@ static int rk20_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes
9393
return p - buffer;
9494
}
9595

96-
static int rk22_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes ) {
96+
static int rk22_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) {
9797
int i;
9898
int16_t * p = buffer;
9999

@@ -109,7 +109,7 @@ static int rk22_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes
109109
return p - buffer;
110110
}
111111

112-
static int rk60_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes ) {
112+
static int rk60_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) {
113113
int i;
114114
int16_t * p = buffer;
115115

@@ -125,7 +125,7 @@ static int rk60_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes
125125
return p - buffer;
126126
}
127127

128-
static int gam_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes ) {
128+
static int gam_cas_fill_wave( int16_t *buffer, int length, const uint8_t *bytes, int ) {
129129
int i;
130130
int16_t * p = buffer;
131131

‎src/lib/formats/sol_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ static int sol20_handle_cassette(int16_t *buffer, const uint8_t *bytes)
335335
Generate samples for the tape image
336336
********************************************************************/
337337

338-
static int sol20_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
338+
static int sol20_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
339339
{
340340
return sol20_handle_cassette(buffer, bytes);
341341
}

‎src/lib/formats/sorc_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static int sorcerer_handle_cassette(int16_t *buffer, const uint8_t *bytes)
107107
Generate samples for the tape image
108108
********************************************************************/
109109

110-
static int sorcerer_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
110+
static int sorcerer_cassette_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
111111
{
112112
return sorcerer_handle_cassette(buffer, bytes);
113113
}

‎src/lib/formats/spc1000_cas.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ static int spc1000_handle_cas(int16_t *buffer, const uint8_t *bytes)
8989
Generate samples for the tape image
9090
********************************************************************/
9191

92-
static int spc1000_tap_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
92+
static int spc1000_tap_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
9393
{
9494
return spc1000_handle_tap(buffer, bytes);
9595
}
9696

97-
static int spc1000_cas_fill_wave(int16_t *buffer, int length, const uint8_t *bytes)
97+
static int spc1000_cas_fill_wave(int16_t *buffer, int length, const uint8_t *bytes, int)
9898
{
9999
return spc1000_handle_cas(buffer, bytes);
100100
}

‎src/lib/formats/svi_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static int cas_size; // FIXME: global variable prevents multiple instances
2424
/*******************************************************************
2525
Generate samples for the tape image
2626
********************************************************************/
27-
static int svi_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
27+
static int svi_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
2828
{
2929
int cas_pos, samples_pos, n, i;
3030

‎src/lib/formats/trs_cas.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static int trs80m3_handle_cas(int16_t *buffer, const uint8_t *casdata)
174174
/*******************************************************************
175175
Generate samples for the tape image
176176
********************************************************************/
177-
static int trs80_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes)
177+
static int trs80_cas_fill_wave(int16_t *buffer, int sample_count, const uint8_t *bytes, int)
178178
{
179179
if (cas_size && (bytes[0] == 0x55))
180180
return trs80m3_handle_cas( buffer, bytes );

0 commit comments

Comments
 (0)