Showing the changes to interface/src/main.cpp (1 of 35 files). Show all
Unified · Split
| @@ -18,7 +18,6 @@ · 17 unmodified lines | ||
| 18 | 18 | |
| 19 | 19 | #include "AddressManager.h" |
| 20 | 20 | #include "Application.h" |
| 21 | −#include "devices/OculusManager.h" | |
| 22 | 21 | #include "InterfaceLogging.h" |
| 23 | 22 | |
| 24 | 23 | #ifdef Q_OS_WIN |
| @@ -97,8 +96,8 @@ int main(int argc, const char* argv[]) { · 72 unmodified lines | ||
| 97 | 96 | // Oculus initialization MUST PRECEDE OpenGL context creation. |
| 98 | 97 | // The nature of the Application constructor means this has to be either here, |
| 99 | 98 | // or in the main window ctor, before GL startup. |
| 100 | − OculusManager::init(); | |
| 101 | − | |
| 99 | + Application::initPlugins(); | |
| 100 | + | |
| 102 | 101 | int exitCode; |
| 103 | 102 | { |
| 104 | 103 | QSettings::setDefaultFormat(QSettings::IniFormat); |
| @@ -112,7 +111,7 @@ int main(int argc, const char* argv[]) { · 7 unmodified lines | ||
| 112 | 111 | exitCode = app.exec(); |
| 113 | 112 | } |
| 114 | 113 | |
| 115 | − OculusManager::deinit(); | |
| 114 | + Application::shutdownPlugins(); | |
| 116 | 115 | #ifdef Q_OS_WIN |
| 117 | 116 | ReleaseMutex(mutex); |
| 118 | 117 | #endif |