Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -1317,6 +1317,16 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1316 unmodified lines | |||
| 1317 | connect(this, &Application::activeDisplayPluginChanged, this, [&](){ | 1317 | connect(this, &Application::activeDisplayPluginChanged, this, [&](){ |
| 1318 | auto dialogsManager = DependencyManager::get<DialogsManager>(); | 1318 | auto dialogsManager = DependencyManager::get<DialogsManager>(); |
| 1319 | auto keyboard = DependencyManager::get<Keyboard>(); | 1319 | auto keyboard = DependencyManager::get<Keyboard>(); |
| 1320 | if (_loginStateSoundInjector != nullptr) { | ||
| 1321 | AudioInjectorOptions options; | ||
| 1322 | options.localOnly = true; | ||
| 1323 | options.position = getMyAvatar()->getHeadPosition(); | ||
| 1324 | options.loop = true; | ||
| 1325 | options.volume = 0.4f; | ||
| 1326 | options.stereo = true; | ||
| 1327 | _loginStateSoundInjector->setOptions(options); | ||
| 1328 | _loginStateSoundInjector->restart(); | ||
| 1329 | } | ||
| 1320 | if (getLoginDialogPoppedUp()) { | 1330 | if (getLoginDialogPoppedUp()) { |
| 1321 | if (_firstRun.get()) { | 1331 | if (_firstRun.get()) { |
| 1322 | // display mode changed. Don't allow auto-switch to work after this session. | 1332 | // display mode changed. Don't allow auto-switch to work after this session. |
| @@ -2967,15 +2977,15 @@ void Application::showLoginScreen() { · 1644 unmodified lines | |||
| 2967 | loginData["action"] = "login dialog shown"; | 2977 | loginData["action"] = "login dialog shown"; |
| 2968 | UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData); | 2978 | UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData); |
| 2969 | _window->setWindowTitle("High Fidelity Interface"); | 2979 | _window->setWindowTitle("High Fidelity Interface"); |
| 2970 | if (!_loginStateSoundInjector) { | 2980 | //if (!_loginStateSoundInjector) { |
| 2971 | AudioInjectorOptions options; | 2981 | // AudioInjectorOptions options; |
| 2972 | options.localOnly = true; | 2982 | // options.localOnly = true; |
| 2973 | options.position = getMyAvatar()->getHeadPosition(); | 2983 | // options.position = getMyAvatar()->getHeadPosition(); |
| 2974 | options.loop = true; | 2984 | // options.loop = true; |
| 2975 | options.volume = 0.4f; | 2985 | // options.volume = 0.4f; |
| 2976 | options.stereo = true; | 2986 | // options.stereo = true; |
| 2977 | _loginStateSoundInjector = AudioInjector::playSound(_loginStateSound, options); | 2987 | // _loginStateSoundInjector = AudioInjector::playSound(_loginStateSound, options); |
| 2978 | } | 2988 | //} |
| 2979 | } else { | 2989 | } else { |
| 2980 | resumeAfterLoginDialogActionTaken(); | 2990 | resumeAfterLoginDialogActionTaken(); |
| 2981 | } | 2991 | } |