Add verbosity.c/verbosity.h

2024-11-27 02:00:41 +00:00 · 2015-11-23 12:03:38 +01:00 · 2015-11-23 12:03:38 +01:00 · 074f14b132
commit 074f14b132
parent 62a556e8ce
105 changed files with 165 additions and 94 deletions
--- a/Makefile.common
+++ b/Makefile.common
@ -205,7 +205,8 @@ OBJ += frontend/frontend.o \
       movie.o \
       record/record_driver.o \
       record/drivers/record_null.o \
-       performance.o
+       performance.o \
+		 verbosity.o

 ifneq ($(HAVE_GETOPT_LONG), 1)
 OBJ += libretro-common/compat/compat_getopt.o
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@ -31,7 +31,8 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  libretro-common/string/string_list.c \
 				  libretro-common/compat/compat_strl.c \
 				  libretro-common/file/retro_file.c \
-				  libretro-common/file/config_file.c
+				  libretro-common/file/config_file.c \
+				  verbosity.c

 ifeq ($(HAVE_LOGGER), 1)
 PPU_CFLAGS		+= -DHAVE_LOGGER 
--- a/Makefile.psp1.salamander
+++ b/Makefile.psp1.salamander
@ -44,6 +44,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/file/retro_file.o \
 		 libretro-common/file/retro_stat.o \
 		 libretro-common/hash/rhash.o \
+		 verbosity.o \
 		 bootstrap/psp1/kernel_functions.o 

 PSPSDK=$(shell psp-config --pspsdk-path)
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@ -53,6 +53,7 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/file/retro_stat.o \
 		libretro-common/compat/compat_strl.o \
 		libretro-common/file/config_file.o \
+		verbosity.o \
 		$(APP_BOOTER_DIR)/app_booter.binobj

 ifeq ($(HAVE_LOGGER), 1)
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@ -21,6 +21,7 @@
 #include "audio_thread_wrapper.h"

 #include "../general.h"
+#include "../verbosity.h"
 #include "../string_list_special.h"

 #ifndef AUDIO_BUFFER_FREE_SAMPLES_COUNT
--- a/audio/audio_thread_wrapper.c
+++ b/audio/audio_thread_wrapper.c
@ -14,14 +14,17 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "audio_thread_wrapper.h"
-#include <rthreads/rthreads.h>
-#include "../general.h"
-#include "../performance.h"
-#include <queues/fifo_buffer.h>
 #include <stdlib.h>
 #include <string.h>

