Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-05 21:12:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix audio devices + login popup

Browse source
This commit is contained in:
HifiExperiments 2024-06-20 14:48:52 -07:00
parent 16e7b8d8b8
commit 2345bcc2b5
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.h
View file

@ -752,7 +752,7 @@ private:
bool _cursorNeedsChanging { false };
bool _useSystemCursor { false };
DialogsManagerScriptingInterface* _dialogsManagerScriptingInterface { new DialogsManagerScriptingInterface() };
DialogsManagerScriptingInterface* _dialogsManagerScriptingInterface;
QPointer<LogDialog> _logDialog;
QPointer<EntityScriptServerLogDialog> _entityScriptServerLogDialog;

28
interface/src/Application_Setup.cpp
View file

@ -475,6 +475,7 @@ void Application::initialize(const QCommandLineParser &parser) {
_entityEditSender = std::make_shared<EntityEditPacketSender>();
_graphicsEngine = std::make_shared<GraphicsEngine>();
_applicationOverlay = std::make_shared<ApplicationOverlay>();
_dialogsManagerScriptingInterface = new DialogsManagerScriptingInterface();
auto steamClient = PluginManager::getInstance()->getSteamClientPlugin();
setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
@ -585,8 +586,9 @@ void Application::initialize(const QCommandLineParser &parser) {
}
#if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)
const bool DISABLE_LOGIN_SCREEN = true; // Login screen is currently disabled
// Do not show login dialog if requested not to on the command line
if (parser.isSet("no-login-suggestion")) {
if (DISABLE_LOGIN_SCREEN || parser.isSet("no-login-suggestion")) {
_noLoginSuggestion = true;
}
#endif
@ -803,6 +805,10 @@ void Application::initialize(const QCommandLineParser &parser) {
showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
}
// An audio device changed signal received before the display plugins are set up will cause a crash,
// so we defer the setup of the `scripting::Audio` class until this point
DependencyManager::set<AudioScriptingInterface, scripting::Audio>();
// Create the rendering engine. This can be slow on some machines due to lots of
// GPU pipeline creation.
initializeRenderEngine();
@ -2029,17 +2035,13 @@ void Application::setupSignalsAndOperators() {
resumeAfterLoginDialogActionTaken();
});
#else
// Do not show login dialog if requested not to on the command line
if (_noLoginSuggestion) {
connect(offscreenUi, &OffscreenUi::keyboardFocusActive, [this]() {
resumeAfterLoginDialogActionTaken();
});
} else {
connect(offscreenUi, &OffscreenUi::keyboardFocusActive, [this]() {
connect(offscreenUi, &OffscreenUi::keyboardFocusActive, [this]() {
// Do not show login dialog if requested not to on the command line
if (!_noLoginSuggestion) {
showLoginScreen();
resumeAfterLoginDialogActionTaken();
});
}
}
resumeAfterLoginDialogActionTaken();
});
#endif
// Monitor model assets (e.g., from Clara.io) added to the world that may need resizing.
@ -2137,9 +2139,7 @@ void Application::setupSignalsAndOperators() {
});
audioIO->startThread();
// An audio device changed signal received before the display plugins are set up will cause a crash,
// so we defer the setup of the `scripting::Audio` class until this point
auto audioScriptingInterface = DependencyManager::set<AudioScriptingInterface, scripting::Audio>().data();
auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>().data();
connect(audioIO, &AudioClient::mutedByMixer, audioScriptingInterface, &AudioScriptingInterface::mutedByMixer);
connect(audioIO, &AudioClient::receivedFirstPacket, audioScriptingInterface, &AudioScriptingInterface::receivedFirstPacket);
connect(audioIO, &AudioClient::disconnected, audioScriptingInterface, &AudioScriptingInterface::disconnected);

1
interface/src/main.cpp
View file

@ -319,6 +319,7 @@ int main(int argc, const char* argv[]) {
parser.addOption(noLauncherOption);
parser.addOption(responseTokensOption);
parser.addOption(displayNameOption);
parser.addOption(noLoginOption);
parser.addOption(overrideScriptsPathOption);
parser.addOption(defaultScriptsOverrideOption);
parser.addOption(traceFileOption);

1
libraries/networking/src/NodeList.cpp
View file

@ -99,7 +99,6 @@ NodeList::NodeList(char newOwnerType, int socketListenPort, int dtlsListenPort)
// FIXME: Can remove this temporary work-around in version 2021.2.0. (New protocol version implies a domain server upgrade.)
// Adjust our canRezAvatarEntities permissions on older domains that do not have this setting.
// DomainServerList and DomainSettings packets can come in either order so need to adjust with both occurrences.
auto nodeList = DependencyManager::get<NodeList>();
connect(&_domainHandler, &DomainHandler::settingsReceived, this, &NodeList::adjustCanRezAvatarEntitiesPerSettings);
auto accountManager = DependencyManager::get<AccountManager>();