@@ -351,7 +351,7 @@ STATIC mp_obj_t microbit_audio_frame_new(const mp_obj_type_t *type_in, size_t n_
351
351
STATIC mp_obj_t audio_frame_subscr (mp_obj_t self_in , mp_obj_t index_in , mp_obj_t value_in ) {
352
352
microbit_audio_frame_obj_t * self = (microbit_audio_frame_obj_t * )self_in ;
353
353
mp_int_t index = mp_obj_get_int (index_in );
354
- if (index < 0 || index >= self -> used_size ) {
354
+ if (index < 0 || index >= self -> alloc_size ) {
355
355
mp_raise_ValueError (MP_ERROR_TEXT ("index out of bounds" ));
356
356
}
357
357
if (value_in == MP_OBJ_NULL ) {
@@ -374,7 +374,7 @@ static mp_obj_t audio_frame_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
374
374
microbit_audio_frame_obj_t * self = (microbit_audio_frame_obj_t * )self_in ;
375
375
switch (op ) {
376
376
case MP_UNARY_OP_LEN :
377
- return MP_OBJ_NEW_SMALL_INT (self -> used_size );
377
+ return MP_OBJ_NEW_SMALL_INT (self -> alloc_size );
378
378
default :
379
379
return MP_OBJ_NULL ; // op not supported
380
380
}
@@ -384,14 +384,14 @@ static mp_int_t audio_frame_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufin
384
384
(void )flags ;
385
385
microbit_audio_frame_obj_t * self = (microbit_audio_frame_obj_t * )self_in ;
386
386
bufinfo -> buf = self -> data ;
387
- bufinfo -> len = self -> used_size ;
387
+ bufinfo -> len = self -> alloc_size ;
388
388
bufinfo -> typecode = 'b' ;
389
389
return 0 ;
390
390
}
391
391
392
392
static void add_into (microbit_audio_frame_obj_t * self , microbit_audio_frame_obj_t * other , bool add ) {
393
393
int mult = add ? 1 : -1 ;
394
- size_t size = MIN (self -> used_size , other -> used_size );
394
+ size_t size = MIN (self -> alloc_size , other -> alloc_size );
395
395
for (int i = 0 ; i < size ; i ++ ) {
396
396
unsigned val = (int )self -> data [i ] + mult * (other -> data [i ]- 128 );
397
397
// Clamp to 0-255
@@ -415,7 +415,7 @@ mp_obj_t copyfrom(mp_obj_t self_in, mp_obj_t other) {
415
415
microbit_audio_frame_obj_t * self = (microbit_audio_frame_obj_t * )self_in ;
416
416
mp_buffer_info_t bufinfo ;
417
417
mp_get_buffer_raise (other , & bufinfo , MP_BUFFER_READ );
418
- uint32_t len = MIN (bufinfo .len , self -> used_size );
418
+ uint32_t len = MIN (bufinfo .len , self -> alloc_size );
419
419
for (uint32_t i = 0 ; i < len ; i ++ ) {
420
420
self -> data [i ] = ((uint8_t * )bufinfo .buf )[i ];
421
421
}
@@ -452,7 +452,7 @@ int32_t float_to_fixed(float f, uint32_t scale) {
452
452
453
453
static void mult (microbit_audio_frame_obj_t * self , float f ) {
454
454
int scaled = float_to_fixed (f , 15 );
455
- for (int i = 0 ; i < self -> used_size ; i ++ ) {
455
+ for (int i = 0 ; i < self -> alloc_size ; i ++ ) {
456
456
unsigned val = ((((int )self -> data [i ]- 128 ) * scaled ) >> 15 )+ 128 ;
457
457
if (val > 255 ) {
458
458
val = (1 - (val >>31 ))* 255 ;
0 commit comments