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

Merge default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-04-03 10:59:47 -03:00
parent 8cad9c8bf0 03801e49d6
commit 094f9a13fe
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/openal/Source.cpp
+6 -5
View File
@@ -568,6 +568,11 @@ bool Source::isLooping() const
void Source::prepareAtomic() void Source::prepareAtomic()
{ {
// This Source may now be associated with an OpenAL source that still has
// the properties of another love Source. Let's reset it to the settings
// of the new one.
reset();
if (type == TYPE_STATIC) if (type == TYPE_STATIC)
{ {
alSourcei(source, AL_BUFFER, staticBuffer->getBuffer()); alSourcei(source, AL_BUFFER, staticBuffer->getBuffer());
@@ -590,11 +595,6 @@ void Source::prepareAtomic()
if (usedBuffers > 0) if (usedBuffers > 0)
alSourceQueueBuffers(source, usedBuffers, streamBuffers); alSourceQueueBuffers(source, usedBuffers, streamBuffers);
} }
// This Source may now be associated with an OpenAL source that still has
// the properties of another love Source. Let's reset it to the settings
// of the new one.
reset();
} }
void Source::teardownAtomic() void Source::teardownAtomic()
@@ -736,6 +736,7 @@ void Source::pauseAtomic(const std::vector<love::audio::Source*> &sources)
void Source::reset() void Source::reset()
{ {
alSourcei(source, AL_BUFFER, 0);
alSourcefv(source, AL_POSITION, position); alSourcefv(source, AL_POSITION, position);
alSourcefv(source, AL_VELOCITY, velocity); alSourcefv(source, AL_VELOCITY, velocity);
alSourcefv(source, AL_DIRECTION, direction); alSourcefv(source, AL_DIRECTION, direction);