diff options
author | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2007-11-14 00:45:04 +0000 |
---|---|---|
committer | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2007-11-14 00:45:04 +0000 |
commit | f554e00b61a2ecfdbf72314414947de57912fe02 (patch) | |
tree | 0d85793fbdfef3c4c7f44cb341e1d02614ab9e87 /apps/gui/wps_parser.c | |
parent | bb999f9eb3aec0aa5b693a52b70090fb5f9caaf0 (diff) | |
download | rockbox-f554e00b61a2ecfdbf72314414947de57912fe02.tar.gz rockbox-f554e00b61a2ecfdbf72314414947de57912fe02.zip |
Allow setting a margin on a non-scrolling line by using %m|margin| instead of %s|margin|. This allows to easily place dynamic info next to album art.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15610 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/wps_parser.c')
-rw-r--r-- | apps/gui/wps_parser.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index 0d86a5a3a2..907a8a3278 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c | |||
@@ -245,12 +245,18 @@ static const struct wps_tag all_tags[] = { | |||
245 | 245 | ||
246 | #ifdef HAS_REMOTE_BUTTON_HOLD | 246 | #ifdef HAS_REMOTE_BUTTON_HOLD |
247 | { WPS_TOKEN_REMOTE_HOLD, "mr", WPS_REFRESH_DYNAMIC, NULL }, | 247 | { WPS_TOKEN_REMOTE_HOLD, "mr", WPS_REFRESH_DYNAMIC, NULL }, |
248 | #else | ||
249 | { WPS_TOKEN_UNKNOWN, "mr", 0, NULL }, | ||
248 | #endif | 250 | #endif |
249 | 251 | ||
250 | { WPS_TOKEN_REPEAT_MODE, "mm", WPS_REFRESH_DYNAMIC, NULL }, | 252 | { WPS_TOKEN_REPEAT_MODE, "mm", WPS_REFRESH_DYNAMIC, NULL }, |
251 | { WPS_TOKEN_PLAYBACK_STATUS, "mp", WPS_REFRESH_DYNAMIC, NULL }, | 253 | { WPS_TOKEN_PLAYBACK_STATUS, "mp", WPS_REFRESH_DYNAMIC, NULL }, |
252 | 254 | ||
253 | #ifdef HAVE_LCD_BITMAP | 255 | #ifdef HAVE_LCD_BITMAP |
256 | { WPS_TOKEN_LEFTMARGIN, "m", 0, parse_scrollmargin }, | ||
257 | #endif | ||
258 | |||
259 | #ifdef HAVE_LCD_BITMAP | ||
254 | { WPS_TOKEN_PEAKMETER, "pm", WPS_REFRESH_PEAK_METER, NULL }, | 260 | { WPS_TOKEN_PEAKMETER, "pm", WPS_REFRESH_PEAK_METER, NULL }, |
255 | #else | 261 | #else |
256 | { WPS_TOKEN_PLAYER_PROGRESSBAR, "pf", | 262 | { WPS_TOKEN_PLAYER_PROGRESSBAR, "pf", |
@@ -279,12 +285,7 @@ static const struct wps_tag all_tags[] = { | |||
279 | { WPS_TOKEN_CROSSFADE, "xf", WPS_REFRESH_DYNAMIC, NULL }, | 285 | { WPS_TOKEN_CROSSFADE, "xf", WPS_REFRESH_DYNAMIC, NULL }, |
280 | #endif | 286 | #endif |
281 | 287 | ||
282 | #ifdef HAVE_LCD_BITMAP | ||
283 | { WPS_TOKEN_ALIGN_SCROLLMARGIN, "s", WPS_REFRESH_SCROLL, | ||
284 | parse_scrollmargin }, | ||
285 | #else | ||
286 | { WPS_NO_TOKEN, "s", WPS_REFRESH_SCROLL, NULL }, | 288 | { WPS_NO_TOKEN, "s", WPS_REFRESH_SCROLL, NULL }, |
287 | #endif | ||
288 | { WPS_TOKEN_SUBLINE_TIMEOUT, "t", 0, parse_subline_timeout }, | 289 | { WPS_TOKEN_SUBLINE_TIMEOUT, "t", 0, parse_subline_timeout }, |
289 | 290 | ||
290 | #ifdef HAVE_LCD_BITMAP | 291 | #ifdef HAVE_LCD_BITMAP |
@@ -848,7 +849,7 @@ static int parse_scrollmargin(const char *wps_bufptr, struct wps_token *token, | |||
848 | 849 | ||
849 | (void)wps_data; /* Kill the warning */ | 850 | (void)wps_data; /* Kill the warning */ |
850 | 851 | ||
851 | /* valid tag looks like %s or %s|12| */ | 852 | /* valid tag looks like %m or %m|12| */ |
852 | if(*wps_bufptr == '|') | 853 | if(*wps_bufptr == '|') |
853 | { | 854 | { |
854 | p = wps_bufptr + 1; | 855 | p = wps_bufptr + 1; |