diff options
| author | majestic <majesticcoding@gmail.com> | 2020-10-05 13:44:02 +0200 |
|---|---|---|
| committer | majestic <majesticcoding@gmail.com> | 2020-10-05 13:44:02 +0200 |
| commit | fd0602a9ac8685c47fab22e07db2b55f188f302e (patch) | |
| tree | 2e2a496914a3a346e16c5cea9ab853959c15674e /src/audio/oal/stream.cpp | |
| parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
| parent | Fix Audio (diff) | |
| download | re3-fd0602a9ac8685c47fab22e07db2b55f188f302e.tar re3-fd0602a9ac8685c47fab22e07db2b55f188f302e.tar.gz re3-fd0602a9ac8685c47fab22e07db2b55f188f302e.tar.bz2 re3-fd0602a9ac8685c47fab22e07db2b55f188f302e.tar.lz re3-fd0602a9ac8685c47fab22e07db2b55f188f302e.tar.xz re3-fd0602a9ac8685c47fab22e07db2b55f188f302e.tar.zst re3-fd0602a9ac8685c47fab22e07db2b55f188f302e.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/audio/oal/stream.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp index 23a0a0c9..2f392264 100644 --- a/src/audio/oal/stream.cpp +++ b/src/audio/oal/stream.cpp @@ -162,13 +162,13 @@ public: void Seek(uint32 milliseconds) { if ( !IsOpened() ) return; - mpg123_seek(m_pMH, ms2samples(milliseconds)*GetSampleSize(), SEEK_SET); + mpg123_seek(m_pMH, ms2samples(milliseconds), SEEK_SET); } uint32 Tell() { if ( !IsOpened() ) return 0; - return samples2ms(mpg123_tell(m_pMH)/GetSampleSize()); + return samples2ms(mpg123_tell(m_pMH)); } uint32 Decode(void *buffer) @@ -254,13 +254,13 @@ public: void Seek(uint32 milliseconds) { if ( !IsOpened() ) return; - op_pcm_seek(m_FileH, ms2samples(milliseconds) * GetSampleSize()); + op_pcm_seek(m_FileH, ms2samples(milliseconds) / GetChannels()); } uint32 Tell() { if ( !IsOpened() ) return 0; - return samples2ms(op_pcm_tell(m_FileH)/GetSampleSize()); + return samples2ms(op_pcm_tell(m_FileH) * GetChannels()); } uint32 Decode(void *buffer) @@ -515,8 +515,8 @@ uint32 CStream::GetPosMS() alGetSourcei(m_alSource, AL_BYTE_OFFSET, &offset); return m_pSoundFile->Tell() - - m_pSoundFile->samples2ms(m_pSoundFile->GetBufferSamples() * (NUM_STREAMBUFFERS-1)) - + m_pSoundFile->samples2ms(offset/m_pSoundFile->GetSampleSize()); + - m_pSoundFile->samples2ms(m_pSoundFile->GetBufferSamples() * (NUM_STREAMBUFFERS-1)) / m_pSoundFile->GetChannels() + + m_pSoundFile->samples2ms(offset/m_pSoundFile->GetSampleSize()) / m_pSoundFile->GetChannels(); } uint32 CStream::GetLengthMS() |