TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

android: Send nout to Android log, don't duplicate output to stderr

Browse Source
This commit is contained in:
rdb 2021-12-06 22:24:36 +01:00
parent 9dad304f85
commit 396e623aba
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/src/prc/androidLogStream.cxx
View File

@ -92,7 +92,7 @@ overflow(int ch) {
*/ */
void AndroidLogStream::AndroidLogStreamBuf:: void AndroidLogStream::AndroidLogStreamBuf::
write_char(char c) { write_char(char c) {
nout.put(c); //nout.put(c);
if (c == '\n') { if (c == '\n') {
// Write a line to the log file. // Write a line to the log file.
__android_log_write(_priority, _tag.c_str(), _data.c_str()); __android_log_write(_priority, _tag.c_str(), _data.c_str());

4
dtool/src/prc/androidLogStream.h
View File

@ -44,10 +44,10 @@ private:
std::string _data; std::string _data;
}; };
AndroidLogStream(int priority);
public: public:
AndroidLogStream(int priority);
virtual ~AndroidLogStream(); virtual ~AndroidLogStream();
static std::ostream &out(NotifySeverity severity); static std::ostream &out(NotifySeverity severity);
}; };

11
dtool/src/prc/notify.cxx
View File

@ -31,6 +31,8 @@
#ifdef ANDROID #ifdef ANDROID
#include <android/log.h> #include <android/log.h>
#include "androidLogStream.h"
#endif #endif
using std::cerr; using std::cerr;
@ -345,8 +347,9 @@ assert_failure(const char *expression, int line,
#ifdef ANDROID #ifdef ANDROID
__android_log_assert("assert", "Panda3D", "Assertion failed: %s", message.c_str()); __android_log_assert("assert", "Panda3D", "Assertion failed: %s", message.c_str());
#endif #else
nout << "Assertion failed: " << message << "\n"; nout << "Assertion failed: " << message << "\n";
#endif
// This is redefined here, shadowing the defining in config_prc.h, so we can // This is redefined here, shadowing the defining in config_prc.h, so we can
// guarantee it has already been constructed. // guarantee it has already been constructed.
@ -477,6 +480,12 @@ config_initialized() {
} }
#endif // BUILD_IPHONE #endif // BUILD_IPHONE
} }
#ifdef ANDROID
} else {
// By default, we always redirect the notify stream to the Android log.
Notify *ptr = Notify::ptr();
ptr->set_ostream_ptr(new AndroidLogStream(ANDROID_LOG_INFO), true);
#endif
} }
} }
} }