diff options
author | Thomas Martitz <kugel@rockbox.org> | 2014-01-16 00:26:45 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-01-16 00:26:45 +0100 |
commit | a6483344f6936f9f4daf657410f2873bf0247be5 (patch) | |
tree | 8fa44ce5d2c2c74f0a3195f76ee2ca52cee85e31 /apps | |
parent | 98591a2815d878af8dbbd47ef7143c16654a8bba (diff) | |
download | rockbox-a6483344f6936f9f4daf657410f2873bf0247be5.tar.gz rockbox-a6483344f6936f9f4daf657410f2873bf0247be5.zip |
usb screen: Push the usb screen onto the activity stack. This enables %cs tag support for it.
Change-Id: Icecb72007aa3aba501c702e1aa65c801fcbc3857
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/usb_screen.c | 4 | ||||
-rw-r--r-- | apps/misc.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 200abafcc4..dc75f81a71 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include "usb_screen.h" | 40 | #include "usb_screen.h" |
41 | #include "skin_engine/skin_engine.h" | 41 | #include "skin_engine/skin_engine.h" |
42 | #include "playlist.h" | 42 | #include "playlist.h" |
43 | #include "misc.h" | ||
43 | 44 | ||
44 | #ifdef HAVE_LCD_BITMAP | 45 | #ifdef HAVE_LCD_BITMAP |
45 | #include "bitmaps/usblogo.h" | 46 | #include "bitmaps/usblogo.h" |
@@ -249,6 +250,8 @@ void gui_usb_screen_run(bool early_usb) | |||
249 | touchscreen_set_mode(TOUCHSCREEN_BUTTON); | 250 | touchscreen_set_mode(TOUCHSCREEN_BUTTON); |
250 | #endif | 251 | #endif |
251 | 252 | ||
253 | push_current_activity(ACTIVITY_USBSCREEN); | ||
254 | |||
252 | #ifdef USB_ENABLE_HID | 255 | #ifdef USB_ENABLE_HID |
253 | usb_hid = global_settings.usb_hid; | 256 | usb_hid = global_settings.usb_hid; |
254 | usb_keypad_mode = global_settings.usb_keypad_mode; | 257 | usb_keypad_mode = global_settings.usb_keypad_mode; |
@@ -338,4 +341,5 @@ void gui_usb_screen_run(bool early_usb) | |||
338 | viewportmanager_theme_undo(i, false); | 341 | viewportmanager_theme_undo(i, false); |
339 | } | 342 | } |
340 | 343 | ||
344 | pop_current_activity(); | ||
341 | } | 345 | } |
diff --git a/apps/misc.h b/apps/misc.h index 994e7775d2..0d4cba6cd3 100644 --- a/apps/misc.h +++ b/apps/misc.h | |||
@@ -129,7 +129,8 @@ enum current_activity { | |||
129 | ACTIVITY_TIMEDATESCREEN, | 129 | ACTIVITY_TIMEDATESCREEN, |
130 | ACTIVITY_BOOKMARKSLIST, | 130 | ACTIVITY_BOOKMARKSLIST, |
131 | ACTIVITY_SHORTCUTSMENU, | 131 | ACTIVITY_SHORTCUTSMENU, |
132 | ACTIVITY_ID3SCREEN | 132 | ACTIVITY_ID3SCREEN, |
133 | ACTIVITY_USBSCREEN | ||
133 | }; | 134 | }; |
134 | 135 | ||
135 | #if CONFIG_CODEC == SWCODEC | 136 | #if CONFIG_CODEC == SWCODEC |