diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-14 11:32:03 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-14 11:32:03 +0000 |
commit | 0f69a8152fd7190b6b30aefd708071b625efddcd (patch) | |
tree | 2d39184e12c478768855208d5174472e8b4d3276 /apps/gui/skin_engine | |
parent | 2d1937a158b1259a54c8820194e6f7fb5ff1ab47 (diff) | |
download | rockbox-0f69a8152fd7190b6b30aefd708071b625efddcd.tar.gz rockbox-0f69a8152fd7190b6b30aefd708071b625efddcd.zip |
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
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_debug.c | 1 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 6 |
3 files changed, 8 insertions, 3 deletions
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, | |||
2178 | skinfonts[i].name = NULL; | 2178 | skinfonts[i].name = NULL; |
2179 | } | 2179 | } |
2180 | #endif | 2180 | #endif |
2181 | #if defined(DEBUG) || defined(SIMULATOR) | 2181 | #ifdef DEBUG_SKIN_ENGINE |
2182 | if (isfile) | 2182 | if (isfile && debug_wps) |
2183 | { | 2183 | { |
2184 | DEBUGF("\n=====================\nLoading '%s'\n=====================\n", buf); | 2184 | DEBUGF("\n=====================\nLoading '%s'\n=====================\n", buf); |
2185 | } | 2185 | } |
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 @@ | |||
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | #if defined(SIMULATOR) || defined(__PCTOOL__) | 40 | #if defined(SIMULATOR) || defined(__PCTOOL__) |
41 | extern bool debug_wps; | ||
42 | extern int wps_verbose_level; | 41 | extern int wps_verbose_level; |
43 | #endif | 42 | #endif |
44 | 43 | ||
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, | |||
370 | struct gui_img* find_image(char label, struct wps_data *data); | 370 | struct gui_img* find_image(char label, struct wps_data *data); |
371 | struct skin_viewport* find_viewport(char label, struct wps_data *data); | 371 | struct skin_viewport* find_viewport(char label, struct wps_data *data); |
372 | 372 | ||
373 | |||
374 | #if defined(DEBUG) || defined(SIMULATOR) | ||
375 | #define DEBUG_SKIN_ENGINE | ||
376 | extern bool debug_wps; | ||
377 | #endif | ||
378 | |||
373 | #endif | 379 | #endif |