Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 05:48:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8774 from hyperlogic/bug-fix/oculus-to-desktop-crash

Browse source 
Fix crash when switching to desktop mode from oculus HMD mode
This commit is contained in:
Brad Hefta-Gaub 2016-10-11 14:29:28 -07:00 committed by GitHub
commit c1763da9b1
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/audio-client/src/AudioClient.cpp
View file

@ -867,6 +867,10 @@ void AudioClient::handleLocalEchoAndReverb(QByteArray& inputByteArray) {
void AudioClient::handleAudioInput() { void AudioClient::handleAudioInput() {
if (!_inputDevice) {
return;
}
// input samples required to produce exactly NETWORK_FRAME_SAMPLES of output // input samples required to produce exactly NETWORK_FRAME_SAMPLES of output
const int inputSamplesRequired = (_inputToNetworkResampler ? const int inputSamplesRequired = (_inputToNetworkResampler ?
_inputToNetworkResampler->getMinInput(AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL) : _inputToNetworkResampler->getMinInput(AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL) :

1
plugins/oculus/src/OculusBaseDisplayPlugin.cpp
View file

@ -63,7 +63,6 @@ void OculusBaseDisplayPlugin::customizeContext() {
void OculusBaseDisplayPlugin::uncustomizeContext() { void OculusBaseDisplayPlugin::uncustomizeContext() {
Parent::uncustomizeContext(); Parent::uncustomizeContext();
internalPresent();
} }
bool OculusBaseDisplayPlugin::internalActivate() { bool OculusBaseDisplayPlugin::internalActivate() {