From 197b7fe7940ec067be8e25b38adebe41e0038fd4 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Wed, 12 Aug 2020 16:59:03 -0700 Subject: [PATCH] Fix seek behavior in Opus, STDIO (#296) --- src/AudioFileSourceSTDIO.cpp | 2 +- src/AudioGeneratorOpus.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/AudioFileSourceSTDIO.cpp b/src/AudioFileSourceSTDIO.cpp index 75d0cd1..cd93ca9 100644 --- a/src/AudioFileSourceSTDIO.cpp +++ b/src/AudioFileSourceSTDIO.cpp @@ -69,7 +69,7 @@ uint32_t AudioFileSourceSTDIO::read(void *data, uint32_t len) bool AudioFileSourceSTDIO::seek(int32_t pos, int dir) { - return fseek(f, pos, dir); + return fseek(f, pos, dir) == 0; } bool AudioFileSourceSTDIO::close() diff --git a/src/AudioGeneratorOpus.cpp b/src/AudioGeneratorOpus.cpp index c8b80e8..8ce2e42 100644 --- a/src/AudioGeneratorOpus.cpp +++ b/src/AudioGeneratorOpus.cpp @@ -84,7 +84,7 @@ bool AudioGeneratorOpus::loop() if (ret == OP_HOLE) { // fprintf(stderr,"\nHole detected! Corrupt file segment?\n"); continue; - } else if (ret < 0) { + } else if (ret <= 0) { running = false; goto done; } @@ -120,7 +120,6 @@ bool AudioGeneratorOpus::isRunning() return running; } - int AudioGeneratorOpus::read_cb(unsigned char *_ptr, int _nbytes) { if (_nbytes == 0) return 0; _nbytes = file->read(_ptr, _nbytes);