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-05-03 22:27:01 -03:00
parent 6da3105fe2 0372977dfa
commit 38b65b859a
39 changed files with 267 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/openal/Audio.cpp
+1
View File
@@ -37,6 +37,7 @@ Audio::PoolThread::PoolThread(Pool *pool)
, finish(false)
{
mutex = thread::newMutex();
threadName = "AudioPool";
}
Audio::PoolThread::~PoolThread()
src/modules/audio/openal/Source.cpp
+4 -19
View File
@@ -259,10 +259,7 @@ bool Source::update()
alGetSourcef(source, AL_SAMPLE_OFFSET, &curOffsetSamples);
ALint b;
alGetSourcei(source, AL_BUFFER, &b);
int freq;
alGetBufferi(b, AL_FREQUENCY, &freq);
int freq = decoder->getSampleRate();
curOffsetSecs = curOffsetSamples / freq;
// Get a free buffer.
@@ -338,11 +335,7 @@ void Source::seekAtomic(float offset, void *unit)
if (type == TYPE_STREAM)
{
offsetSamples = offset;
ALint buffer;
alGetSourcei(source, AL_BUFFER, &buffer);
int freq;
alGetBufferi(buffer, AL_FREQUENCY, &freq);
offset /= freq;
offset /= decoder->getSampleRate();
offsetSeconds = offset;
decoder->seek(offset);
}
@@ -357,11 +350,7 @@ void Source::seekAtomic(float offset, void *unit)
{
offsetSeconds = offset;
decoder->seek(offset);
ALint buffer;
alGetSourcei(source, AL_BUFFER, &buffer);
int freq;
alGetBufferi(buffer, AL_FREQUENCY, &freq);
offsetSamples = offset*freq;
offsetSamples = offset * decoder->getSampleRate();
}
else
{
@@ -403,11 +392,7 @@ float Source::tellAtomic(void *unit) const
default:
{
alGetSourcef(source, AL_SAMPLE_OFFSET, &offset);
ALint buffer;
alGetSourcei(source, AL_BUFFER, &buffer);
int freq;
alGetBufferi(buffer, AL_FREQUENCY, &freq);
offset /= freq;
offset /= decoder->getSampleRate();
if (type == TYPE_STREAM) offset += offsetSeconds;
}
break;