setFilePos() without rangetest

verification of valid pos only in processLocalFile()
schreibfaul1 · Apr 17, 2024 · 345f944 · 345f944
1 parent 86b8d63
commit 345f944
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/Audio.cpp b/src/Audio.cpp
@@ -3,8 +3,8 @@
  *
  *  Created on: Oct 26.2018
  *
- *  Version 3.0.9e
- *  Updated on: Apr 15.2024
+ *  Version 3.0.9f
+ *  Updated on: Apr 17.2024
  *      Author: Wolle (schreibfaul1)
  *
  */
@@ -3069,7 +3069,9 @@ void Audio::processLocalFile() {
 
     if(m_resumeFilePos >= 0) {
         if(m_resumeFilePos < m_audioDataStart) m_resumeFilePos = m_audioDataStart;
-        if(m_resumeFilePos > m_file_size) m_resumeFilePos = m_file_size;
+        if(m_resumeFilePos > m_audioDataStart + m_audioDataSize) {m_resumeFilePos = m_audioDataStart + m_audioDataSize;}
+        m_haveNewFilePos = m_resumeFilePos;
+
         if(m_codec == CODEC_M4A) m_resumeFilePos = m4a_correctResumeFilePos(m_resumeFilePos);
         if(m_codec == CODEC_WAV) {
             while((m_resumeFilePos % 4) != 0) m_resumeFilePos++;
@@ -3083,7 +3085,6 @@ void Audio::processLocalFile() {
         InBuff.resetBuffer();
         byteCounter = m_resumeFilePos;
         f_fileDataComplete = false; // #570
-        m_haveNewFilePos = m_resumeFilePos;
 
         if(m_f_Log) {
             log_i("m_resumeFilePos %i", m_resumeFilePos);
@@ -4823,8 +4824,6 @@ bool Audio::setFilePos(uint32_t pos) {
     if(!audiofile) return false;
     if(m_codec == CODEC_OPUS) return false;   // not impl. yet
     if(m_codec == CODEC_VORBIS) return false; // not impl. yet
-    if(pos < m_audioDataStart) {pos = m_audioDataStart;}
-    if(pos > m_audioDataStart + m_audioDataSize) {pos = m_audioDataStart + m_audioDataSize; stopSong(); return false;}
     memset(m_outBuff, 0, m_outbuffSize);
     m_validSamples = 0;
     m_resumeFilePos = pos;  // used in processLocalFile()

diff --git a/src/Audio.h b/src/Audio.h
@@ -3,8 +3,8 @@
  *
  *  Created on: Oct 28,2018
  *
- *  Version 3.0.9e
- *  Updated on: Apr 15.2024
+ *  Version 3.0.9f
+ *  Updated on: Apr 17.2024
  *      Author: Wolle (schreibfaul1)
  */