diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2005-06-26 07:58:01 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2005-06-26 07:58:01 +0000 |
| commit | 1a3a78863b005af4173a94afa1647ddc92597d4f (patch) | |
| tree | c8f3ad7a63373c9f7b4ec0ad436c1b1d9a837cf3 | |
| parent | 20c19dde350b40678163c0d6baeddb23e9087780 (diff) | |
| download | rockbox-1a3a78863b005af4173a94afa1647ddc92597d4f.zip rockbox-1a3a78863b005af4173a94afa1647ddc92597d4f.tar.gz rockbox-1a3a78863b005af4173a94afa1647ddc92597d4f.tar.bz2 rockbox-1a3a78863b005af4173a94afa1647ddc92597d4f.tar.xz | |
Fixed up WPS_*_PRE / WPS_RC_*_PRE handling. (Gimme back my RC_PAUSE on archos.)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6868 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/wps.c | 31 |
1 files changed, 16 insertions, 15 deletions
@@ -479,6 +479,7 @@ long wps_show(void) restore = true; break; #endif + #ifdef WPS_RC_BROWSE case WPS_RC_BROWSE: #endif @@ -501,23 +502,23 @@ long wps_show(void) if (global_settings.browse_current && current_track_path[0] != '\0') set_current_file(current_track_path); - + return 0; break; /* play/pause */ case WPS_PAUSE: +#ifdef WPS_PAUSE_PRE + if (lastbutton != WPS_PAUSE_PRE) + break; +#endif #ifdef WPS_RC_PAUSE case WPS_RC_PAUSE: -#endif -#ifdef WPS_PAUSE_PRE - if ((lastbutton != WPS_PAUSE_PRE) #ifdef WPS_RC_PAUSE_PRE - && (lastbutton != WPS_RC_PAUSE_PRE) -#endif - ) + if ((button == WPS_RC_PAUSE) && (lastbutton != WPS_RC_PAUSE_PRE)) break; #endif +#endif if ( paused ) { paused = false; @@ -615,20 +616,20 @@ long wps_show(void) audio_next(); break; - /* menu key functions */ #ifdef WPS_MENU -#ifdef WPS_RC_MENU - case WPS_RC_MENU: -#endif + /* menu key functions */ case WPS_MENU: #ifdef WPS_MENU_PRE - if ((lastbutton != WPS_MENU_PRE) -#ifdef WPS_RC_MENU_PRE - && (lastbutton != WPS_RC_MENU_PRE) + if (lastbutton != WPS_MENU_PRE) + break; #endif - ) +#ifdef WPS_RC_MENU + case WPS_RC_MENU: +#ifdef WPS_RC_MENU_PRE + if ((button == WPS_RC_MENU) && (lastbutton != WPS_RC_MENU_PRE)) break; #endif +#endif lcd_stop_scroll(); if (main_menu()) |