len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb screen: Push the usb screen onto the activity stack. This enables %cs tag support for it.

Browse source 
Change-Id: Icecb72007aa3aba501c702e1aa65c801fcbc3857
This commit is contained in:
Thomas Martitz 2014-01-16 00:26:45 +01:00
parent 98591a2815
commit a6483344f6
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/gui/usb_screen.c
View file

@ -40,6 +40,7 @@
#include "usb_screen.h" #include "usb_screen.h"
#include "skin_engine/skin_engine.h" #include "skin_engine/skin_engine.h"
#include "playlist.h" #include "playlist.h"
#include "misc.h"
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
#include "bitmaps/usblogo.h" #include "bitmaps/usblogo.h"
@ -249,6 +250,8 @@ void gui_usb_screen_run(bool early_usb)
touchscreen_set_mode(TOUCHSCREEN_BUTTON); touchscreen_set_mode(TOUCHSCREEN_BUTTON);
#endif #endif
push_current_activity(ACTIVITY_USBSCREEN);
#ifdef USB_ENABLE_HID #ifdef USB_ENABLE_HID
usb_hid = global_settings.usb_hid; usb_hid = global_settings.usb_hid;
usb_keypad_mode = global_settings.usb_keypad_mode; usb_keypad_mode = global_settings.usb_keypad_mode;
@ -338,4 +341,5 @@ void gui_usb_screen_run(bool early_usb)
viewportmanager_theme_undo(i, false); viewportmanager_theme_undo(i, false);
} }
pop_current_activity();
} }

3
apps/misc.h
View file

@ -129,7 +129,8 @@ enum current_activity {
ACTIVITY_TIMEDATESCREEN, ACTIVITY_TIMEDATESCREEN,
ACTIVITY_BOOKMARKSLIST, ACTIVITY_BOOKMARKSLIST,
ACTIVITY_SHORTCUTSMENU, ACTIVITY_SHORTCUTSMENU,
ACTIVITY_ID3SCREEN ACTIVITY_ID3SCREEN,
ACTIVITY_USBSCREEN
}; };
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC