History

updates for new DependencyManager API

Stephen Birarda committed 11 years ago

Commit 9f21b411 parent 7beb3a713 files · +60 −57Browse files

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

Unified · Split

interface/src/Menu.cpp+20−20
@@ -530,48 +530,48 @@ Menu::Menu() : · 529 unmodified lines
530530 SLOT(cycleFrustumRenderMode()));
531531 updateFrustumRenderModeAction();
532532
533− Audio::Pointer audioIO = DependencyManager::get<Audio>();
533+ Audio::SharedPointer audioIO = DependencyManager::get<Audio>();
534534 QMenu* audioDebugMenu = developerMenu->addMenu("Audio");
535535 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction,
536536 0,
537537 true,
538− audioIO,
538+ audioIO.data(),
539539 SLOT(toggleAudioNoiseReduction()));
540540
541541 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio, 0, false,
542− audioIO, SLOT(toggleServerEcho()));
542+ audioIO.data(), SLOT(toggleServerEcho()));
543543 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoLocalAudio, 0, false,
544− audioIO, SLOT(toggleLocalEcho()));
544+ audioIO.data(), SLOT(toggleLocalEcho()));
545545 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::StereoAudio, 0, false,
546− audioIO, SLOT(toggleStereoInput()));
546+ audioIO.data(), SLOT(toggleStereoInput()));
547547 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::MuteAudio,
548548 Qt::CTRL | Qt::Key_M,
549549 false,
550− audioIO,
550+ audioIO.data(),
551551 SLOT(toggleMute()));
552552 addActionToQMenuAndActionHash(audioDebugMenu,
553553 MenuOption::MuteEnvironment,
554554 0,
555− audioIO,
555+ audioIO.data(),
556556 SLOT(sendMuteEnvironmentPacket()));
557557
558558 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioSourceInject,
559559 0,
560560 false,
561− audioIO,
561+ audioIO.data(),
562562 SLOT(toggleAudioSourceInject()));
563563 QMenu* audioSourceMenu = audioDebugMenu->addMenu("Generated Audio Source");
564564 {
565565 QAction *pinkNoise = addCheckableActionToQMenuAndActionHash(audioSourceMenu, MenuOption::AudioSourcePinkNoise,
566566 0,
567567 false,
568− audioIO,
568+ audioIO.data(),
569569 SLOT(selectAudioSourcePinkNoise()));
570570
571571 QAction *sine440 = addCheckableActionToQMenuAndActionHash(audioSourceMenu, MenuOption::AudioSourceSine440,
572572 0,
573573 true,
574− audioIO,
574+ audioIO.data(),
575575 SLOT(selectAudioSourceSine440()));
576576
577577 QActionGroup* audioSourceGroup = new QActionGroup(audioSourceMenu);
@@ -579,7 +579,7 @@ Menu::Menu() : · 1 unmodified line
579579 audioSourceGroup->addAction(sine440);
580580 }
581581
582− AudioScope::Pointer scope = DependencyManager::get<AudioScope>();
582+ AudioScope::SharedPointer scope = DependencyManager::get<AudioScope>();
583583
584584 QMenu* audioScopeMenu = audioDebugMenu->addMenu("Audio Scope");
585585 addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScope,
@@ -596,19 +596,19 @@ Menu::Menu() : · 10 unmodified lines
596596 QAction *fiveFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiveFrames,
597597 0,
598598 true,
599− scope,
599+ scope.data(),
600600 SLOT(selectAudioScopeFiveFrames()));
601601
602602 QAction *twentyFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeTwentyFrames,
603603 0,
604604 false,
605− scope,
605+ scope.data(),
606606 SLOT(selectAudioScopeTwentyFrames()));
607607
608608 QAction *fiftyFrames = addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopeFiftyFrames,
609609 0,
610610 false,
611− scope,
611+ scope.data(),
612612 SLOT(selectAudioScopeFiftyFrames()));
613613
614614 QActionGroup* audioScopeFramesGroup = new QActionGroup(audioScopeMenu);
@@ -617,20 +617,20 @@ Menu::Menu() : · 2 unmodified lines
617617 audioScopeFramesGroup->addAction(fiftyFrames);
618618 }
619619
620− AudioIOStatsRenderer* statsRenderer = DependencyManager::get<AudioIOStatsRenderer>();
620+ AudioIOStatsRenderer::SharedPointer statsRenderer = DependencyManager::get<AudioIOStatsRenderer>();
621621 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStats,
622622 Qt::CTRL | Qt::Key_A,
623623 false,
624− statsRenderer,
624+ statsRenderer.data(),
625625 SLOT(toggle()));
626626
627627 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStatsShowInjectedStreams,
628628 0,
629629 false,
630− statsRenderer,
630+ statsRenderer.data(),
631631 SLOT(toggleShowInjectedStreams()));
632632
633− connect(audioIO, SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));
633+ connect(audioIO.data(), SIGNAL(muteToggled()), this, SLOT(audioMuteToggled()));
634634
635635 QMenu* experimentalOptionsMenu = developerMenu->addMenu("Experimental");
636636 addCheckableActionToQMenuAndActionHash(experimentalOptionsMenu, MenuOption::StringHair, 0, false);
@@ -1166,7 +1166,7 @@ void Menu::displayNameLocationResponse(const QString& errorString) { · 529 unmodified lines
11661166 void Menu::toggleLocationList() {
11671167 if (!_userLocationsDialog) {
11681168 JavascriptObjectMap locationObjectMap;
1169− locationObjectMap.insert("InterfaceLocation", DependencyManager::get<AddressManager>());
1169+ locationObjectMap.insert("InterfaceLocation", DependencyManager::get<AddressManager>().data());
11701170 _userLocationsDialog = DataWebDialog::dialogForPath("/user/locations", locationObjectMap);
11711171 }
11721172
@@ -1210,7 +1210,7 @@ void Menu::nameLocation() { · 37 unmodified lines
12101210
12111211 if (!_newLocationDialog) {
12121212 JavascriptObjectMap locationObjectMap;
1213− locationObjectMap.insert("InterfaceLocation", DependencyManager::get<AddressManager>());
1213+ locationObjectMap.insert("InterfaceLocation", DependencyManager::get<AddressManager>().data());
12141214 _newLocationDialog = DataWebDialog::dialogForPath("/user/locations/new", locationObjectMap);
12151215 }
12161216