Ticket #1399: vorbis.diff

scummvm/sound/vorbis.cpp

@@ -173 +173 @@
         const int16 *_bufferEnd;
         const int16 *_pos;
         int _played;
+        uint32 _readBufferTime;
         
         void refill();
         inline bool eosIntern() const;
@@ -185 +186 @@
         bool isStereo() const           { return _numChannels >= 2; }
         
         int getRate() const                     { return ov_info(_ov_file, -1)->rate; }
-        int getSamplesPlayed() const { return _played / _numChannels; }
+        int getSamplesPlayed() const {
+                return (_played / _numChannels) + (((g_system->get_msecs() - _readBufferTime) * getRate()) / 1000);
+        }
 
 };
 
@@ -209 +212 @@
 
         // Read in initial data
         refill();
+
+        _readBufferTime = g_system->get_msecs();
 }
 
 inline int16 VorbisInputStream::read() {
@@ -239 +244 @@
                 }
         }
         _played += samples;
+        _readBufferTime = g_system->get_msecs();
         return samples;
 }