From 0f69a8152fd7190b6b30aefd708071b625efddcd Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 14 Mar 2010 11:32:03 +0000 Subject: fiddle with the skin debug output so the load lines arnt shown unless debugwps is enabled git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25162 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_parser.c | 4 ++-- apps/gui/skin_engine/wps_debug.c | 1 - apps/gui/skin_engine/wps_internals.h | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'apps/gui/skin_engine') diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 059c3d779c..d5b1e94741 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -2178,8 +2178,8 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, skinfonts[i].name = NULL; } #endif -#if defined(DEBUG) || defined(SIMULATOR) - if (isfile) +#ifdef DEBUG_SKIN_ENGINE + if (isfile && debug_wps) { DEBUGF("\n=====================\nLoading '%s'\n=====================\n", buf); } diff --git a/apps/gui/skin_engine/wps_debug.c b/apps/gui/skin_engine/wps_debug.c index 2e4f428af4..9a6d4e09cf 100644 --- a/apps/gui/skin_engine/wps_debug.c +++ b/apps/gui/skin_engine/wps_debug.c @@ -38,7 +38,6 @@ #endif #if defined(SIMULATOR) || defined(__PCTOOL__) -extern bool debug_wps; extern int wps_verbose_level; #endif diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index 0a8857a0b7..b0f5f36eb5 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -370,4 +370,10 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3, struct gui_img* find_image(char label, struct wps_data *data); struct skin_viewport* find_viewport(char label, struct wps_data *data); + +#if defined(DEBUG) || defined(SIMULATOR) +#define DEBUG_SKIN_ENGINE +extern bool debug_wps; +#endif + #endif -- cgit