LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-08-25 18:02:44 -03:00
parent 766939bdd5 d5e5f38e2f
commit 2a1e1d01d3
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/openal/Source.cpp
+4 -1
View File
@@ -66,6 +66,7 @@ Source::Source(Pool *pool, love::sound::SoundData *soundData)
, cone()
, offsetSamples(0)
, offsetSeconds(0)
, sampleRate(soundData->getSampleRate())
, channels(soundData->getChannels())
, decoder(nullptr)
, toLoop(0)
@@ -98,6 +99,7 @@ Source::Source(Pool *pool, love::sound::Decoder *decoder)
, cone()
, offsetSamples(0)
, offsetSeconds(0)
, sampleRate(decoder->getSampleRate())
, channels(decoder->getChannels())
, decoder(decoder)
, toLoop(0)
@@ -129,6 +131,7 @@ Source::Source(const Source &s)
, cone(s.cone)
, offsetSamples(0)
, offsetSeconds(0)
, sampleRate(s.sampleRate)
, channels(s.channels)
, decoder(nullptr)
, toLoop(0)
@@ -387,7 +390,7 @@ float Source::tellAtomic(void *unit) const
default:
{
alGetSourcef(source, AL_SAMPLE_OFFSET, &offset);
offset /= decoder->getSampleRate();
offset /= sampleRate;
if (type == TYPE_STREAM) offset += offsetSeconds;
}
break;
src/modules/audio/openal/Source.h
+1
View File
@@ -179,6 +179,7 @@ private:
float offsetSamples;
float offsetSeconds;
int sampleRate;
int channels;
Object::StrongRef<love::sound::Decoder> decoder;