Showing the changes to interface/src/main.cpp (1 of 30 files). Show all
Unified · Split
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | #include "AddressManager.h" | 19 | #include "AddressManager.h" |
| 20 | #include "Application.h" | 20 | #include "Application.h" |
| 21 | #include "devices/OculusManager.h" | 21 | #include "devices/OculusManager.h" |
| 22 | #include "InterfaceLogging.h" | ||
| 22 | 23 | ||
| 23 | #ifdef Q_OS_WIN | 24 | #ifdef Q_OS_WIN |
| 24 | static BOOL CALLBACK enumWindowsCallback(HWND hWnd, LPARAM lParam) { | 25 | static BOOL CALLBACK enumWindowsCallback(HWND hWnd, LPARAM lParam) { |
| @@ -91,7 +92,7 @@ int main(int argc, const char* argv[]) { · 66 unmodified lines | |||
| 91 | if (clockSkewOption) { | 92 | if (clockSkewOption) { |
| 92 | int clockSkew = atoi(clockSkewOption); | 93 | int clockSkew = atoi(clockSkewOption); |
| 93 | usecTimestampNowForceClockSkew(clockSkew); | 94 | usecTimestampNowForceClockSkew(clockSkew); |
| 94 | qDebug("clockSkewOption=%s clockSkew=%d", clockSkewOption, clockSkew); | 95 | qCDebug(interface, "clockSkewOption=%s clockSkew=%d", clockSkewOption, clockSkew); |
| 95 | } | 96 | } |
| 96 | // Oculus initialization MUST PRECEDE OpenGL context creation. | 97 | // Oculus initialization MUST PRECEDE OpenGL context creation. |
| 97 | // The nature of the Application constructor means this has to be either here, | 98 | // The nature of the Application constructor means this has to be either here, |
| @@ -107,7 +108,7 @@ int main(int argc, const char* argv[]) { · 9 unmodified lines | |||
| 107 | translator.load("interface_en"); | 108 | translator.load("interface_en"); |
| 108 | app.installTranslator(&translator); | 109 | app.installTranslator(&translator); |
| 109 | 110 | ||
| 110 | qDebug( "Created QT Application."); | 111 | qCDebug(interface, "Created QT Application."); |
| 111 | exitCode = app.exec(); | 112 | exitCode = app.exec(); |
| 112 | } | 113 | } |
| 113 | 114 | ||
| @@ -115,6 +116,6 @@ int main(int argc, const char* argv[]) { · 1 unmodified line | |||
| 115 | ReleaseMutex(mutex); | 116 | ReleaseMutex(mutex); |
| 116 | #endif | 117 | #endif |
| 117 | 118 | ||
| 118 | qDebug("Normal exit."); | 119 | qCDebug(interface, "Normal exit."); |
| 119 | return exitCode; | 120 | return exitCode; |
| 120 | } | 121 | } |