@@ -397,7 +397,7 @@ void ESP32_VS1053_Stream::_playFromRingBuffer()
397
397
398
398
const auto START_TIME_MS = millis ();
399
399
const auto MAX_TIME_MS = 5 ;
400
- // size_t bytesToDecoder = 0;
400
+ // size_t bytesToDecoder = 0;
401
401
while (_remainingBytes && _vs1053->data_request () && millis () - START_TIME_MS < MAX_TIME_MS)
402
402
{
403
403
size_t size = 0 ;
@@ -430,7 +430,7 @@ void ESP32_VS1053_Stream::_playFromRingBuffer()
430
430
431
431
_vs1053->playChunk (data, size);
432
432
vRingbufferReturnItem (_ringbuffer_handle, data);
433
- // bytesToDecoder += size;
433
+ // bytesToDecoder += size;
434
434
_remainingBytes -= _remainingBytes > 0 ? size : 0 ;
435
435
}
436
436
log_d (" spend %lu ms stuffing %i bytes in decoder" , millis () - START_TIME_MS, bytesToDecoder);
@@ -440,7 +440,7 @@ void ESP32_VS1053_Stream::_streamToRingBuffer(WiFiClient *const stream)
440
440
{
441
441
const auto START_TIME_MS = millis ();
442
442
const auto MAX_TIME_MS = 5 ;
443
- size_t bytesToRingBuffer = 0 ;
443
+ // size_t bytesToRingBuffer = 0;
444
444
while (stream && stream->available () && _musicDataPosition < _metaDataStart && millis () - START_TIME_MS < MAX_TIME_MS)
445
445
{
446
446
const size_t BYTES_AVAILABLE = _metaDataStart ? _metaDataStart - _musicDataPosition : stream->available ();
@@ -455,7 +455,7 @@ void ESP32_VS1053_Stream::_streamToRingBuffer(WiFiClient *const stream)
455
455
return ;
456
456
}
457
457
458
- bytesToRingBuffer += BYTES_IN_BUFFER;
458
+ // bytesToRingBuffer += BYTES_IN_BUFFER;
459
459
_musicDataPosition += _metaDataStart ? BYTES_IN_BUFFER : 0 ;
460
460
}
461
461
log_d (" spend %lu ms stuffing %i bytes in ringbuffer" , millis () - START_TIME_MS, bytesToRingBuffer);
@@ -481,7 +481,7 @@ void ESP32_VS1053_Stream::_handleStream(WiFiClient *const stream)
481
481
{
482
482
const auto START_TIME_MS = millis ();
483
483
const auto MAX_TIME_MS = 10 ;
484
- size_t bytesToDecoder = 0 ;
484
+ // size_t bytesToDecoder = 0;
485
485
while (stream && stream->available () && _vs1053->data_request () && _remainingBytes &&
486
486
_musicDataPosition < _metaDataStart && millis () - START_TIME_MS < MAX_TIME_MS)
487
487
{
@@ -491,7 +491,7 @@ void ESP32_VS1053_Stream::_handleStream(WiFiClient *const stream)
491
491
_vs1053->playChunk (_vs1053Buffer, BYTES_IN_BUFFER);
492
492
_remainingBytes -= _remainingBytes > 0 ? BYTES_IN_BUFFER : 0 ;
493
493
_musicDataPosition += _metaDataStart ? BYTES_IN_BUFFER : 0 ;
494
- bytesToDecoder += BYTES_IN_BUFFER;
494
+ // bytesToDecoder += BYTES_IN_BUFFER;
495
495
}
496
496
log_d (" spend %lu ms stuffing %i bytes in decoder" , millis () - START_TIME_MS, bytesToDecoder);
497
497
}
@@ -518,8 +518,9 @@ void ESP32_VS1053_Stream::_chunkedStreamToRingBuffer(WiFiClient *const stream)
518
518
{
519
519
const auto START_TIME_MS = millis ();
520
520
const auto MAX_TIME_MS = 5 ;
521
- size_t bytesToRingBuffer = 0 ;
522
- while (stream && stream->available () && _bytesLeftInChunk && _musicDataPosition < _metaDataStart && millis () - START_TIME_MS < MAX_TIME_MS)
521
+ // size_t bytesToRingBuffer = 0;
522
+ while (stream && stream->available () && _bytesLeftInChunk &&
523
+ _musicDataPosition < _metaDataStart && millis () - START_TIME_MS < MAX_TIME_MS)
523
524
{
524
525
const size_t BYTES_AVAILABLE = min (_bytesLeftInChunk, (size_t )_metaDataStart - _musicDataPosition);
525
526
const size_t BYTES_TO_READ = min (BYTES_AVAILABLE, sizeof (_localbuffer));
@@ -534,7 +535,7 @@ void ESP32_VS1053_Stream::_chunkedStreamToRingBuffer(WiFiClient *const stream)
534
535
}
535
536
536
537
_bytesLeftInChunk -= BYTES_IN_BUFFER;
537
- bytesToRingBuffer += BYTES_IN_BUFFER;
538
+ // bytesToRingBuffer += BYTES_IN_BUFFER;
538
539
_musicDataPosition += _metaDataStart ? BYTES_IN_BUFFER : 0 ;
539
540
}
540
541
log_d (" spend %lu ms stuffing %i bytes in ringbuffer" , millis () - START_TIME_MS, bytesToRingBuffer);
@@ -569,16 +570,17 @@ void ESP32_VS1053_Stream::_handleChunkedStream(WiFiClient *const stream)
569
570
{
570
571
const auto START_TIME_MS = millis ();
571
572
const auto MAX_TIME_MS = 10 ;
572
- size_t bytesToDecoder = 0 ;
573
- while (stream && stream->available () && _bytesLeftInChunk && _vs1053->data_request () && _musicDataPosition < _metaDataStart && millis () - START_TIME_MS < MAX_TIME_MS)
573
+ // size_t bytesToDecoder = 0;
574
+ while (stream && stream->available () && _bytesLeftInChunk && _vs1053->data_request () &&
575
+ _musicDataPosition < _metaDataStart && millis () - START_TIME_MS < MAX_TIME_MS)
574
576
{
575
577
const size_t BYTES_AVAILABLE = min (_bytesLeftInChunk, (size_t )_metaDataStart - _musicDataPosition);
576
578
const size_t BYTES_TO_READ = min (BYTES_AVAILABLE, VS1053_PLAYBUFFER_SIZE);
577
579
const size_t BYTES_IN_BUFFER = stream->readBytes (_vs1053Buffer, min ((size_t )stream->available (), BYTES_TO_READ));
578
580
_vs1053->playChunk (_vs1053Buffer, BYTES_IN_BUFFER);
579
581
_bytesLeftInChunk -= BYTES_IN_BUFFER;
580
582
_musicDataPosition += _metaDataStart ? BYTES_IN_BUFFER : 0 ;
581
- bytesToDecoder += BYTES_IN_BUFFER;
583
+ // bytesToDecoder += BYTES_IN_BUFFER;
582
584
}
583
585
log_d (" spend %lu ms stuffing %i bytes in decoder" , millis () - START_TIME_MS, bytesToDecoder);
584
586
}
0 commit comments