Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all
Unified · Split
| @@ -150,7 +150,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 149 unmodified lines | ||
| 150 | 150 | _viewFrustum(), |
| 151 | 151 | _lastQueriedViewFrustum(), |
| 152 | 152 | _lastQueriedTime(usecTimestampNow()), |
| 153 | − _audioScope(256, 200, true), | |
| 154 | 153 | _mirrorViewRect(QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT)), |
| 155 | 154 | _mouseX(0), |
| 156 | 155 | _mouseY(0), |
| @@ -161,7 +160,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 4 unmodified lines | ||
| 161 | 160 | _touchAvgY(0.0f), |
| 162 | 161 | _isTouchPressed(false), |
| 163 | 162 | _mousePressed(false), |
| 164 | − _audio(&_audioScope, STARTUP_JITTER_SAMPLES), | |
| 163 | + _audio(STARTUP_JITTER_SAMPLES), | |
| 165 | 164 | _enableProcessVoxelsThread(true), |
| 166 | 165 | _voxelProcessor(), |
| 167 | 166 | _voxelHideShowThread(&_voxels), |
| @@ -744,9 +743,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 576 unmodified lines | ||
| 744 | 743 | case Qt::Key_Period: |
| 745 | 744 | Menu::getInstance()->handleViewFrustumOffsetKeyModifier(event->key()); |
| 746 | 745 | break; |
| 747 | − case Qt::Key_Apostrophe: | |
| 748 | − _audioScope.inputPaused = !_audioScope.inputPaused; | |
| 749 | − break; | |
| 750 | 746 | case Qt::Key_L: |
| 751 | 747 | if (isShifted) { |
| 752 | 748 | Menu::getInstance()->triggerOption(MenuOption::LodTools); |
| @@ -2509,15 +2505,6 @@ void Application::displayOverlay() { · 1756 unmodified lines | ||
| 2509 | 2505 | } |
| 2510 | 2506 | } |
| 2511 | 2507 | |
| 2512 | − // Audio Scope | |
| 2513 | − const int AUDIO_SCOPE_Y_OFFSET = 135; | |
| 2514 | − if (Menu::getInstance()->isOptionChecked(MenuOption::Stats)) { | |
| 2515 | − if (Menu::getInstance()->isOptionChecked(MenuOption::Oscilloscope)) { | |
| 2516 | − int oscilloscopeTop = _glWidget->height() - AUDIO_SCOPE_Y_OFFSET; | |
| 2517 | − _audioScope.render(MIRROR_VIEW_LEFT_PADDING, oscilloscopeTop); | |
| 2518 | − } | |
| 2519 | − } | |
| 2520 | − | |
| 2521 | 2508 | // Audio VU Meter and Mute Icon |
| 2522 | 2509 | const int MUTE_ICON_SIZE = 24; |
| 2523 | 2510 | const int AUDIO_METER_INSET = 2; |