History

fix hooks for webcam mode cycle and texture

Stephen Birarda committed 13 years ago

Commit ce3afbc1 parent f5079371 file · +11 −5Browse files

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

Unified · Split

interface/src/Menu.cpp+11−5
@@ -98,11 +98,17 @@ Menu::Menu() : · 97 unmodified lines
9898 appInstance->getAvatar(),
9999 SLOT(setWantCollisionsOn(bool)));
100100
101− addActionToQMenuAndActionHash(optionsMenu, MenuOption::WebcamMode);
102− addCheckableActionToQMenuAndActionHash(optionsMenu, MenuOption::WebcamTexture);
103−
104− // optionsMenu->addAction("Cycle Webcam Send Mode", _webcam.getGrabber(), SLOT(cycleVideoSendMode()));
105− // optionsMenu->addAction("Webcam Texture", _webcam.getGrabber(), SLOT(setDepthOnly(bool)))->setCheckable(true);
101+ addActionToQMenuAndActionHash(optionsMenu,
102+ MenuOption::WebcamMode,
103+ 0,
104+ appInstance->getWebcam()->getGrabber(),
105+ SLOT(cycleVideoSendMode()));
106+ addCheckableActionToQMenuAndActionHash(optionsMenu,
107+ MenuOption::WebcamTexture,
108+ 0,
109+ false,
110+ appInstance->getWebcam()->getGrabber(),
111+ SLOT(setDepthOnly(bool)));
106112
107113 addActionToQMenuAndActionHash(optionsMenu, MenuOption::GoHome, Qt::CTRL | Qt::Key_G, appInstance, SLOT(goHome()));
108114