summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2009-11-22 19:09:54 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2009-11-22 19:09:54 +0000
commit49666660628d6c5eab843b296dd3b5f89806c5a6 (patch)
tree2b4db9f1b07e7a41542ea38c3f8f68c0dca465ba /apps
parent360d00f6000eb9fe3ee15e86b7bcd991c9758802 (diff)
downloadrockbox-49666660628d6c5eab843b296dd3b5f89806c5a6.tar.gz
rockbox-49666660628d6c5eab843b296dd3b5f89806c5a6.zip
fix mono recording token,
Add %bu - usb powered token git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23713 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/skin_engine/skin_parser.c3
-rw-r--r--apps/gui/skin_engine/skin_tokens.c14
-rw-r--r--apps/gui/skin_engine/skin_tokens.h1
3 files changed, 14 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index e0dedd5d48..268ba8c2a5 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -201,6 +201,9 @@ static const struct wps_tag all_tags[] = {
#if CONFIG_CHARGING
{ WPS_TOKEN_BATTERY_CHARGER_CONNECTED,"bp", WPS_REFRESH_DYNAMIC, NULL },
#endif
+#ifdef HAVE_USB_POWER
+ { WPS_TOKEN_USB_POWERED, "bu", WPS_REFRESH_DYNAMIC, NULL },
+#endif
{ WPS_TOKEN_RTC_PRESENT , "cc", WPS_REFRESH_STATIC, NULL },
{ WPS_TOKEN_RTC_DAY_OF_MONTH, "cd", WPS_RTC_REFRESH, NULL },
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 07c1dbeccc..879262f054 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -60,6 +60,7 @@
#include "pcm_record.h"
#endif
#include "language.h"
+#include "usb.h"
static char* get_codectype(const struct mp3entry* id3)
{
@@ -547,6 +548,12 @@ const char *get_token_value(struct gui_wps *gwps,
}
}
#endif
+#ifdef HAVE_USB_POWER
+ case WPS_TOKEN_USB_POWERED:
+ if (usb_powered())
+ return "u";
+ return NULL;
+#endif
case WPS_TOKEN_BATTERY_SLEEPTIME:
{
if (get_sleep_timer() == 0)
@@ -1129,10 +1136,9 @@ const char *get_token_value(struct gui_wps *gwps,
return buf;
#endif
case WPS_TOKEN_REC_MONO:
- if (intval)
- *intval = global_settings.rec_channels?2:1;
- snprintf(buf, buf_size, "%s", !global_settings.rec_channels?"m":'\0');
- return buf;
+ if (!global_settings.rec_channels)
+ return "m";
+ return NULL;
#endif /* HAVE_RECORDING */
case WPS_TOKEN_CURRENT_SCREEN:
diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h
index a59074fdd7..68a3fde944 100644
--- a/apps/gui/skin_engine/skin_tokens.h
+++ b/apps/gui/skin_engine/skin_tokens.h
@@ -61,6 +61,7 @@ enum wps_token_type {
WPS_TOKEN_BATTERY_CHARGER_CONNECTED,
WPS_TOKEN_BATTERY_CHARGING,
WPS_TOKEN_BATTERY_SLEEPTIME,
+ WPS_TOKEN_USB_POWERED,
/* Sound */
TOKEN_MARKER_SOUND,