Showing the changes to interface/src/Menu.cpp (1 of 13 files). Show all
Unified · Split
| @@ -530,48 +530,48 @@ Menu::Menu() : · 529 unmodified lines | |||
| 530 | SLOT(cycleFrustumRenderMode())); | 530 | SLOT(cycleFrustumRenderMode())); |
| 531 | updateFrustumRenderModeAction(); | 531 | updateFrustumRenderModeAction(); |
| 532 | 532 | ||
| 533 | Audio::Pointer audioIO = DependencyManager::get<Audio>(); | 533 | Audio::SharedPointer audioIO = DependencyManager::get<Audio>(); |
| 534 | QMenu* audioDebugMenu = developerMenu->addMenu("Audio"); | 534 | QMenu* audioDebugMenu = developerMenu->addMenu("Audio"); |
| 535 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction, | 535 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction, |
| 536 | 0, | 536 | 0, |
| 537 | true, | 537 | true, |
| 538 | audioIO, | 538 | audioIO.data(), |
| 539 | SLOT(toggleAudioNoiseReduction())); | 539 | SLOT(toggleAudioNoiseReduction())); |
| 540 | 540 | ||
| 541 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio, 0, false, | 541 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio, 0, false, |
| 542 | audioIO, SLOT(toggleServerEcho())); | 542 | audioIO.data(), SLOT(toggleServerEcho())); |
| 543 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio, 0, false, | 543 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio, 0, false, |
| 544 | audioIO, SLOT(toggleLocalEcho())); | 544 | audioIO.data(), SLOT(toggleLocalEcho())); |
| 545 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::StereoAudio, 0, false, | 545 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::StereoAudio, 0, false, |
| 546 | audioIO, SLOT(toggleStereoInput())); | 546 | audioIO.data(), SLOT(toggleStereoInput())); |
| 547 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteAudio, | 547 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteAudio, |
| 548 | Qt::CTRL | Qt::Key_M, | 548 | Qt::CTRL | Qt::Key_M, |
| 549 | false, | 549 | false, |
| 550 | audioIO, | 550 | audioIO.data(), |
| 551 | SLOT(toggleMute())); | 551 | SLOT(toggleMute())); |
| 552 | addActionToQMenuAndActionHash(audioDebugMenu, | 552 | addActionToQMenuAndActionHash(audioDebugMenu, |
| 553 | MenuOption::MuteEnvironment, | 553 | MenuOption::MuteEnvironment, |
| 554 | 0, | 554 | 0, |
| 555 | audioIO, | 555 | audioIO.data(), |
| 556 | SLOT(sendMuteEnvironmentPacket())); | 556 | SLOT(sendMuteEnvironmentPacket())); |
| 557 | 557 | ||
| 558 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioSourceInject, | 558 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioSourceInject, |
| 559 | 0, | 559 | 0, |
| 560 | false, | 560 | false, |
| 561 | audioIO, | 561 | audioIO.data(), |
| 562 | SLOT(toggleAudioSourceInject())); | 562 | SLOT(toggleAudioSourceInject())); |
| 563 | QMenu* audioSourceMenu = audioDebugMenu->addMenu("Generated Audio Source"); | 563 | QMenu* audioSourceMenu = audioDebugMenu->addMenu("Generated Audio Source"); |
| 564 | { | 564 | { |
| 565 | QAction *pinkNoise = addCheckableActionToQMenuAndActionHash(audioSourceMenu, MenuOption::AudioSourcePinkNoise, | 565 | QAction *pinkNoise = addCheckableActionToQMenuAndActionHash(audioSourceMenu, MenuOption::AudioSourcePinkNoise, |
| 566 | 0, | 566 | 0, |
| 567 | false, | 567 | false, |
| 568 | audioIO, | 568 | audioIO.data(), |
| 569 | SLOT(selectAudioSourcePinkNoise())); | 569 | SLOT(selectAudioSourcePinkNoise())); |
| 570 | 570 | ||
| 571 | QAction *sine440 = addCheckableActionToQMenuAndActionHash(audioSourceMenu, MenuOption::AudioSourceSine440, | 571 | QAction *sine440 = addCheckableActionToQMenuAndActionHash(audioSourceMenu, MenuOption::AudioSourceSine440, |
| 572 | 0, | 572 | 0, |
| 573 | true, | 573 | true, |
| 574 | audioIO, | 574 | audioIO.data(), |
| 575 | SLOT(selectAudioSourceSine440())); | 575 | SLOT(selectAudioSourceSine440())); |
| 576 | 576 | ||
| 577 | QActionGroup* audioSourceGroup = new QActionGroup(audioSourceMenu); | 577 | QActionGroup* audioSourceGroup = new QActionGroup(audioSourceMenu); |
| @@ -579,7 +579,7 @@ Menu::Menu() : · 1 unmodified line | |||
| 579 | audioSourceGroup->addAction(sine440); | 579 | audioSourceGroup->addAction(sine440); |
| 580 | } | 580 | } |
| 581 | 581 | ||
| 582 | AudioScope::Pointer scope = DependencyManager::get<AudioScope>(); | 582 | AudioScope::SharedPointer scope = DependencyManager::get<AudioScope>(); |
| 583 | 583 | ||
| 584 | QMenu* audioScopeMenu = audioDebugMenu->addMenu("Audio Scope"); | 584 | QMenu* audioScopeMenu = audioDebugMenu->addMenu("Audio Scope"); |
| 585 | addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScope, | 585 | addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScope, |
| @@ -596,19 +596,19 @@ Menu::Menu() : · 10 unmodified lines | |||
| 596 | QAction *fiveFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiveFrames, | 596 | QAction *fiveFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiveFrames, |
| 597 | 0, | 597 | 0, |
| 598 | true, | 598 | true, |
| 599 | scope, | 599 | scope.data(), |
| 600 | SLOT(selectAudioScopeFiveFrames())); | 600 | SLOT(selectAudioScopeFiveFrames())); |
| 601 | 601 | ||
| 602 | QAction *twentyFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeTwentyFrames, | 602 | QAction *twentyFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeTwentyFrames, |
| 603 | 0, | 603 | 0, |
| 604 | false, | 604 | false, |
| 605 | scope, | 605 | scope.data(), |
| 606 | SLOT(selectAudioScopeTwentyFrames())); | 606 | SLOT(selectAudioScopeTwentyFrames())); |
| 607 | 607 | ||
| 608 | QAction *fiftyFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiftyFrames, | 608 | QAction *fiftyFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiftyFrames, |
| 609 | 0, | 609 | 0, |
| 610 | false, | 610 | false, |
| 611 | scope, | 611 | scope.data(), |
| 612 | SLOT(selectAudioScopeFiftyFrames())); | 612 | SLOT(selectAudioScopeFiftyFrames())); |
| 613 | 613 | ||
| 614 | QActionGroup* audioScopeFramesGroup = new QActionGroup(audioScopeMenu); | 614 | QActionGroup* audioScopeFramesGroup = new QActionGroup(audioScopeMenu); |
| @@ -617,20 +617,20 @@ Menu::Menu() : · 2 unmodified lines | |||
| 617 | audioScopeFramesGroup->addAction(fiftyFrames); | 617 | audioScopeFramesGroup->addAction(fiftyFrames); |
| 618 | } | 618 | } |
| 619 | 619 | ||
| 620 | AudioIOStatsRenderer* statsRenderer = DependencyManager::get<AudioIOStatsRenderer>(); | 620 | AudioIOStatsRenderer::SharedPointer statsRenderer = DependencyManager::get<AudioIOStatsRenderer>(); |
| 621 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStats, | 621 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStats, |
| 622 | Qt::CTRL | Qt::Key_A, | 622 | Qt::CTRL | Qt::Key_A, |
| 623 | false, | 623 | false, |
| 624 | statsRenderer, | 624 | statsRenderer.data(), |
| 625 | SLOT(toggle())); | 625 | SLOT(toggle())); |
| 626 | 626 | ||
| 627 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStatsShowInjectedStreams, | 627 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStatsShowInjectedStreams, |
| 628 | 0, | 628 | 0, |
| 629 | false, | 629 | false, |
| 630 | statsRenderer, | 630 | statsRenderer.data(), |
| 631 | SLOT(toggleShowInjectedStreams())); | 631 | SLOT(toggleShowInjectedStreams())); |
| 632 | 632 | ||
| 633 | connect(audioIO, SIGNAL(muteToggled()), this, SLOT(audioMuteToggled())); | 633 | connect(audioIO.data(), SIGNAL(muteToggled()), this, SLOT(audioMuteToggled())); |
| 634 | 634 | ||
| 635 | QMenu* experimentalOptionsMenu = developerMenu->addMenu("Experimental"); | 635 | QMenu* experimentalOptionsMenu = developerMenu->addMenu("Experimental"); |
| 636 | addCheckableActionToQMenuAndActionHash(experimentalOptionsMenu, MenuOption::StringHair, 0, false); | 636 | addCheckableActionToQMenuAndActionHash(experimentalOptionsMenu, MenuOption::StringHair, 0, false); |
| @@ -1166,7 +1166,7 @@ void Menu::displayNameLocationResponse(const QString& errorString) { · 529 unmodified lines | |||
| 1166 | void Menu::toggleLocationList() { | 1166 | void Menu::toggleLocationList() { |
| 1167 | if (!_userLocationsDialog) { | 1167 | if (!_userLocationsDialog) { |
| 1168 | JavascriptObjectMap locationObjectMap; | 1168 | JavascriptObjectMap locationObjectMap; |
| 1169 | locationObjectMap.insert("InterfaceLocation", DependencyManager::get<AddressManager>()); | 1169 | locationObjectMap.insert("InterfaceLocation", DependencyManager::get<AddressManager>().data()); |
| 1170 | _userLocationsDialog = DataWebDialog::dialogForPath("/user/locations", locationObjectMap); | 1170 | _userLocationsDialog = DataWebDialog::dialogForPath("/user/locations", locationObjectMap); |
| 1171 | } | 1171 | } |
| 1172 | 1172 | ||
| @@ -1210,7 +1210,7 @@ void Menu::nameLocation() { · 37 unmodified lines | |||
| 1210 | 1210 | ||
| 1211 | if (!_newLocationDialog) { | 1211 | if (!_newLocationDialog) { |
| 1212 | JavascriptObjectMap locationObjectMap; | 1212 | JavascriptObjectMap locationObjectMap; |
| 1213 | locationObjectMap.insert("InterfaceLocation", DependencyManager::get<AddressManager>()); | 1213 | locationObjectMap.insert("InterfaceLocation", DependencyManager::get<AddressManager>().data()); |
| 1214 | _newLocationDialog = DataWebDialog::dialogForPath("/user/locations/new", locationObjectMap); | 1214 | _newLocationDialog = DataWebDialog::dialogForPath("/user/locations/new", locationObjectMap); |
| 1215 | } | 1215 | } |
| 1216 | 1216 | ||