Added 'bufferStatus(&used, &capacity)' (#28)

Author: CelliesProjects

README.md

@@ -280,10 +280,18 @@ Returns `0` if the stream is a radio stream.
 
 ### Get the buffer fill status
 ```c++
-const char *bufferStatus();
+const char *bufferStatus()
 ```
 
-Returns `0/0` if there is no buffer.<br>Otherwise returns something like `4096/65536` which means 4kB waiting in a 64kB buffer.<br>A buffer will only be allocated if there is enough free psram.
+Returns `0/0` if there is no buffer.<br>Otherwise returns something like `4096/65536` which means 4kB waiting in a 64kB buffer.
+
+```c++
+void bufferStatus(size_t &used, size_t &capacity)
+```
+
+There is also a version that takes two `size_t` variables by reference.<br>Works the same as the `const char *` version.
+
+A buffer will only be allocated if there is enough free psram.
 
 <hr>
 

src/ESP32_VS1053_Stream.cpp

@@ -402,9 +402,7 @@ void ESP32_VS1053_Stream::_playFromRingBuffer()
     while (_remainingBytes && _vs1053->data_request() && millis() - start < MAX_TIME_MS)
     {
         size_t size = 0;
-        //portDISABLE_INTERRUPTS();
         uint8_t *data = (uint8_t *)xRingbufferReceiveUpTo(_ringbuffer_handle, &size, pdMS_TO_TICKS(0), VS1053_PLAYBUFFER_SIZE);
-        //portENABLE_INTERRUPTS();
         static auto ringbufferEmpty = 0;
         if (!data)
         {
@@ -447,9 +445,7 @@ void ESP32_VS1053_Stream::_streamToRingBuffer(WiFiClient *const stream)
             break;
 
         const int BYTES_IN_BUFFER = stream->readBytes(_localbuffer, BYTES_TO_READ);
-        //portDISABLE_INTERRUPTS();
         const BaseType_t result = xRingbufferSend(_ringbuffer_handle, _localbuffer, BYTES_IN_BUFFER, pdMS_TO_TICKS(0));
-        //portENABLE_INTERRUPTS();
         if (result == pdFALSE)
         {
             log_e("ringbuffer failed to receive %i bytes. Closing stream.");
@@ -534,9 +530,7 @@ void ESP32_VS1053_Stream::_chunkedStreamToRingBuffer(WiFiClient *const stream)
             break;
 
         const int BYTES_IN_BUFFER = stream->readBytes(_localbuffer, BYTES_TO_READ);
-        //portDISABLE_INTERRUPTS();
         const BaseType_t result = xRingbufferSend(_ringbuffer_handle, _localbuffer, BYTES_IN_BUFFER, pdMS_TO_TICKS(0));
-        //portENABLE_INTERRUPTS();
         if (result == pdFALSE)
         {
             log_e("ringbuffer failed to receive %i bytes. Closing stream.");
@@ -716,7 +710,7 @@ void ESP32_VS1053_Stream::loop()
         stream->setTimeout(0);
         stream->setNoDelay(true);
     }
-    
+
     if (_remainingBytes && _vs1053->data_request())
     {
         if (_chunkedResponse)
@@ -809,3 +803,9 @@ const char *ESP32_VS1053_Stream::bufferStatus()
     snprintf(ringbuffer_status, sizeof(ringbuffer_status), "%u/%u", VS1053_PSRAM_BUFFER_SIZE - xRingbufferGetCurFreeSize(_ringbuffer_handle), VS1053_PSRAM_BUFFER_SIZE);
     return ringbuffer_status;
 }
+
+void ESP32_VS1053_Stream::bufferStatus(size_t &used, size_t &capacity)
+{
+    used = _ringbuffer_handle ? VS1053_PSRAM_BUFFER_SIZE - xRingbufferGetCurFreeSize(_ringbuffer_handle) : 0;
+    capacity = _ringbuffer_handle ? VS1053_PSRAM_BUFFER_SIZE : 0;
+}

src/ESP32_VS1053_Stream.h

@@ -61,6 +61,7 @@ class ESP32_VS1053_Stream
     size_t position();
     uint32_t bitrate();
     const char *bufferStatus();
+    void bufferStatus(size_t &used, size_t &capacity);
 
 private:
     VS1053 *_vs1053;