Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added additional comments to AudioDevice.cpp, removed unnecessary checks from AudioDevice setters.

Browse Source
This commit is contained in:
binary1248 2014-12-27 10:37:52 +01:00
parent 0ad401cc97
commit c4e450cac4
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/SFML/Audio/AudioDevice.cpp
View File

@ -104,9 +104,12 @@ AudioDevice::~AudioDevice()
bool AudioDevice::isExtensionSupported(const std::string& extension) bool AudioDevice::isExtensionSupported(const std::string& extension)
{ {
// Create a temporary audio device in case none exists yet. // Create a temporary audio device in case none exists yet.
// This device will not be used in this function and merely
// makes sure there is a valid OpenAL device for extension
// queries if none has been created yet.
std::auto_ptr<AudioDevice> device; std::auto_ptr<AudioDevice> device;
if (!audioDevice) if (!audioDevice)
device = std::auto_ptr<AudioDevice>(new AudioDevice); device.reset(new AudioDevice);
if ((extension.length() > 2) && (extension.substr(0, 3) == "ALC")) if ((extension.length() > 2) && (extension.substr(0, 3) == "ALC"))
return alcIsExtensionPresent(audioDevice, extension.c_str()) != AL_FALSE; return alcIsExtensionPresent(audioDevice, extension.c_str()) != AL_FALSE;
@ -119,9 +122,12 @@ bool AudioDevice::isExtensionSupported(const std::string& extension)
int AudioDevice::getFormatFromChannelCount(unsigned int channelCount) int AudioDevice::getFormatFromChannelCount(unsigned int channelCount)
{ {
// Create a temporary audio device in case none exists yet. // Create a temporary audio device in case none exists yet.
// This device will not be used in this function and merely
// makes sure there is a valid OpenAL device for format
// queries if none has been created yet.
std::auto_ptr<AudioDevice> device; std::auto_ptr<AudioDevice> device;
if (!audioDevice) if (!audioDevice)
device = std::auto_ptr<AudioDevice>(new AudioDevice); device.reset(new AudioDevice);
// Find the good format according to the number of channels // Find the good format according to the number of channels
int format = 0; int format = 0;
@ -147,13 +153,10 @@ int AudioDevice::getFormatFromChannelCount(unsigned int channelCount)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void AudioDevice::setGlobalVolume(float volume) void AudioDevice::setGlobalVolume(float volume)
{ {
if (volume != listenerVolume) if (audioContext)
{ alCheck(alListenerf(AL_GAIN, volume * 0.01f));
if (audioContext)
alCheck(alListenerf(AL_GAIN, volume * 0.01f));
listenerVolume = volume; listenerVolume = volume;
}
} }
@ -167,13 +170,10 @@ float AudioDevice::getGlobalVolume()
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void AudioDevice::setPosition(const Vector3f& position) void AudioDevice::setPosition(const Vector3f& position)
{ {
if (position != listenerPosition) if (audioContext)
{ alCheck(alListener3f(AL_POSITION, position.x, position.y, position.z));
if (audioContext)
alCheck(alListener3f(AL_POSITION, position.x, position.y, position.z));
listenerPosition = position; listenerPosition = position;
}
} }
@ -187,16 +187,13 @@ Vector3f AudioDevice::getPosition()
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void AudioDevice::setDirection(const Vector3f& direction) void AudioDevice::setDirection(const Vector3f& direction)
{ {
if (direction != listenerDirection) if (audioContext)
{ {
if (audioContext) float orientation[] = {direction.x, direction.y, direction.z, listenerUpVector.x, listenerUpVector.y, listenerUpVector.z};
{ alCheck(alListenerfv(AL_ORIENTATION, orientation));
float orientation[] = {direction.x, direction.y, direction.z, listenerUpVector.x, listenerUpVector.y, listenerUpVector.z};
alCheck(alListenerfv(AL_ORIENTATION, orientation));
}
listenerDirection = direction;
} }
listenerDirection = direction;
} }
@ -210,16 +207,13 @@ Vector3f AudioDevice::getDirection()
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void AudioDevice::setUpVector(const Vector3f& upVector) void AudioDevice::setUpVector(const Vector3f& upVector)
{ {
if (upVector != listenerUpVector) if (audioContext)
{ {
if (audioContext) float orientation[] = {listenerDirection.x, listenerDirection.y, listenerDirection.z, upVector.x, upVector.y, upVector.z};
{ alCheck(alListenerfv(AL_ORIENTATION, orientation));
float orientation[] = {listenerDirection.x, listenerDirection.y, listenerDirection.z, upVector.x, upVector.y, upVector.z};
alCheck(alListenerfv(AL_ORIENTATION, orientation));
}
listenerUpVector = upVector;
} }
listenerUpVector = upVector;
} }