Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
This commit is contained in:
@@ -189,6 +189,7 @@ void LLAudioChannelOpenAL::cleanup()
|
|||||||
LLAudioChannel::cleanup();
|
LLAudioChannel::cleanup();
|
||||||
alSourceStop(mALSource);
|
alSourceStop(mALSource);
|
||||||
alSourcei(mALSource, AL_BUFFER, AL_NONE);
|
alSourcei(mALSource, AL_BUFFER, AL_NONE);
|
||||||
|
mLastSamplePos = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void LLAudioChannelOpenAL::play()
|
void LLAudioChannelOpenAL::play()
|
||||||
@@ -338,7 +339,6 @@ void LLAudioBufferOpenAL::cleanup()
|
|||||||
LL_WARNS("OpenAL") << "Error: " << alutGetErrorString( error ) << " when cleaning up a buffer" << LL_ENDL;
|
LL_WARNS("OpenAL") << "Error: " << alutGetErrorString( error ) << " when cleaning up a buffer" << LL_ENDL;
|
||||||
}
|
}
|
||||||
mALBuffer = AL_NONE;
|
mALBuffer = AL_NONE;
|
||||||
mLastSamplePos = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user