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

Merge branch 'master' into feature/domain-server-metaverse-switching

Browse source
This commit is contained in:
Kalila L 2020-09-16 22:55:03 -04:00
commit c03d1ec659
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -7110,9 +7110,9 @@ void Application::updateWindowTitle() const {
QString currentPlaceName; QString currentPlaceName;
if (isServerlessMode()) { if (isServerlessMode()) {
if (isInErrorState) { if (isInErrorState) {
currentPlaceName = "serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString(); currentPlaceName = "Serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString();
} else { } else {
currentPlaceName = "serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString(); currentPlaceName = "Serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString();
} }
} else { } else {
currentPlaceName = DependencyManager::get<AddressManager>()->getDomainURL().host(); currentPlaceName = DependencyManager::get<AddressManager>()->getDomainURL().host();

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

@ -2072,7 +2072,6 @@ bool AudioClient::switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDevi
// NOTE: device start() uses the Qt internal device list // NOTE: device start() uses the Qt internal device list
Lock lock(_deviceMutex); Lock lock(_deviceMutex);
Lock localAudioLock(_localAudioMutex);
_localSamplesAvailable.exchange(0, std::memory_order_release); _localSamplesAvailable.exchange(0, std::memory_order_release);
//wait on local injectors prep to finish running //wait on local injectors prep to finish running
@ -2080,6 +2079,8 @@ bool AudioClient::switchOutputToAudioDevice(const HifiAudioDeviceInfo outputDevi
_localPrepInjectorFuture.waitForFinished(); _localPrepInjectorFuture.waitForFinished();
} }
Lock localAudioLock(_localAudioMutex);
// cleanup any previously initialized device // cleanup any previously initialized device
if (_audioOutput) { if (_audioOutput) {
_audioOutputIODevice.close(); _audioOutputIODevice.close();

4
libraries/entities/src/ModelEntityItem.cpp
View file

@ -746,6 +746,10 @@ QString ModelEntityItem::getBlendshapeCoefficients() const {
} }
void ModelEntityItem::setBlendshapeCoefficients(const QString& blendshapeCoefficients) { void ModelEntityItem::setBlendshapeCoefficients(const QString& blendshapeCoefficients) {
if (blendshapeCoefficients.isEmpty()) {
return;
}
QJsonParseError error; QJsonParseError error;
QJsonDocument newCoefficientsJSON = QJsonDocument::fromJson(blendshapeCoefficients.toUtf8(), &error); QJsonDocument newCoefficientsJSON = QJsonDocument::fromJson(blendshapeCoefficients.toUtf8(), &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {