livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed up not python operator to proper C++ operator 

Fixed up the follow Firestorm coding standards.
master
minerjr 2025-10-29 15:21:51 -03:00
parent cc3bae406c
commit f6ce46c726
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llaudio/llaudioengine_fmodstudio.cpp
View File

@ -138,7 +138,7 @@ static FMOD_RESULT F_CALL systemCallback(FMOD_SYSTEM *system, FMOD_SYSTEM_CALLBA
std::unique_lock lock(iAudioDeviceMutex, 3s); std::unique_lock lock(iAudioDeviceMutex, 3s);
// If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass. // If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass.
// Prevents threads from interacting with the hardware at the same time as other audio/voice threads. // Prevents threads from interacting with the hardware at the same time as other audio/voice threads.
if (not lock.owns_lock()) if (!lock.owns_lock())
{ {
LL_INFOS() << "Could not access the audio device mutex, trying again later" << LL_ENDL; LL_INFOS() << "Could not access the audio device mutex, trying again later" << LL_ENDL;
return FMOD_OK; // Could be a FMOD_ERR_ALREADY_LOCKED; return FMOD_OK; // Could be a FMOD_ERR_ALREADY_LOCKED;
@ -433,7 +433,7 @@ void LLAudioEngine_FMODSTUDIO::setDevice(const LLUUID& device_uuid)
std::unique_lock lock(iAudioDeviceMutex, 3s); std::unique_lock lock(iAudioDeviceMutex, 3s);
// If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass. // If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass.
// Prevents threads from interacting with the hardware at the same time as other audio/voice threads. // Prevents threads from interacting with the hardware at the same time as other audio/voice threads.
if (not lock.owns_lock()) if (!lock.owns_lock())
{ {
LL_INFOS() << "Could not access the audio device mutex, trying again later" << LL_ENDL; LL_INFOS() << "Could not access the audio device mutex, trying again later" << LL_ENDL;
return; return;

8
indra/llwebrtc/llwebrtc.cpp
View File

@ -481,7 +481,7 @@ void LLWebRTCImpl::workerDeployDevices()
std::unique_lock lock(iAudioDeviceMutex, 3s); std::unique_lock lock(iAudioDeviceMutex, 3s);
// If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass. // If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass.
// Prevents threads from interacting with the hardware at the same time as other audio/voice threads. // Prevents threads from interacting with the hardware at the same time as other audio/voice threads.
if (not lock.owns_lock()) if (!lock.owns_lock())
{ {
return; return;
} }
@ -664,7 +664,7 @@ void LLWebRTCImpl::updateDevices()
std::unique_lock lock(iAudioDeviceMutex, 3s); std::unique_lock lock(iAudioDeviceMutex, 3s);
// If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass. // If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass.
// Prevents threads from interacting with the hardware at the same time as other audio/voice threads. // Prevents threads from interacting with the hardware at the same time as other audio/voice threads.
if (not lock.owns_lock()) if (!lock.owns_lock())
{ {
return; return;
} }
@ -859,7 +859,7 @@ void LLWebRTCImpl::intSetMute(bool mute, int delay_ms)
std::unique_lock lock(iAudioDeviceMutex, 3s); std::unique_lock lock(iAudioDeviceMutex, 3s);
// If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass. // If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass.
// Prevents threads from interacting with the hardware at the same time as other audio/voice threads. // Prevents threads from interacting with the hardware at the same time as other audio/voice threads.
if (not lock.owns_lock()) if (!lock.owns_lock())
{ {
return; return;
} }
@ -920,7 +920,7 @@ void LLWebRTCImpl::intSetMute(bool mute, int delay_ms)
std::unique_lock lock(iAudioDeviceMutex, 3s); std::unique_lock lock(iAudioDeviceMutex, 3s);
// If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass. // If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass.
// Prevents threads from interacting with the hardware at the same time as other audio/voice threads. // Prevents threads from interacting with the hardware at the same time as other audio/voice threads.
if (not lock.owns_lock()) if (!lock.owns_lock())
{ {
return; return;
} }

2
indra/newview/llvoicevivox.cpp
View File

@ -2423,7 +2423,7 @@ void LLVivoxVoiceClient::sendCaptureAndRenderDevices()
std::unique_lock lock(iAudioDeviceMutex, 3s); std::unique_lock lock(iAudioDeviceMutex, 3s);
// If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass. // If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass.
// Prevents threads from interacting with the hardware at the same time as other audio/voice threads. // Prevents threads from interacting with the hardware at the same time as other audio/voice threads.
if (not lock.owns_lock()) if (!lock.owns_lock())
{ {
LL_INFOS() << "Could not access the audio device mutex, trying again later" << LL_ENDL; LL_INFOS() << "Could not access the audio device mutex, trying again later" << LL_ENDL;
return; return;

2
indra/newview/llvoicewebrtc.cpp
View File

@ -767,7 +767,7 @@ void LLWebRTCVoiceClient::OnDevicesChangedImpl(const llwebrtc::LLWebRTCVoiceDevi
std::unique_lock lock(iAudioDeviceMutex, 3s); std::unique_lock lock(iAudioDeviceMutex, 3s);
// If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass. // If the lock could not be accessed, return as we don't have hardware access and will need to try again another pass.
// Prevents threads from interacting with the hardware at the same time as other audio/voice threads. // Prevents threads from interacting with the hardware at the same time as other audio/voice threads.
if (not lock.owns_lock()) if (!lock.owns_lock())
{ {
LL_INFOS() << "Could not access the audio device mutex, trying again later" << LL_ENDL; LL_INFOS() << "Could not access the audio device mutex, trying again later" << LL_ENDL;
return; return;