moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-17 14:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always use the custom logger

Browse Source 
It was already used everywhere except macOS Debug builds.
This commit is contained in:
Cameron Gutman
2024-05-27 21:40:18 -04:00
parent 96fba43186
commit e07f069222
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main.cpp
+1 -14
View File
@@ -48,20 +48,14 @@
#define IS_UNSPECIFIED_HANDLE(x) ((x) == INVALID_HANDLE_VALUE || (x) == NULL) #define IS_UNSPECIFIED_HANDLE(x) ((x) == INVALID_HANDLE_VALUE || (x) == NULL)
// Log to file or console dynamically for Windows builds // Log to file or console dynamically for Windows builds
#define USE_CUSTOM_LOGGER
#define LOG_TO_FILE #define LOG_TO_FILE
#elif defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
// Use stdout logger on all Linux/BSD builds
#define USE_CUSTOM_LOGGER
#elif !defined(QT_DEBUG) && defined(Q_OS_DARWIN) #elif !defined(QT_DEBUG) && defined(Q_OS_DARWIN)
// Log to file for release Mac builds // Log to file for release Mac builds
#define USE_CUSTOM_LOGGER
#define LOG_TO_FILE #define LOG_TO_FILE
#else #else
// For debug Mac builds, use default logger // Log to console for debug Mac builds
#endif #endif
#ifdef USE_CUSTOM_LOGGER
static QElapsedTimer s_LoggerTime; static QElapsedTimer s_LoggerTime;
static QTextStream s_LoggerStream(stderr); static QTextStream s_LoggerStream(stderr);
static QMutex s_LoggerLock; static QMutex s_LoggerLock;
@@ -218,8 +212,6 @@ void ffmpegLogToDiskHandler(void* ptr, int level, const char* fmt, va_list vl)
#endif #endif
#endif
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
@@ -314,7 +306,6 @@ int main(int argc, char *argv[])
HANDLE oldConErr = GetStdHandle(STD_ERROR_HANDLE); HANDLE oldConErr = GetStdHandle(STD_ERROR_HANDLE);
#endif #endif
#ifdef USE_CUSTOM_LOGGER
#ifdef LOG_TO_FILE #ifdef LOG_TO_FILE
QDir tempDir(Path::getLogDir()); QDir tempDir(Path::getLogDir());
@@ -339,8 +330,6 @@ int main(int argc, char *argv[])
av_log_set_callback(ffmpegLogToDiskHandler); av_log_set_callback(ffmpegLogToDiskHandler);
#endif #endif
#endif
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
// Create a crash dump when we crash on Windows // Create a crash dump when we crash on Windows
SetUnhandledExceptionFilter(UnhandledExceptionHandler); SetUnhandledExceptionFilter(UnhandledExceptionHandler);
@@ -554,10 +543,8 @@ int main(int argc, char *argv[])
GlobalCommandLineParser::ParseResult commandLineParserResult = parser.parse(app.arguments()); GlobalCommandLineParser::ParseResult commandLineParserResult = parser.parse(app.arguments());
switch (commandLineParserResult) { switch (commandLineParserResult) {
case GlobalCommandLineParser::ListRequested: case GlobalCommandLineParser::ListRequested:
#ifdef USE_CUSTOM_LOGGER
// Don't log to the console since it will jumble the command output // Don't log to the console since it will jumble the command output
s_SuppressVerboseOutput = true; s_SuppressVerboseOutput = true;
#endif
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
// If we don't have stdout or stderr handles (which will normally be the case // If we don't have stdout or stderr handles (which will normally be the case
// since we're a /SUBSYSTEM:WINDOWS app), attach to our parent console and use // since we're a /SUBSYSTEM:WINDOWS app), attach to our parent console and use