mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 18:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split up Android logging code to separate header file

Browse Source
This commit is contained in:
twinaphex 2014-06-01 15:53:48 +02:00
parent 59bc2db2c8
commit 1dd34b41b1
2 changed files with 57 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
logger/android_logger_override.h Normal file
View File

@ -0,0 +1,55 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2014 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __ANDROID_LOGGER_H
#define __ANDROID_LOGGER_H
#include <stdarg.h>
#include <android/log.h>
#ifndef RARCH_LOG
#define RARCH_LOG(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch: ", __VA_ARGS__)
#endif
#ifndef RARCH_LOG_V
#define RARCH_LOG_V(tag, fmt, vp) __android_log_vprint(ANDROID_LOG_INFO, "RetroArch: " tag, fmt, vp)
#endif
#ifndef RARCH_LOG_OUTPUT
#define RARCH_LOG_OUTPUT(...) RARCH_LOG(__VA_ARGS__)
#endif
#ifndef RARCH_LOG_OUTPUT_V
#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) RARCH_LOG_V(tag, fmt, vp)
#endif
#ifndef RARCH_ERR
#define RARCH_ERR(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch [ERROR] :: ", __VA_ARGS__)
#endif
#ifndef RARCH_ERR_V
#define RARCH_ERR_V(tag, fmt, vp) __android_log_vprint(ANDROID_LOG_INFO, "RetroArch [ERROR] :: " tag, fmt, vp)
#endif
#ifndef RARCH_WARN
#define RARCH_WARN(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch [WARN] :: ", __VA_ARGS__)
#endif
#ifndef RARCH_WARN_V
#define RARCH_WARN_V(tag, fmt, vp) __android_log_print(ANDROID_LOG_INFO, "RetroArch [WARN] :: " tag, fmt, vp)
#endif
#endif

26
retroarch_logger.h
View File

@ -19,10 +19,6 @@
#include <stdarg.h>
#if defined(ANDROID) && defined(HAVE_LOGGER)
#include <android/log.h>
#endif
#if defined(RARCH_DUMMY_LOG)
#define LOG_FILE (stderr)
#elif defined(HAVE_FILE_LOGGER) && defined(RARCH_INTERNAL)
@ -39,6 +35,8 @@
#include "logger/xdk1_logger_override.h"
#elif defined(IS_SALAMANDER)
#include "logger/salamander_logger_override.h"
#elif defined(ANDROID) && defined(HAVE_LOGGER)
#include "logger/android_logger_override.h"
#else
#if defined(RARCH_DUMMY_LOG) || !defined(RARCH_INTERNAL)
@ -49,10 +47,6 @@
#ifndef RARCH_LOG
#undef RARCH_LOG_V
#if defined(ANDROID) && defined(HAVE_LOGGER)
#define RARCH_LOG(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch: ", __VA_ARGS__)
#define RARCH_LOG_V(tag, fmt, vp) __android_log_vprint(ANDROID_LOG_INFO, "RetroArch: " tag, fmt, vp)
#else
#define RARCH_LOG(...) do { \
if (RARCH_LOG_VERBOSE) \
{ \
@ -69,14 +63,9 @@
} \
} while (0)
#endif
#endif
#ifndef RARCH_LOG_OUTPUT
#undef RARCH_LOG_OUTPUT_V
#if (defined(ANDROID) && defined(HAVE_LOGGER))
#define RARCH_LOG_OUTPUT(...) RARCH_LOG(__VA_ARGS__)
#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) RARCH_LOG_V(tag, fmt, vp)
#else
#define RARCH_LOG_OUTPUT(...) do { \
fprintf(LOG_FILE, __VA_ARGS__); \
fflush(LOG_FILE); \
@ -87,14 +76,9 @@
fflush(LOG_FILE); \
} while (0)
#endif
#endif
#ifndef RARCH_ERR
#undef RARCH_ERR_V
#if defined(ANDROID) && defined(HAVE_LOGGER)
#define RARCH_ERR(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch [ERROR] :: ", __VA_ARGS__)
#define RARCH_ERR_V(tag, fmt, vp) __android_log_vprint(ANDROID_LOG_INFO, "RetroArch [ERROR] :: " tag, fmt, vp)
#else
#define RARCH_ERR(...) do { \
fprintf(LOG_FILE, "RetroArch [ERROR] :: " __VA_ARGS__); \
fflush(LOG_FILE); \
@ -105,14 +89,9 @@
fflush(LOG_FILE); \
} while (0)
#endif
#endif
#ifndef RARCH_WARN
#undef RARCH_WARN_V
#if defined(ANDROID) && defined(HAVE_LOGGER)
#define RARCH_WARN(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch [WARN] :: ", __VA_ARGS__)
#define RARCH_WARN_V(tag, fmt, vp) __android_log_print(ANDROID_LOG_INFO, "RetroArch [WARN] :: " tag, fmt, vp)
#else
#define RARCH_WARN(...) do { \
fprintf(LOG_FILE, "RetroArch [WARN] :: " __VA_ARGS__); \
fflush(LOG_FILE); \
@ -123,7 +102,6 @@
fflush(LOG_FILE); \
} while (0)
#endif
#endif
#endif
#endif