aiden
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Log: Change success to verbose and move down in ordering

Browse Source
pull/1178/head
Connor McLaughlin 5 years ago
parent 678146b907
commit 98766a490f
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
android/app/src/main/res/values-it/arrays.xml
Unescape Escape View File

@ -137,8 +137,8 @@
<item>Error</item>
<item>Warning</item>
<item>Performance Warnings</item>
<item>Success</item>
<item>Information</item>
<item>Verbose</item>
<item>Developer</item>
<item>Profile</item>
<item>Debug</item>

2
android/app/src/main/res/values-pt-rBR/arrays.xml
Unescape Escape View File

@ -137,8 +137,8 @@
<item>Erro</item>
<item>Alerta</item>
<item>Alertas de Performance</item>
<item>Sucesso</item>
<item>Informação</item>
<item>Detalhado</item>
<item>Desenvolvedor</item>
<item>Perfil</item>
<item>Depuração</item>

4
android/app/src/main/res/values/arrays.xml
Unescape Escape View File

@ -242,8 +242,8 @@
<item>Error</item>
<item>Warning</item>
<item>Performance Warnings</item>
<item>Success</item>
<item>Information</item>
<item>Verbose</item>
<item>Developer</item>
<item>Profile</item>
<item>Debug</item>
@ -254,8 +254,8 @@
<item>Error</item>
<item>Warning</item>
<item>Perf</item>
<item>Success</item>
<item>Info</item>
<item>Verbose</item>
<item>Dev</item>
<item>Profile</item>
<item>Debug</item>

8
src/common/log.cpp
Unescape Escape View File

