History

Remove RealSense & MIDI

Brad Davis committed 10 years ago

Commit 2cea5931 parent 385452312 files · +1 −600Browse files

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

Unified · Split

interface/src/Menu.cpp+0−7
@@ -29,7 +29,6 @@ · 28 unmodified lines
29#include "avatar/AvatarManager.h"29#include "avatar/AvatarManager.h"
30#include "devices/DdeFaceTracker.h"30#include "devices/DdeFaceTracker.h"
31#include "devices/Faceshift.h"31#include "devices/Faceshift.h"
32#include "devices/RealSense.h"
33#include "input-plugins/SpacemouseManager.h"32#include "input-plugins/SpacemouseManager.h"
34#include "MainWindow.h"33#include "MainWindow.h"
35#include "scripting/MenuScriptingInterface.h"34#include "scripting/MenuScriptingInterface.h"
@@ -462,12 +461,6 @@ Menu::Menu() { · 426 unmodified lines
462 MenuWrapper* leapOptionsMenu = handOptionsMenu->addMenu("Leap Motion");461 MenuWrapper* leapOptionsMenu = handOptionsMenu->addMenu("Leap Motion");
463 addCheckableActionToQMenuAndActionHash(leapOptionsMenu, MenuOption::LeapMotionOnHMD, 0, false);462 addCheckableActionToQMenuAndActionHash(leapOptionsMenu, MenuOption::LeapMotionOnHMD, 0, false);
464 463
465#ifdef HAVE_RSSDK
466 MenuWrapper* realSenseOptionsMenu = handOptionsMenu->addMenu("RealSense");
467 addActionToQMenuAndActionHash(realSenseOptionsMenu, MenuOption::LoadRSSDKFile, 0,
468 RealSense::getInstance(), SLOT(loadRSSDKFile()));
469#endif
470
471 MenuWrapper* networkMenu = developerMenu->addMenu("Network");464 MenuWrapper* networkMenu = developerMenu->addMenu("Network");
472 addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));465 addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
473 addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::DisableNackPackets, 0, false,466 addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::DisableNackPackets, 0, false,