Showing the changes to interface/src/Application.cpp (1 of 12 files). Show all
Unified · Split
| @@ -110,8 +110,6 @@ · 109 unmodified lines | |||
| 110 | #include "devices/EyeTracker.h" | 110 | #include "devices/EyeTracker.h" |
| 111 | #include "devices/Faceshift.h" | 111 | #include "devices/Faceshift.h" |
| 112 | #include "devices/Leapmotion.h" | 112 | #include "devices/Leapmotion.h" |
| 113 | #include "devices/MIDIManager.h" | ||
| 114 | #include "devices/RealSense.h" | ||
| 115 | #include "DiscoverabilityManager.h" | 113 | #include "DiscoverabilityManager.h" |
| 116 | #include "GLCanvas.h" | 114 | #include "GLCanvas.h" |
| 117 | #include "InterfaceActionFactory.h" | 115 | #include "InterfaceActionFactory.h" |
| @@ -719,12 +717,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 601 unmodified lines | |||
| 719 | // set the local loopback interface for local sounds from audio scripts | 717 | // set the local loopback interface for local sounds from audio scripts |
| 720 | AudioScriptingInterface::getInstance().setLocalAudioInterface(audioIO.data()); | 718 | AudioScriptingInterface::getInstance().setLocalAudioInterface(audioIO.data()); |
| 721 | 719 | ||
| 722 | #ifdef HAVE_RTMIDI | ||
| 723 | // setup the MIDIManager | ||
| 724 | MIDIManager& midiManagerInstance = MIDIManager::getInstance(); | ||
| 725 | midiManagerInstance.openDefaultPort(); | ||
| 726 | #endif | ||
| 727 | |||
| 728 | this->installEventFilter(this); | 720 | this->installEventFilter(this); |
| 729 | 721 | ||
| 730 | // initialize our face trackers after loading the menu settings | 722 | // initialize our face trackers after loading the menu settings |
| @@ -970,7 +962,6 @@ Application::~Application() { · 239 unmodified lines | |||
| 970 | nodeThread->wait(); | 962 | nodeThread->wait(); |
| 971 | 963 | ||
| 972 | Leapmotion::destroy(); | 964 | Leapmotion::destroy(); |
| 973 | RealSense::destroy(); | ||
| 974 | 965 | ||
| 975 | #if 0 | 966 | #if 0 |
| 976 | ConnexionClient::getInstance().destroy(); | 967 | ConnexionClient::getInstance().destroy(); |
| @@ -2519,7 +2510,6 @@ void Application::init() { · 1542 unmodified lines | |||
| 2519 | qCDebug(interfaceapp) << "Loaded settings"; | 2510 | qCDebug(interfaceapp) << "Loaded settings"; |
| 2520 | 2511 | ||
| 2521 | Leapmotion::init(); | 2512 | Leapmotion::init(); |
| 2522 | RealSense::init(); | ||
| 2523 | 2513 | ||
| 2524 | // fire off an immediate domain-server check in now that settings are loaded | 2514 | // fire off an immediate domain-server check in now that settings are loaded |
| 2525 | DependencyManager::get<NodeList>()->sendDomainServerCheckIn(); | 2515 | DependencyManager::get<NodeList>()->sendDomainServerCheckIn(); |
| @@ -4069,10 +4059,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 1543 unmodified lines | |||
| 4069 | scriptEngine->registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data()); | 4059 | scriptEngine->registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data()); |
| 4070 | 4060 | ||
| 4071 | scriptEngine->registerGlobalObject("ScriptDiscoveryService", this->getRunningScriptsWidget()); | 4061 | scriptEngine->registerGlobalObject("ScriptDiscoveryService", this->getRunningScriptsWidget()); |
| 4072 | |||
| 4073 | #ifdef HAVE_RTMIDI | ||
| 4074 | scriptEngine->registerGlobalObject("MIDI", &MIDIManager::getInstance()); | ||
| 4075 | #endif | ||
| 4076 | } | 4062 | } |
| 4077 | 4063 | ||
| 4078 | bool Application::canAcceptURL(const QString& urlString) { | 4064 | bool Application::canAcceptURL(const QString& urlString) { |