@ -17,7 +17,7 @@
namespace Log {
static const char s_log_level_characters[LOGLEVEL_COUNT] = {'X', 'E', 'W', 'P', 'S', 'I', 'D', 'R', 'B', 'T'};
static const char s_log_level_characters[LOGLEVEL_COUNT] = {'X', 'E', 'W', 'P', 'I', 'V', 'D', 'R', 'B', 'T'};
struct RegisteredCallback
{
@ -149,8 +149,8 @@ static void ConsoleOutputLogCallback(void* pUserParam, const char* channelName,
FOREGROUND_RED | FOREGROUND_INTENSITY, // ERROR
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // WARNING
FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY, // PERF
FOREGROUND_GREEN | FOREGROUND_INTENSITY, // SUCCESS
FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // INFO
FOREGROUND_GREEN | FOREGROUND_INTENSITY, // VERBOSE
FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN, // DEV
FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // PROFILE
FOREGROUND_GREEN, // DEBUG
@ -209,8 +209,8 @@ static void DebugOutputLogCallback(void* pUserParam, const char* channelName, co
ANDROID_LOG_ERROR, // ERROR
ANDROID_LOG_WARN, // WARNING
ANDROID_LOG_INFO, // PERF
ANDROID_LOG_INFO, // SUCCESS
ANDROID_LOG_INFO, // INFO
ANDROID_LOG_INFO, // VERBOSE
ANDROID_LOG_DEBUG, // DEV
ANDROID_LOG_DEBUG, // PROFILE
ANDROID_LOG_DEBUG, // DEBUG
@ -234,8 +234,8 @@ static void ConsoleOutputLogCallback(void* pUserParam, const char* channelName,
"\033[1;31m", // ERROR
"\033[1;33m", // WARNING
"\033[1;35m", // PERF
"\033[1;32m", // SUCCESS
"\033[1;37m", // INFO
"\033[1;32m", // VERBOSE
"\033[0;37m", // DEV
"\033[1;36m", // PROFILE
"\033[0;32m", // DEBUG

12
src/common/log.h
Unescape Escape View File

@ -9,8 +9,8 @@ enum LOGLEVEL
LOGLEVEL_ERROR = 1, // "ErrorPrint"
LOGLEVEL_WARNING = 2, // "WarningPrint"
LOGLEVEL_PERF = 3, // "PerfPrint"
LOGLEVEL_SUCCESS = 4, // "SuccessPrint"
LOGLEVEL_INFO = 5, // "InfoPrint"
LOGLEVEL_INFO = 4, // "InfoPrint"
LOGLEVEL_VERBOSE = 5, // "VerbosePrint"
LOGLEVEL_DEV = 6, // "DevPrint"
LOGLEVEL_PROFILE = 7, // "ProfilePrint"
LOGLEVEL_DEBUG = 8, // "DebugPrint"
@ -56,12 +56,12 @@ void Writev(const char* channelName, const char* functionName, LOGLEVEL level, c
#define Log_ErrorPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_ERROR, __VA_ARGS__)
#define Log_WarningPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_WARNING, msg)
#define Log_WarningPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_WARNING, __VA_ARGS__)
#define Log_SuccessPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_SUCCESS, msg)
#define Log_SuccessPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_SUCCESS, __VA_ARGS__)
#define Log_InfoPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_INFO, msg)
#define Log_InfoPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_INFO, __VA_ARGS__)
#define Log_PerfPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_PERF, msg)
#define Log_PerfPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_PERF, __VA_ARGS__)
#define Log_InfoPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_INFO, msg)
#define Log_InfoPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_INFO, __VA_ARGS__)
#define Log_VerbosePrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_VERBOSE, msg)
#define Log_VerbosePrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_VERBOSE, __VA_ARGS__)
#define Log_DevPrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_DEV, msg)
#define Log_DevPrintf(...) Log::Writef(___LogChannel___, __func__, LOGLEVEL_DEV, __VA_ARGS__)
#define Log_ProfilePrint(msg) Log::Write(___LogChannel___, __func__, LOGLEVEL_PROFILE, msg)

6
src/core/settings.cpp
Unescape Escape View File

@ -377,11 +377,11 @@ void Settings::Save(SettingsInterface& si) const
}
static std::array<const char*, LOGLEVEL_COUNT> s_log_level_names = {
{"None", "Error", "Warning", "Perf", "Success", "Info", "Dev", "Profile", "Debug", "Trace"}};
{"None", "Error", "Warning", "Perf", "Info", "Verbose", "Dev", "Profile", "Debug", "Trace"}};
static std::array<const char*, LOGLEVEL_COUNT> s_log_level_display_names = {
{TRANSLATABLE("LogLevel", "None"), TRANSLATABLE("LogLevel", "Error"), TRANSLATABLE("LogLevel", "Warning"),
TRANSLATABLE("LogLevel", "Performance"), TRANSLATABLE("LogLevel", "Success"),
TRANSLATABLE("LogLevel", "Information"), TRANSLATABLE("LogLevel", "Developer"), TRANSLATABLE("LogLevel", "Profile"),
TRANSLATABLE("LogLevel", "Performance"), TRANSLATABLE("LogLevel", "Information"),
TRANSLATABLE("LogLevel", "Verbose"), TRANSLATABLE("LogLevel", "Developer"), TRANSLATABLE("LogLevel", "Profile"),
TRANSLATABLE("LogLevel", "Debug"), TRANSLATABLE("LogLevel", "Trace")}};
std::optional<LOGLEVEL> Settings::ParseLogLevelName(const char* str)

4
src/core/system.cpp
Unescape Escape View File

@ -1297,8 +1297,8 @@ void UpdatePerformanceCounters()
s_last_global_tick_counter = global_tick_counter;
s_fps_timer.Reset();
Log_PerfPrintf("FPS: %.2f VPS: %.2f Average: %.2fms Worst: %.2fms", s_fps, s_vps, s_average_frame_time,
s_worst_frame_time);
Log_VerbosePrintf("FPS: %.2f VPS: %.2f Average: %.2fms Worst: %.2fms", s_fps, s_vps, s_average_frame_time,
s_worst_frame_time);
g_host_interface->OnSystemPerformanceCountersUpdated();
}

2
src/frontend-common/common_host_interface.cpp
Unescape Escape View File

@ -1928,7 +1928,7 @@ bool CommonHostInterface::SaveInputProfile(const char* profile_path, SettingsInt
return false;
}
Log_SuccessPrintf("Input profile saved to '%s'", profile_path);
Log_InfoPrintf("Input profile saved to '%s'", profile_path);
return true;
}

Write Preview
Loading…
Cancel
Save