+#include <queues/fifo_buffer.h>
+#include <rthreads/rthreads.h>
+
+#include "audio_thread_wrapper.h"
+#include "../general.h"
+#include "../performance.h"
+#include "../verbosity.h"
+
 typedef struct audio_thread
 {
   const audio_driver_t *driver;
--- a/audio/drivers/alsa.c
+++ b/audio/drivers/alsa.c
@ -19,6 +19,7 @@

 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 typedef struct alsa
 {
--- a/audio/drivers/alsathread.c
+++ b/audio/drivers/alsathread.c
@ -23,6 +23,7 @@

 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 #define TRY_ALSA(x) if (x < 0) { \
                  goto error; \
--- a/audio/drivers/jack.c
+++ b/audio/drivers/jack.c
@ -28,6 +28,7 @@

 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 #define FRAMES(x) (x / (sizeof(float) * 2))

--- a/audio/drivers/openal.c
+++ b/audio/drivers/openal.c
@ -30,6 +30,7 @@

 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 #define BUFSIZE 1024

--- a/audio/drivers/oss.c
+++ b/audio/drivers/oss.c
@ -33,6 +33,7 @@

 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 #ifdef HAVE_OSS_BSD
 #define DEFAULT_OSS_DEV "/dev/audio"
--- a/audio/drivers/pulse.c
+++ b/audio/drivers/pulse.c
@ -23,6 +23,7 @@

 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 typedef struct
 {
--- a/audio/drivers/sdl_audio.c
+++ b/audio/drivers/sdl_audio.c
@ -28,6 +28,7 @@

 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 typedef struct sdl_audio
 {
--- a/autosave.c
+++ b/autosave.c
@ -23,6 +23,7 @@
 #include <rthreads/rthreads.h>

 #include "general.h"
+#include "verbosity.h"

 struct autosave
 {
--- a/camera/camera_driver.c
+++ b/camera/camera_driver.c
@ -19,6 +19,7 @@
 #include "camera_driver.h"
 #include "../general.h"
 #include "../string_list_special.h"
+#include "../verbosity.h"

 static const camera_driver_t *camera_drivers[] = {
 #ifdef HAVE_V4L2
--- a/camera/drivers/video4linux2.c
+++ b/camera/drivers/video4linux2.c
@ -40,6 +40,7 @@

 #include "../../general.h"
 #include "../../performance.h"
+#include "../../verbosity.h"

 struct buffer
 {
--- a/cheats.c
+++ b/cheats.c
@ -27,6 +27,7 @@
 #include "general.h"
 #include "runloop.h"
 #include "dynamic.h"
+#include "verbosity.h"

 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/cheevos.c
+++ b/cheevos.c
@ -19,7 +19,6 @@
 #include <formats/jsonsax.h>
 #include <retro_file.h>
 #include <rhash.h>
-#include <retro_log.h>
 #include <rthreads/async_job.h>

 #include "cheevos.h"
@ -29,6 +28,7 @@
 #include "performance.h"
 #include "runloop.h"
 #include "menu/menu.h"
+#include "verbosity.h"

 enum
 {
--- a/command.c
+++ b/command.c
@ -38,6 +38,7 @@

 #include "general.h"
 #include "runloop.h"
+#include "verbosity.h"

 #define DEFAULT_NETWORK_CMD_PORT 55355
 #define STDIN_BUF_SIZE 4096
--- a/command_event.c
+++ b/command_event.c
@ -32,6 +32,7 @@
 #include "cheevos.h"
 #endif

+#include "verbosity.h"
 #include "runloop_data.h"
 #include "configuration.h"
 #include "input/input_remapping.h"
--- a/configuration.c
+++ b/configuration.c
@ -28,6 +28,7 @@
 #include "input/input_remapping.h"
 #include "general.h"
 #include "system.h"
+#include "verbosity.h"

 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/content.c
+++ b/content.c
@ -44,6 +44,7 @@
 #include "movie.h"
 #include "patch.h"
 #include "system.h"
+#include "verbosity.h"

 #ifdef HAVE_CHEEVOS
 #include "cheevos.h"
--- a/database_info.c
+++ b/database_info.c
@ -24,6 +24,7 @@
 #include "database_info.h"
 #include "msg_hash.h"
 #include "general.h"
+#include "verbosity.h"

 #ifdef HAVE_CONFIG_H
 #include "config.h"
--- a/driver.c
+++ b/driver.c
@ -20,6 +20,7 @@
 #include "msg_hash.h"

 #include "msg_hash.h"
+#include "verbosity.h"

 #ifdef HAVE_MENU
 #include "menu/menu.h"
--- a/dynamic.c
+++ b/dynamic.c
@ -18,7 +18,6 @@
 #include <ctype.h>

 #include <file/file_path.h>
-#include <retro_log.h>
 #include <compat/strl.h>
 #include <compat/posix_string.h>

@ -36,6 +35,7 @@
 #include "configuration.h"
 #include "general.h"
 #include "msg_hash.h"
+#include "verbosity.h"

 #include "input/input_sensor.h"

--- a/file_ops.c
+++ b/file_ops.c
@ -38,6 +38,7 @@
 #include <encodings/utf.h>

 #include "file_ops.h"
+#include "verbosity.h"

 #ifdef HAVE_COMPRESSION
 #ifdef HAVE_7ZIP
--- a/file_path_special.c
+++ b/file_path_special.c
@ -37,11 +37,14 @@
 #endif

 #include <file/file_path.h>
+
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <retro_assert.h>
 #include <retro_miscellaneous.h>

+#include "verbosity.h"
+
 void fill_pathname_expand_special(char *out_path,
      const char *in_path, size_t size)
 {
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@ -39,7 +39,6 @@
 #include <retro_dirent.h>
 #include <retro_inline.h>
 #include <retro_file.h>
-#include <retro_log.h>
 #include <compat/strl.h>
 #include <rhash.h>
 #include <file/file_path.h>
@ -47,6 +46,7 @@
 #include "../frontend.h"
 #include "../frontend_driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "platform_linux.h"

 static bool                cpu_inited_once;
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@ -27,7 +27,6 @@

 #include <sys/process.h>

-#include <retro_log.h>
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
 #include <file/file_list.h>
@ -35,6 +34,7 @@

 #include "../../defines/ps3_defines.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 #define EMULATOR_CONTENT_DIR "SSNE10000"

--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@ -32,7 +32,6 @@ int scePowerSetArmClockFrequency(int freq);
 #endif

 #include <boolean.h>
-#include <retro_log.h>
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
 #include <file/file_list.h>
@ -40,6 +39,7 @@ int scePowerSetArmClockFrequency(int freq);

 #include "../../defines/psp_defines.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 #if defined(HAVE_KERNEL_PRX) || defined(IS_SALAMANDER)
 #ifndef VITA
--- a/frontend/drivers/platform_wii.c
+++ b/frontend/drivers/platform_wii.c
@ -26,11 +26,11 @@
 #include <ogc/usbstorage.h>
 #include <sdcard/wiisd_io.h>

-#include <retro_log.h>
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>

 #include "../../defines/gx_defines.h"
+#include "../../verbosity.h"

 #define EXECUTE_ADDR ((uint8_t *) 0x91800000)
 #define BOOTER_ADDR  ((uint8_t *) 0x93000000)
@ -121,7 +121,6 @@ void system_exec_wii(const char *_path, bool should_load_game)
   char path[PATH_MAX_LENGTH];
   char game_path[PATH_MAX_LENGTH];
 #ifndef IS_SALAMANDER
-   global_t *global = global_get_ptr();
   bool *verbose    = retro_main_verbosity();
   bool original_verbose = *verbose;
   *verbose = true;
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@ -26,6 +26,7 @@
 #include "../retroarch.h"
 #include "../runloop.h"
 #include "../runloop_data.h"
+#include "../verbosity.h"

 #define MAX_ARGS 32

--- a/frontend/frontend_salamander.c
+++ b/frontend/frontend_salamander.c
@ -19,7 +19,6 @@
 #include <stddef.h>
 #include <string.h>

-#include <retro_log.h>
 #include <file/config_file.h>
 #include <file/file_path.h>
 #include <file/dir_list.h>
@ -27,6 +26,7 @@
 #include "frontend_driver.h"
 #include "../general.h"
 #include "../file_ext.h"
+#include "../verbosity.h"

 struct defaults g_defaults;

--- a/gfx/common/d3d_common.cpp
+++ b/gfx/common/d3d_common.cpp
@ -13,7 +13,7 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <retro_log.h>
+#include "../../verbosity.h"

 #include "d3d_common.h"

--- a/gfx/common/egl_common.c
+++ b/gfx/common/egl_common.c
@ -14,7 +14,8 @@
 */

 #include <retro_assert.h>
-#include <retro_log.h>
+
+#include "../../verbosity.h"

 #include "egl_common.h"
 #ifdef HAVE_OPENGL
--- a/gfx/common/gl_common.h
+++ b/gfx/common/gl_common.h
@ -31,6 +31,7 @@
 #include <formats/image.h>

 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../font_renderer_driver.h"
 #include "../video_common.h"
 #include "../video_context_driver.h"
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@ -25,6 +25,7 @@

 #include "x11_common.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 Colormap g_x11_cmap;
 Window   g_x11_win;
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@ -26,6 +26,7 @@
 #include "../../general.h"
 #include "../../retroarch.h"
 #include "../../performance.h"
+#include "../../verbosity.h"
 #include "../video_context_driver.h"
 #include "../font_renderer_driver.h"

--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@ -31,6 +31,7 @@

 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../font_renderer_driver.h"

 #include "../common/x11_common.h"
--- a/gfx/drivers_font_renderer/stb.c
+++ b/gfx/drivers_font_renderer/stb.c
@ -20,6 +20,7 @@

 #include "../font_renderer_driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../../file_ops.h"

 #define STB_TRUETYPE_IMPLEMENTATION
--- a/gfx/font_renderer_driver.c
+++ b/gfx/font_renderer_driver.c
@ -15,6 +15,7 @@
 */

 #include "../general.h"
+#include "../verbosity.h"

 #ifdef HAVE_CONFIG_H
 #include "../config.h"
--- a/gfx/image/image.c
+++ b/gfx/image/image.c
@ -27,6 +27,7 @@
 #include "../common/d3d_common.h"
 #endif
 #include "../../file_ops.h"
+#include "../../verbosity.h"

 #include <stdint.h>
 #include <stdlib.h>
--- a/gfx/video_context_driver.c
+++ b/gfx/video_context_driver.c
@ -14,14 +14,17 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "../general.h"
-#include "video_context_driver.h"
 #include <string.h>

+#include "video_context_driver.h"
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif

+#include "../general.h"
+#include "../verbosity.h"
+
 static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
 #if defined(__CELLOS_LV2__)
   &gfx_ctx_ps3,
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@ -31,6 +31,8 @@
 #include "../menu/menu_setting.h"
 #endif

+#include "../verbosity.h"
+
 #ifndef MEASURE_FRAME_TIME_SAMPLES_COUNT
 #define MEASURE_FRAME_TIME_SAMPLES_COUNT (2 * 1024)
 #endif
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@ -24,6 +24,7 @@
 #include "../file_ext.h"
 #include "../general.h"
 #include "../performance.h"
+#include "../verbosity.h"
 #include "video_filter.h"
 #include "video_filters/softfilter.h"

--- a/gfx/video_pixel_converter.c
+++ b/gfx/video_pixel_converter.c
@ -20,6 +20,7 @@

 #include "../general.h"
 #include "../performance.h"
+#include "../verbosity.h"
 #include "video_pixel_converter.h"

 /* Used for 16-bit -> 16-bit conversions that take place before
--- a/gfx/video_shader_driver.c
+++ b/gfx/video_shader_driver.c
@ -15,9 +15,8 @@

 #include <string.h>

-#include <retro_log.h>
-
 #include "video_shader_driver.h"
+#include "../verbosity.h"

 static const shader_backend_t *shader_ctx_drivers[] = {
 #ifdef HAVE_GLSL
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@ -24,6 +24,7 @@
 #include <rhash.h>

 #include "../general.h"
+#include "../verbosity.h"
 #include "video_shader_parse.h"

 /**
--- a/gfx/video_state_python.c
+++ b/gfx/video_state_python.c
@ -19,12 +19,14 @@
 #include <ctype.h>
 #include <string.h>

+#include <compat/strl.h>
+#include <compat/posix_string.h>
+
 #include "video_state_python.h"
 #include "../dynamic.h"
 #include "../libretro.h"
 #include "../general.h"
-#include <compat/strl.h>
-#include <compat/posix_string.h>
+#include "../verbosity.h"
 #include "../input/input_common.h"
 #include "../file_ops.h"

--- a/gfx/video_state_tracker.c
+++ b/gfx/video_state_tracker.c
@ -20,6 +20,7 @@
 #include <retro_inline.h>
 #include "../general.h"
 #include "../input/input_common.h"
+#include "../verbosity.h"

 #ifdef HAVE_PYTHON
 #include "video_state_python.h"
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@ -20,6 +20,7 @@

 #include "video_thread_wrapper.h"
 #include "../performance.h"
+#include "../verbosity.h"

 static void *thread_init_never_call(const video_info_t *video,
      const input_driver_t **input, void **input_data)
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@ -24,6 +24,7 @@

 #include <compat/posix_string.h>

+#include "../verbosity.c"
 #if defined(HAVE_LOGGER) && !defined(ANDROID)
 #include "../netlogger.c"
 #endif
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@ -34,9 +34,8 @@

 #include <windowsx.h>

-#include <retro_log.h>
-
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../input_autodetect.h"
 #include "../input_common.h"
 #include "../input_joypad.h"
--- a/input/drivers/linuxraw_input.c
+++ b/input/drivers/linuxraw_input.c
@ -24,6 +24,7 @@
 #include <boolean.h>

 #include "../../general.h"
+#include "../../verbosity.h"

 #include "../common/linux_common.h"
 #include "../input_keymaps.h"
--- a/input/drivers/sdl_input.c
+++ b/input/drivers/sdl_input.c
@ -24,6 +24,7 @@
 #include "SDL.h"
 #include "../../gfx/video_context_driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../../libretro.h"
 #include "../input_autodetect.h"
 #include "../input_common.h"
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@ -40,6 +40,7 @@
 #include "../input_joypad.h"
 #include "../input_keymaps.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
--- a/input/drivers/x11_input.c
+++ b/input/drivers/x11_input.c
@ -28,6 +28,7 @@

 #include "../../driver.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 typedef struct x11_input
 {
--- a/input/drivers_hid/iohidmanager_hid.c
+++ b/input/drivers_hid/iohidmanager_hid.c
@ -17,12 +17,11 @@
 #include <IOKit/hid/IOHIDManager.h>
 #include <IOKit/hid/IOHIDKeys.h>

-#include <retro_log.h>
-
 #include "../connect/joypad_connection.h"
 #include "../input_autodetect.h"
 #include "../input_hid_driver.h"
 #include "../../configuration.h"
+#include "../../verbosity.h"

 typedef struct apple_hid
 {
--- a/input/drivers_hid/libusb_hid.c
+++ b/input/drivers_hid/libusb_hid.c
@ -18,11 +18,11 @@
 #include <rthreads/rthreads.h>
 #include <compat/strl.h>
 #include <queues/fifo_buffer.h>
-#include <retro_log.h>

 #include "../connect/joypad_connection.h"
 #include "../input_autodetect.h"
 #include "../input_hid_driver.h"
+#include "../../verbosity.h"

 #ifndef LIBUSB_CAP_HAS_HOTPLUG
 #define LIBUSB_CAP_HAS_HOTPLUG 0x0001
--- a/input/drivers_hid/wiiusb_hid.c
+++ b/input/drivers_hid/wiiusb_hid.c
@ -18,11 +18,11 @@
 #include <rthreads/rthreads.h>
 #include <compat/strl.h>
 #include <queues/fifo_buffer.h>
-#include <retro_log.h>

 #include "../connect/joypad_connection.h"
 #include "../input_autodetect.h"
 #include "../input_hid_driver.h"
+#include "../../verbosity.h"

 typedef struct wiiusb_hid
 {
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@ -22,9 +22,9 @@
 #include <dinput.h>

 #include <boolean.h>
-#include <retro_log.h>

 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../input_autodetect.h"
 #include "../input_common.h"
 #include "../input_joypad.h"
--- a/input/drivers_joypad/linuxraw_joypad.c
+++ b/input/drivers_joypad/linuxraw_joypad.c
@ -27,6 +27,7 @@

 #include "../input_autodetect.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 #define NUM_BUTTONS 32
 #define NUM_AXES 32
--- a/input/drivers_joypad/parport_joypad.c
+++ b/input/drivers_joypad/parport_joypad.c
@ -25,6 +25,7 @@

 #include "../input_autodetect.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 /* Linux parport driver does not support reading the control register
   Other platforms may support up to 17 buttons */
--- a/input/drivers_joypad/sdl_joypad.c
+++ b/input/drivers_joypad/sdl_joypad.c
@ -17,6 +17,7 @@
 #include "../input_autodetect.h"
 #include "SDL.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 typedef struct _sdl_joypad
 {
--- a/input/drivers_joypad/udev_joypad.c
+++ b/input/drivers_joypad/udev_joypad.c
@ -31,6 +31,7 @@

 #include "../input_autodetect.h"
 #include "../../general.h"
+#include "../../verbosity.h"

 /* Udev/evdev Linux joypad driver.
 * More complex and extremely low level,
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@ -25,6 +25,7 @@
 #include "input_autodetect.h"

 #include "../general.h"
+#include "../verbosity.h"

 static bool remote_is_bound = false;

--- a/input/input_common.c
+++ b/input/input_common.c
@ -24,6 +24,7 @@
 #include "input_keymaps.h"

 #include "../general.h"
+#include "../verbosity.h"
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
--- a/input/input_driver.c
+++ b/input/input_driver.c
@ -18,6 +18,7 @@

 #include "../general.h"
 #include "../string_list_special.h"
+#include "../verbosity.h"

 static const input_driver_t *input_drivers[] = {
 #ifdef __CELLOS_LV2__
--- a/input/input_hid_driver.c
+++ b/input/input_hid_driver.c
@ -21,6 +21,7 @@
 #include "input_hid_driver.h"
 #include "../general.h"
 #include "../string_list_special.h"
+#include "../verbosity.h"

 static hid_driver_t *hid_drivers[] = {
 #if defined(HAVE_BTSTACK)
--- a/input/input_joypad_driver.c
+++ b/input/input_joypad_driver.c
@ -21,6 +21,7 @@
 #include "input_keymaps.h"
 #include "../general.h"
 #include "../string_list_special.h"
+#include "../verbosity.h"

 static input_device_driver_t *joypad_drivers[] = {
 #ifdef __CELLOS_LV2__
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@ -32,6 +32,7 @@
 #include "keyboard_line.h"

 #include "../configuration.h"
+#include "../verbosity.h"
 #include "input_common.h"

 #define BOX_RADIAL       0x18df06d2U
--- a/libretro-common/file/retro_file.c
+++ b/libretro-common/file/retro_file.c
@ -63,10 +63,6 @@
 #include <fcntl.h>
 #endif

-#ifdef RARCH_INTERNAL
-#include <retro_log.h>
-#endif
-
 #include <retro_file.h>
 #include <memmap.h>

@ -227,12 +223,7 @@ RFILE *retro_fopen(const char *path, unsigned mode, ssize_t len)
         stream->mapped = (uint8_t*)mmap((void*)0, stream->mapsize, PROT_READ,  MAP_SHARED, stream->fd, 0);

         if (stream->mapped == MAP_FAILED)
-         {
-#ifdef RARCH_INTERNAL
-            RARCH_WARN("mmap()ing %s failed: %s\n", path, strerror(errno));
-#endif
            stream->hints &= ~RFILE_HINT_MMAP;
-         }
      }
 #endif
   }
@ -480,13 +471,7 @@ int retro_read_file(const char *path, void **buf, ssize_t *len)
      goto error;

   if ((ret = retro_fread(file, content_buf, content_buf_size)) < content_buf_size)
-   {
-#ifdef RARCH_INTERNAL
-      RARCH_WARN("Didn't read whole file: %s.\n", path);
-#else
      printf("Didn't read whole file: %s.\n", path);
-#endif
-   }

   if (!content_buf)
      goto error;
--- a/libretro-common/include/retro_assert.h
+++ b/libretro-common/include/retro_assert.h
@ -23,15 +23,11 @@
 #ifndef __RETRO_ASSERT_H
 #define __RETRO_ASSERT_H

-#ifdef RARCH_INTERNAL
-#include <retro_log.h>
-#else
 #include <assert.h>
-#endif

 #ifdef RARCH_INTERNAL
 #define retro_assert(cond) do { \
-   if (!(cond)) { RARCH_ERR("Assertion failed at %s:%d.\n", __FILE__, __LINE__); abort(); } \
+   if (!(cond)) { printf("Assertion failed at %s:%d.\n", __FILE__, __LINE__); abort(); } \
 } while(0)
 #else
 #define retro_assert(cond) assert(cond)
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@ -22,7 +22,6 @@
 #include <errno.h>

 #include <retro_inline.h>
-#include <retro_log.h>
 #include <boolean.h>

 #include "libretro.h"
@ -35,6 +34,7 @@
 #include "input/input_remapping.h"
 #include "record/record_driver.h"
 #include "gfx/video_pixel_converter.h"
+#include "verbosity.h"

 #ifdef HAVE_NETPLAY
 #include "netplay.h"
--- a/location/location_driver.c
+++ b/location/location_driver.c
@ -18,6 +18,7 @@

 #include "../general.h"
 #include "../string_list_special.h"
+#include "../verbosity.h"

 static const location_driver_t *location_drivers[] = {
 #ifdef ANDROID
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@ -22,7 +22,6 @@
 #include <string/stdstring.h>
 #include <limits.h>

-#include <retro_log.h>
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 #include <formats/image.h>
@ -40,6 +39,7 @@
 #include "../../configuration.h"
 #include "../../runloop.h"
 #include "../../runloop_data.h"
+#include "../../verbosity.h"

 enum
 {
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@ -16,7 +16,6 @@
 */

 #include <compat/strl.h>
-#include <retro_log.h>

 #include "menu_generic.h"

@ -34,6 +33,7 @@
 #include "../../cheevos.h"

 #include "../../runloop.h"
+#include "../../verbosity.h"

 static int action_iterate_help(char *s, size_t len, const char *label)
 {
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@ -23,7 +23,6 @@
 #include <file/file_path.h>
 #include <compat/posix_string.h>
 #include <compat/strl.h>
-#include <retro_log.h>
 #include <formats/image.h>
 #include <string/stdstring.h>
 #include <string/string_list.h>
@ -41,6 +40,7 @@

 #include "../menu_cbs.h"

+#include "../../verbosity.h"
 #include "../../configuration.h"
 #include "../../file_ext.h"

--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@ -27,7 +27,6 @@
 #include <gfx/math/matrix_4x4.h>
 #include <formats/image.h>
 #include <compat/strl.h>
-#include <retro_log.h>
 #include <retro_stat.h>

 #include "menu_generic.h"
@ -47,6 +46,7 @@

 #include "../../configuration.h"
 #include "../../runloop.h"
+#include "../../verbosity.h"

 #if 0
 #define ZARCH_DEBUG
--- a/menu/intl/menu_hash_es.c
+++ b/menu/intl/menu_hash_es.c
@ -18,6 +18,7 @@
 #include <string.h>

 #include <retro_assert.h>
+#include <compat/strl.h>

 #include "../../configuration.h"
 #include "../menu_hash.h"
--- a/menu/intl/menu_hash_pt.c
+++ b/menu/intl/menu_hash_pt.c
@ -18,6 +18,7 @@
 #include <string.h>

 #include <retro_assert.h>
+#include <compat/strl.h>

 #include "../menu_hash.h"
 #include "../../configuration.h"
--- a/menu/menu_cbs.c
+++ b/menu/menu_cbs.c
@ -15,11 +15,11 @@

 #include <compat/strl.h>
 #include <string/string_list.h>
-#include <retro_log.h>

 #include "menu.h"
 #include "menu_hash.h"
 #include "menu_cbs.h"
+#include "../verbosity.h"

 #if 0
 #define DEBUG_LOG
--- a/menu/menu_shader.c
+++ b/menu/menu_shader.c
@ -25,6 +25,7 @@
 #include "menu_shader.h"
 #include "../configuration.h"
 #include "../runloop.h"
+#include "../verbosity.h"

 /**
 * menu_shader_manager_init:
--- a/movie.c
+++ b/movie.c
@ -22,6 +22,7 @@
 #include <retro_endianness.h>

 #include "general.h"
+#include "verbosity.h"

 struct bsv_movie
 {
--- a/netlogger.c
+++ b/netlogger.c
@ -26,7 +26,7 @@
 #include <retro_miscellaneous.h>
 #include <net/net_compat.h>

-#include <retro_log.h>
+#include "verbosity.h"

 #if !defined(PC_DEVELOPMENT_IP_ADDRESS)
 #error "An IP address for the PC logging server was not set in the Makefile, cannot continue."
--- a/netplay.c
+++ b/netplay.c
@ -32,6 +32,7 @@
 #include "msg_hash.h"
 #include "system.h"
 #include "runloop.h"
+#include "verbosity.h"

 struct delta_frame
 {
--- a/patch.c
+++ b/patch.c
@ -21,7 +21,6 @@
 #include <string.h>

 #include <boolean.h>
-#include <retro_log.h>

 #include <compat/msvc.h>
 #include <file/file_path.h>
@ -30,6 +29,7 @@
 #include "patch.h"
 #include "file_ops.h"
 #include "general.h"
+#include "verbosity.h"

 enum bps_mode
 {
--- a/performance.c
+++ b/performance.c
@ -19,6 +19,7 @@
 #include "performance.h"
 #include "general.h"
 #include "compat/strl.h"
+#include "verbosity.h"

 #ifdef _WIN32
 #define PERF_LOG_FMT "[PERF]: Avg (%s): %I64u ticks, %I64u runs.\n"
--- a/pkg/android/phoenix/jni/Android.mk
+++ b/pkg/android/phoenix/jni/Android.mk
@ -12,7 +12,8 @@ LOCAL_SRC_FILES := apk-extract/apk-extract.c \
 						$(RARCH_DIR)/libretro-common/string/string_list.c \
 						$(RARCH_DIR)/libretro-common/compat/compat_strl.c \
 						$(RARCH_DIR)/libretro-common/file/retro_file.c \
-						$(RARCH_DIR)/libretro-common/file/retro_stat.c
+						$(RARCH_DIR)/libretro-common/file/retro_stat.c \
+						$(RARCH_DIR)/verbosity.c

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/

--- a/pkg/android/phoenix/jni/apk-extract/apk-extract.c
+++ b/pkg/android/phoenix/jni/apk-extract/apk-extract.c
@ -10,13 +10,6 @@

 #include "../native/com_retroarch_browser_NativeInterface.h"

-//#define VERBOSE_LOG
-
-#ifndef VERBOSE_LOG
-#undef RARCH_LOG
-#define RARCH_LOG(...)
-#endif
-
 struct userdata
 {
   const char *subdir;
@ -45,7 +38,7 @@ static int zlib_cb(const char *name, const char *valid_exts,
   if (!path_mkdir(path_dir))
      goto error;

-   RARCH_LOG("Extracting %s -> %s ...\n", name, path);
+   printf("Extracting %s -> %s ...\n", name, path);

   if (!zlib_perform_mode(path, valid_exts,
            cdata, cmode, csize, size, crc32, userdata))
@ -54,7 +47,7 @@ static int zlib_cb(const char *name, const char *valid_exts,
   return 1;

 error:
-   RARCH_ERR("Failed to deflate to: %s.\n", path);
+   printf("Failed to deflate to: %s.\n", path);
   return 0;
 }

@ -74,7 +67,7 @@ JNIEXPORT jboolean JNICALL Java_com_retroarch_browser_NativeInterface_extractArc

   if (!zlib_parse_file(archive_c, NULL, zlib_cb, &data))
   {
-      RARCH_ERR("Failed to parse APK: %s.\n", archive_c);
+      printf("Failed to parse APK: %s.\n", archive_c);
      ret = JNI_FALSE;
   }

--- a/playlist.c
+++ b/playlist.c
@ -21,9 +21,9 @@

 #include <boolean.h>
 #include <compat/posix_string.h>
-#include <retro_log.h>

 #include "playlist.h"
+#include "verbosity.h"

 /**
 * content_playlist_get_index:
--- a/record/drivers/record_ffmpeg.c
+++ b/record/drivers/record_ffmpeg.c
@ -60,6 +60,7 @@ extern "C" {
 #include <file/config_file.h>

 #include "../../general.h"
+#include "../../verbosity.h"
 #include "../../audio/audio_utils.h"
 #include "../record_driver.h"

--- a/record/record_driver.c
+++ b/record/record_driver.c
@ -22,6 +22,7 @@

 #include "../driver.h"
 #include "../general.h"
+#include "../verbosity.h"
 #include "../msg_hash.h"
 #include "../string_list_special.h"

--- a/retroarch.c
+++ b/retroarch.c
@ -38,6 +38,7 @@
 #include <retro_stat.h>

 #include "msg_hash.h"
+#include "verbosity.h"

 #include "libretro_version_1.h"
 #include "configuration.h"
--- a/rewind.c
+++ b/rewind.c
@ -25,6 +25,7 @@
 #include "msg_hash.h"
 #include "rewind.h"
 #include "performance.h"
+#include "verbosity.h"

 /* This makes Valgrind throw errors if a core overflows its savestate size. */
 /* Keep it off unless you're chasing a core bug, it slows things down. */
--- a/runloop.c
+++ b/runloop.c
@ -18,7 +18,6 @@

 #include <file/file_path.h>
 #include <retro_inline.h>
-#include <retro_log.h>

 #include <compat/strl.h>

@ -44,12 +43,13 @@
 #include "netplay.h"
 #endif

+#include "verbosity.h"
+
 static struct global g_extern;

 static bool main_is_idle;
 static bool main_is_paused;
 static bool main_is_slowmotion;
-static bool main_verbosity;

 static unsigned main_max_frames;

@ -767,11 +767,6 @@ static void rarch_main_iterate_linefeed_overlay(driver_t *driver,
 }
 #endif

-bool *retro_main_verbosity(void)
-{
-   return &main_verbosity;
-}
-
 FILE *retro_main_log_file(void)
 {
   global_t *global = global_get_ptr();
--- a/runloop.h
+++ b/runloop.h
@ -354,8 +354,6 @@ void rarch_main_msg_queue_free(void);

 void rarch_main_msg_queue_init(void);

-bool *retro_main_verbosity(void);
-
 FILE *retro_main_log_file(void);

 bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data);
--- a/runloop_data.c
+++ b/runloop_data.c
@ -20,6 +20,7 @@
 #include <file/file_path.h>

 #include "general.h"
+#include "verbosity.h"

 #include "tasks/tasks.h"
 #include "input/input_overlay.h"
--- a/screenshot.c
+++ b/screenshot.c
@ -26,7 +26,6 @@
 #include <stdint.h>
 #include <string.h>

-#include <retro_log.h>
 #include <retro_file.h>
 #include <file/file_path.h>
 #include <compat/strl.h>
@ -45,6 +44,7 @@
 #include "gfx/scaler/scaler.h"
 #include "retroarch.h"
 #include "screenshot.h"
+#include "verbosity.h"
 #include "gfx/video_driver.h"

 #ifdef HAVE_CONFIG_H
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@ -27,6 +27,7 @@
 #include "../file_ops.h"
 #include "../msg_hash.h"
 #include "../general.h"
+#include "../verbosity.h"

 #define CB_DB_SCAN_FILE                0x70ce56d2U
 #define CB_DB_SCAN_FOLDER              0xde2bef8eU
--- a/Show More
+++ b/Show More