History

Merge branch 'master' of https://github.com/highfidelity/hifi into mac-sleep-monitor

howard-stearns committed 7 years ago

Commit 2eb3fdb2 parents 8d3dc52 dd9b4a87 files · +29 −47Browse files

Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all

Unified · Split

interface/src/Application.cpp+0−21
@@ -4445,27 +4445,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 4444 unmodified lines
4445 }4445 }
4446 break;4446 break;
4447 4447
4448 case Qt::Key_P: {
4449 if (!isShifted && !isMeta && !isOption && !event->isAutoRepeat()) {
4450 AudioInjectorOptions options;
4451 options.localOnly = true;
4452 options.positionSet = false; // system sound
4453 options.stereo = true;
4454
4455 Setting::Handle<bool> notificationSounds{ MenuOption::NotificationSounds, true };
4456 Setting::Handle<bool> notificationSoundSnapshot{ MenuOption::NotificationSoundsSnapshot, true };
4457 if (notificationSounds.get() && notificationSoundSnapshot.get()) {
4458 if (_snapshotSoundInjector) {
4459 DependencyManager::get<AudioInjectorManager>()->setOptionsAndRestart(_snapshotSoundInjector, options);
4460 } else {
4461 _snapshotSoundInjector = DependencyManager::get<AudioInjectorManager>()->playSound(_snapshotSound, options);
4462 }
4463 }
4464 takeSnapshot(true);
4465 }
4466 break;
4467 }
4468
4469 case Qt::Key_Apostrophe: {4448 case Qt::Key_Apostrophe: {
4470 if (isMeta) {4449 if (isMeta) {
4471 auto cursor = Cursor::Manager::instance().getCursor();4450 auto cursor = Cursor::Manager::instance().getCursor();