diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2010-05-07 13:06:42 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2010-05-07 13:06:42 +0000 |
| commit | 455c34ab91f33003b6d3b7ceabe659162ff5e968 (patch) | |
| tree | 01d1e6a1134a26cbc8b5750da02b9174bb21ec62 /apps/plugins/mpegplayer/mpegplayer.c | |
| parent | 79e7375ddf5e5c18e241607d47746ae5345b4b48 (diff) | |
mpegplayer: make button timeout half the OSD update interval so that it updates the indicators properly when not holding a key. Add capability to show OSD without changing volume, seeking, etc. Enable this functionality on Gigabeat S using the back (<--) button since it wasn't used in playback mode at all.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25872 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpegplayer.c')
| -rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 8bd506da35..c96328705c 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -173,6 +173,7 @@ PLUGIN_IRAM_DECLARE #define MPEG_RW2 BUTTON_PREV #define MPEG_FF BUTTON_DOWN #define MPEG_FF2 BUTTON_NEXT +#define MPEG_SHOW_OSD BUTTON_BACK #define MPEG_RC_MENU BUTTON_RC_DSP #define MPEG_RC_STOP (BUTTON_RC_PLAY | BUTTON_REPEAT) @@ -1551,7 +1552,7 @@ static void button_loop(void) int button; mpeg_menu_sysevent_clear(); - button = rb->button_get_w_tmo(WVS_MIN_UPDATE_INTERVAL); + button = rb->button_get_w_tmo(WVS_MIN_UPDATE_INTERVAL/2); button = mpeg_menu_sysevent_callback(button, NULL); @@ -1655,6 +1656,16 @@ static void button_loop(void) break; } /* MPEG_MENU: */ +#ifdef MPEG_SHOW_OSD + case MPEG_SHOW_OSD: + case MPEG_SHOW_OSD | BUTTON_REPEAT: + /* Show if not visible */ + wvs_show(WVS_SHOW); + /* Make sure it refreshes */ + wvs_refresh(WVS_REFRESH_DEFAULT); + break; +#endif + case MPEG_STOP: #ifdef MPEG_RC_STOP case MPEG_RC_STOP: |