Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10493 from unknownbrackets/logging

Browse source 
Logging: Use AndroidLogger for all mobile devices
This commit is contained in:
Henrik Rydgård 2018-01-01 18:05:39 +01:00 • committed by GitHub
commit 3e40db0c00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
UI/NativeApp.cpp
View file

@ -191,10 +191,7 @@ int Win32Mix(short *buffer, int numSamples, int bits, int rate, int channels) {
#endif
// globals
#ifndef _WIN32
static AndroidLogger *logger = 0;
#endif
static AndroidLogger *logger = nullptr;
std::string boot_filename = "";
void NativeHost::InitSound() {
@ -372,8 +369,6 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
LogManager::Init();
#ifndef _WIN32
logger = new AndroidLogger();
g_Config.AddSearchPath(user_data_path);
g_Config.AddSearchPath(g_Config.memStickDirectory + "PSP/SYSTEM/");
g_Config.SetDefaultPath(g_Config.memStickDirectory + "PSP/SYSTEM/");
@ -499,9 +494,13 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
logman->SetEnabled(type, true);
logman->SetLogLevel(type, logLevel);
}
#ifdef __ANDROID__
logman->AddListener(logger);
#endif
#if defined(__ANDROID__) || (defined(MOBILE_DEVICE) && !defined(_DEBUG))
// Enable basic logging for any kind of mobile device, since LogManager doesn't.
// The MOBILE_DEVICE/_DEBUG condition matches LogManager.cpp.
logger = new AndroidLogger();
logman->AddListener(logger);
#endif
// Allow the lang directory to be overridden for testing purposes (e.g. Android, where it's hard to
@ -1139,6 +1138,9 @@ void NativeShutdown() {
net::Shutdown();
delete logger;
logger = nullptr;
// Previously we did exit() here on Android but that makes it hard to do things like restart on backend change.
// I think we handle most globals correctly or correct-enough now.
}