Avoid crashing when a OGG file is broken (thanks to @kblaschke !)

Also added a name tag to Audio for logging so that it's easier to find the audio asset that's causing it

2 files changed, 21 insertions, 6 deletions

diff --git a/source/core/StarAudio.cpp b/source/core/StarAudio.cpp
index 2dfdaee..a1f2e62 100644
--- a/source/core/StarAudio.cpp
+++ b/source/core/StarAudio.cpp
@@ -239,17 +239,19 @@ public:
 
   size_t readPartial(int16_t* buffer, size_t bufferSize) {
     int bitstream;
-    int read;
+    int read = OV_HOLE;
     // ov_read takes int parameter, so do some magic here to make sure we don't
     // overflow
     bufferSize *= 2;
+    do {
 #if STAR_LITTLE_ENDIAN
-    read = ov_read(&m_vorbisFile, (char*)buffer, bufferSize, 0, 2, 1, &bitstream);
+      read = ov_read(&m_vorbisFile, (char*)buffer, bufferSize, 0, 2, 1, &bitstream);
 #else
-    read = ov_read(&m_vorbisFile, (char*)buffer, bufferSize, 1, 2, 1, &bitstream);
+      read = ov_read(&m_vorbisFile, (char*)buffer, bufferSize, 1, 2, 1, &bitstream);
 #endif
+    } while (read == OV_HOLE);
     if (read < 0)
-      throw AudioException("Error in Audio::read");
+      throw AudioException::format("Error in Audio::read ({})", read);
 
     // read in bytes, returning number of int16_t samples.
     return read / 2;
@@ -349,7 +351,8 @@ private:
   ExternalBuffer m_memoryFile;
 };
 
-Audio::Audio(IODevicePtr device) {
+Audio::Audio(IODevicePtr device, String name) {
+  m_name = name;
   if (!device->isOpen())
     device->open(IOMode::Read);
 
@@ -579,4 +582,12 @@ size_t Audio::resample(unsigned destinationChannels, unsigned destinationSampleR
   }
 }
 
+String const& Audio::name() const {
+  return m_name;
+}
+
+void Audio::setName(String name) {
+  m_name = std::move(name);
+}
+
 }
diff --git a/source/core/StarAudio.hpp b/source/core/StarAudio.hpp
index 571aaf3..443c74e 100644
--- a/source/core/StarAudio.hpp
+++ b/source/core/StarAudio.hpp
@@ -26,7 +26,7 @@ STAR_EXCEPTION(AudioException, StarException);
 // instances is not expensive.
 class Audio {
 public:
-  explicit Audio(IODevicePtr device);
+  explicit Audio(IODevicePtr device, String name = "");
   Audio(Audio const& audio);
   Audio(Audio&& audio);
 
@@ -90,12 +90,16 @@ public:
       int16_t* destinationBuffer, size_t destinationBufferSize,
       double velocity = 1.0);
 
+  String const& name() const;
+  void setName(String name);
+
 private:
   // If audio is uncompressed, this will be null.
   CompressedAudioImplPtr m_compressed;
   UncompressedAudioImplPtr m_uncompressed;
 
   ByteArray m_workingBuffer;
+  String m_name;
 };
 
 }