Index: apps/plugins/mp3_encoder.c =================================================================== --- apps/plugins/mp3_encoder.c (Revision 15951) +++ apps/plugins/mp3_encoder.c (Arbeitskopie) @@ -2292,8 +2292,8 @@ #define MP3ENC_SELECT BUTTON_SELECT #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) -#define MP3ENC_PREV BUTTON_SCROLL_BACK -#define MP3ENC_NEXT BUTTON_SCROLL_FWD +#define MP3ENC_PREV BUTTON_SCROLL_COUNTER +#define MP3ENC_NEXT BUTTON_SCROLL_CLOCK #define MP3ENC_DONE BUTTON_MENU #define MP3ENC_SELECT BUTTON_SELECT #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD Index: apps/plugins/superdom.c =================================================================== --- apps/plugins/superdom.c (Revision 15951) +++ apps/plugins/superdom.c (Arbeitskopie) @@ -113,8 +113,8 @@ #elif CONFIG_KEYPAD == SANSA_E200_PAD #define SUPERDOM_OK BUTTON_SELECT -#define SUPERDOM_UP BUTTON_SCROLL_UP -#define SUPERDOM_DOWN BUTTON_SCROLL_DOWN +#define SUPERDOM_UP BUTTON_SCROLL_COUNTER +#define SUPERDOM_DOWN BUTTON_SCROLL_CLOCK #define SUPERDOM_LEFT BUTTON_LEFT #define SUPERDOM_RIGHT BUTTON_RIGHT #define SUPERDOM_CANCEL BUTTON_POWER Index: apps/plugins/xobox.c =================================================================== --- apps/plugins/xobox.c (Revision 15951) +++ apps/plugins/xobox.c (Arbeitskopie) @@ -51,8 +51,8 @@ #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define PAUSE BUTTON_SELECT -#define MENU_UP BUTTON_SCROLL_FWD -#define MENU_DOWN BUTTON_SCROLL_BACK +#define MENU_UP BUTTON_SCROLL_CLOCK +#define MENU_DOWN BUTTON_SCROLL_COUNTER #define UP BUTTON_MENU #define DOWN BUTTON_PLAY Index: apps/plugins/plasma.c =================================================================== --- apps/plugins/plasma.c (Revision 15951) +++ apps/plugins/plasma.c (Arbeitskopie) @@ -56,8 +56,8 @@ #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define PLASMA_QUIT BUTTON_MENU -#define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_FWD -#define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK +#define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_CLOCK +#define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_COUNTER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define PLASMA_QUIT BUTTON_A #define PLASMA_INCREASE_FREQUENCY BUTTON_UP Index: apps/plugins/mandelbrot.c =================================================================== --- apps/plugins/mandelbrot.c (Revision 15951) +++ apps/plugins/mandelbrot.c (Arbeitskopie) @@ -88,8 +88,8 @@ #define MANDELBROT_DOWN BUTTON_PLAY #define MANDELBROT_LEFT BUTTON_LEFT #define MANDELBROT_RIGHT BUTTON_RIGHT -#define MANDELBROT_ZOOM_IN BUTTON_SCROLL_FWD -#define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_BACK +#define MANDELBROT_ZOOM_IN BUTTON_SCROLL_CLOCK +#define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_COUNTER #define MANDELBROT_MAXITER_INC (BUTTON_SELECT | BUTTON_RIGHT) #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) #define MANDELBROT_RESET (BUTTON_SELECT | BUTTON_PLAY) @@ -130,8 +130,8 @@ #define MANDELBROT_DOWN BUTTON_DOWN #define MANDELBROT_LEFT BUTTON_LEFT #define MANDELBROT_RIGHT BUTTON_RIGHT -#define MANDELBROT_ZOOM_IN BUTTON_SCROLL_DOWN -#define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_UP +#define MANDELBROT_ZOOM_IN BUTTON_SCROLL_CLOCK +#define MANDELBROT_ZOOM_OUT BUTTON_SCROLL_COUNTER #define MANDELBROT_MAXITER_INC (BUTTON_SELECT | BUTTON_RIGHT) #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) #define MANDELBROT_RESET BUTTON_REC Index: apps/plugins/zxbox/zxbox_keyb.c =================================================================== --- apps/plugins/zxbox/zxbox_keyb.c (Revision 15951) +++ apps/plugins/zxbox/zxbox_keyb.c (Arbeitskopie) @@ -56,8 +56,8 @@ #define KBD_ABORT BUTTON_MENU #define KBD_LEFT BUTTON_LEFT #define KBD_RIGHT BUTTON_RIGHT -#define KBD_UP BUTTON_SCROLL_BACK -#define KBD_DOWN BUTTON_SCROLL_FWD +#define KBD_UP BUTTON_SCROLL_COUNTER +#define KBD_DOWN BUTTON_SCROLL_CLOCK #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD Index: apps/plugins/sudoku/sudoku.h =================================================================== --- apps/plugins/sudoku/sudoku.h (Revision 15951) +++ apps/plugins/sudoku/sudoku.h (Arbeitskopie) @@ -74,8 +74,8 @@ (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define SUDOKU_BUTTON_MENU BUTTON_MENU -#define SUDOKU_BUTTON_LEFT BUTTON_SCROLL_BACK -#define SUDOKU_BUTTON_RIGHT BUTTON_SCROLL_FWD +#define SUDOKU_BUTTON_LEFT BUTTON_SCROLL_COUNTER +#define SUDOKU_BUTTON_RIGHT BUTTON_SCROLL_CLOCK #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_SELECT #define SUDOKU_BUTTON_TOGGLE BUTTON_RIGHT #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_LEFT @@ -117,8 +117,8 @@ #define SUDOKU_BUTTON_DOWN BUTTON_DOWN #define SUDOKU_BUTTON_LEFT BUTTON_LEFT #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT -#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_UP -#define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_DOWN +#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_COUNTER +#define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_CLOCK #define SUDOKU_BUTTON_MENU BUTTON_SELECT #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC Index: apps/plugins/chessbox/chessbox.c =================================================================== --- apps/plugins/chessbox/chessbox.c (Revision 15951) +++ apps/plugins/chessbox/chessbox.c (Arbeitskopie) @@ -52,8 +52,8 @@ #define CB_LEVEL (BUTTON_SELECT | BUTTON_RIGHT) #define CB_MENU (BUTTON_SELECT | BUTTON_MENU) -#define CB_SCROLL_UP (BUTTON_SCROLL_FWD|BUTTON_REPEAT) -#define CB_SCROLL_DOWN (BUTTON_SCROLL_BACK|BUTTON_REPEAT) +#define CB_SCROLL_UP (BUTTON_SCROLL_CLOCK|BUTTON_REPEAT) +#define CB_SCROLL_DOWN (BUTTON_SCROLL_COUNTER|BUTTON_REPEAT) #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) @@ -191,8 +191,8 @@ #define CB_LEVEL BUTTON_REC #define CB_MENU BUTTON_POWER -#define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) -#define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) +#define CB_SCROLL_UP (BUTTON_SCROLL_COUNTER|BUTTON_REPEAT) +#define CB_SCROLL_DOWN (BUTTON_SCROLL_CLOCK|BUTTON_REPEAT) #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) Index: apps/plugins/chessbox/chessbox_pgn.c =================================================================== --- apps/plugins/chessbox/chessbox_pgn.c (Revision 15951) +++ apps/plugins/chessbox/chessbox_pgn.c (Arbeitskopie) @@ -33,8 +33,8 @@ #define CB_RESTART (BUTTON_SELECT | BUTTON_LEFT) #define CB_MENU (BUTTON_SELECT | BUTTON_MENU) -#define CB_SCROLL_UP (BUTTON_SCROLL_FWD|BUTTON_REPEAT) -#define CB_SCROLL_DOWN (BUTTON_SCROLL_BACK|BUTTON_REPEAT) +#define CB_SCROLL_UP (BUTTON_SCROLL_CLOCK|BUTTON_REPEAT) +#define CB_SCROLL_DOWN (BUTTON_SCROLL_COUNTER|BUTTON_REPEAT) #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) @@ -163,8 +163,8 @@ #define CB_RESTART (BUTTON_REW | BUTTON_PLAY) #define CB_MENU BUTTON_POWER -#define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) -#define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) +#define CB_SCROLL_UP (BUTTON_SCROLL_COUNTER|BUTTON_REPEAT) +#define CB_SCROLL_DOWN (BUTTON_SCROLL_CLOCK|BUTTON_REPEAT) #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) Index: apps/plugins/oscilloscope.c =================================================================== --- apps/plugins/oscilloscope.c (Revision 15951) +++ apps/plugins/oscilloscope.c (Arbeitskopie) @@ -84,8 +84,8 @@ #define OSCILLOSCOPE_PAUSE BUTTON_PLAY #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT -#define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_FWD -#define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_BACK +#define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_CLOCK +#define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_COUNTER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define OSCILLOSCOPE_QUIT BUTTON_POWER @@ -106,8 +106,8 @@ #define OSCILLOSCOPE_PAUSE BUTTON_REC #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT -#define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_DOWN -#define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_UP +#define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_CLOCK +#define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_COUNTER #elif (CONFIG_KEYPAD == SANSA_C200_PAD) #define OSCILLOSCOPE_QUIT BUTTON_POWER Index: apps/plugins/starfield.c =================================================================== --- apps/plugins/starfield.c (Revision 15951) +++ apps/plugins/starfield.c (Arbeitskopie) @@ -31,8 +31,8 @@ (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define STARFIELD_QUIT BUTTON_MENU -#define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_FWD -#define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK +#define STARFIELD_INCREASE_ZMOVE BUTTON_SCROLL_CLOCK +#define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_COUNTER #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_PLAY Index: apps/plugins/snake2.c =================================================================== --- apps/plugins/snake2.c (Revision 15951) +++ apps/plugins/snake2.c (Arbeitskopie) @@ -200,8 +200,8 @@ #define SNAKE2_UP BUTTON_MENU #define SNAKE2_DOWN BUTTON_PLAY #define SNAKE2_QUIT (BUTTON_SELECT | BUTTON_MENU) -#define SNAKE2_LEVEL_UP BUTTON_SCROLL_FWD -#define SNAKE2_LEVEL_DOWN BUTTON_SCROLL_BACK +#define SNAKE2_LEVEL_UP BUTTON_SCROLL_CLOCK +#define SNAKE2_LEVEL_DOWN BUTTON_SCROLL_COUNTER #define SNAKE2_MAZE_NEXT BUTTON_RIGHT #define SNAKE2_MAZE_LAST BUTTON_LEFT #define SNAKE2_SELECT_TYPE BUTTON_PLAY Index: apps/plugins/rockblox.c =================================================================== --- apps/plugins/rockblox.c (Revision 15951) +++ apps/plugins/rockblox.c (Arbeitskopie) @@ -30,9 +30,9 @@ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define ROCKBLOX_OFF (BUTTON_MENU | BUTTON_SELECT) -#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK +#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_COUNTER #define ROCKBLOX_ROTATE_RIGHT2 (BUTTON_MENU | BUTTON_REL) -#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD +#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_CLOCK #define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_RIGHT BUTTON_RIGHT #define ROCKBLOX_DOWN BUTTON_PLAY @@ -113,8 +113,8 @@ #elif CONFIG_KEYPAD == SANSA_E200_PAD #define ROCKBLOX_OFF BUTTON_POWER -#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_UP -#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_DOWN +#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_COUNTER +#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_CLOCK #define ROCKBLOX_DOWN BUTTON_DOWN #define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_RIGHT BUTTON_RIGHT Index: apps/plugins/mpegplayer/mpegplayer.c =================================================================== --- apps/plugins/mpegplayer/mpegplayer.c (Revision 15951) +++ apps/plugins/mpegplayer/mpegplayer.c (Arbeitskopie) @@ -122,8 +122,8 @@ #define MPEG_MENU BUTTON_MENU #define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) #define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) -#define MPEG_VOLDOWN BUTTON_SCROLL_BACK -#define MPEG_VOLUP BUTTON_SCROLL_FWD +#define MPEG_VOLDOWN BUTTON_SCROLL_COUNTER +#define MPEG_VOLUP BUTTON_SCROLL_CLOCK #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define MPEG_MENU (BUTTON_REC | BUTTON_REL) @@ -153,8 +153,8 @@ #define MPEG_MENU BUTTON_SELECT #define MPEG_STOP BUTTON_POWER #define MPEG_PAUSE BUTTON_UP -#define MPEG_VOLDOWN BUTTON_SCROLL_UP -#define MPEG_VOLUP BUTTON_SCROLL_DOWN +#define MPEG_VOLDOWN BUTTON_SCROLL_COUNTER +#define MPEG_VOLUP BUTTON_SCROLL_CLOCK #elif CONFIG_KEYPAD == SANSA_C200_PAD #define MPEG_MENU BUTTON_SELECT Index: apps/plugins/mpegplayer/mpeg_settings.c =================================================================== --- apps/plugins/mpegplayer/mpeg_settings.c (Revision 15951) +++ apps/plugins/mpegplayer/mpeg_settings.c (Arbeitskopie) @@ -48,8 +48,8 @@ #define MPEG_SELECT BUTTON_SELECT #define MPEG_RIGHT BUTTON_RIGHT #define MPEG_LEFT BUTTON_LEFT -#define MPEG_SCROLL_DOWN BUTTON_SCROLL_FWD -#define MPEG_SCROLL_UP BUTTON_SCROLL_BACK +#define MPEG_SCROLL_DOWN BUTTON_SCROLL_CLOCK +#define MPEG_SCROLL_UP BUTTON_SCROLL_COUNTER #define MPEG_EXIT BUTTON_MENU #elif CONFIG_KEYPAD == GIGABEAT_PAD @@ -72,8 +72,8 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) #define MPEG_SELECT BUTTON_SELECT -#define MPEG_SCROLL_UP BUTTON_SCROLL_UP -#define MPEG_SCROLL_DOWN BUTTON_SCROLL_DOWN +#define MPEG_SCROLL_UP BUTTON_SCROLL_COUNTER +#define MPEG_SCROLL_DOWN BUTTON_SCROLL_CLOCK #define MPEG_LEFT BUTTON_LEFT #define MPEG_RIGHT BUTTON_RIGHT #define MPEG_UP BUTTON_UP Index: apps/plugins/fire.c =================================================================== --- apps/plugins/fire.c (Revision 15951) +++ apps/plugins/fire.c (Arbeitskopie) @@ -79,8 +79,8 @@ #define FIRE_QUIT BUTTON_MENU #define FIRE_SWITCH_FLAMES_TYPE BUTTON_SELECT #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT -#define FIRE_INCREASE_MULT BUTTON_SCROLL_FWD -#define FIRE_DECREASE_MULT BUTTON_SCROLL_BACK +#define FIRE_INCREASE_MULT BUTTON_SCROLL_CLOCK +#define FIRE_DECREASE_MULT BUTTON_SCROLL_COUNTER #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) #define FIRE_QUIT BUTTON_POWER @@ -108,8 +108,8 @@ #define FIRE_QUIT BUTTON_POWER #define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT -#define FIRE_INCREASE_MULT BUTTON_SCROLL_UP -#define FIRE_DECREASE_MULT BUTTON_SCROLL_DOWN +#define FIRE_INCREASE_MULT BUTTON_SCROLL_CLOCK +#define FIRE_DECREASE_MULT BUTTON_SCROLL_COUNTER #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) #define FIRE_QUIT BUTTON_PLAY Index: apps/plugins/solitaire.c =================================================================== --- apps/plugins/solitaire.c (Revision 15951) +++ apps/plugins/solitaire.c (Arbeitskopie) @@ -120,8 +120,8 @@ #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) # define SOL_QUIT (BUTTON_SELECT | BUTTON_MENU) -# define SOL_UP BUTTON_SCROLL_BACK -# define SOL_DOWN BUTTON_SCROLL_FWD +# define SOL_UP BUTTON_SCROLL_COUNTER +# define SOL_DOWN BUTTON_SCROLL_CLOCK # define SOL_LEFT_PRE BUTTON_LEFT # define SOL_LEFT (BUTTON_LEFT | BUTTON_REL) # define SOL_RIGHT_PRE BUTTON_RIGHT @@ -185,8 +185,8 @@ # define SOL_QUIT BUTTON_POWER # define SOL_UP BUTTON_UP # define SOL_DOWN BUTTON_DOWN -# define SOL_LEFT BUTTON_SCROLL_UP -# define SOL_RIGHT BUTTON_SCROLL_DOWN +# define SOL_LEFT BUTTON_SCROLL_COUNTER +# define SOL_RIGHT BUTTON_SCROLL_CLOCK # define SOL_MOVE BUTTON_SELECT # define SOL_DRAW BUTTON_REC # define SOL_REM2CUR BUTTON_LEFT @@ -1408,7 +1408,7 @@ /* what to do when a key is pressed ... */ button = rb->button_get( true ); #if (CONFIG_KEYPAD == SANSA_E200_PAD) - if (button&(BUTTON_SCROLL_UP|BUTTON_SCROLL_DOWN)) + if (button&(BUTTON_SCROLL_COUNTER|BUTTON_SCROLL_CLOCK)) button = button & (~BUTTON_REPEAT); #endif switch( button ) Index: apps/plugins/midi/midiplay.c =================================================================== --- apps/plugins/midi/midiplay.c (Revision 15951) +++ apps/plugins/midi/midiplay.c (Arbeitskopie) @@ -55,8 +55,8 @@ #define BTN_QUIT (BUTTON_SELECT | BUTTON_MENU) #define BTN_RIGHT BUTTON_RIGHT #define BTN_LEFT BUTTON_LEFT -#define BTN_UP BUTTON_SCROLL_FWD -#define BTN_DOWN BUTTON_SCROLL_BACK +#define BTN_UP BUTTON_SCROLL_CLOCK +#define BTN_DOWN BUTTON_SCROLL_COUNTER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define BTN_QUIT BUTTON_POWER Index: apps/plugins/pictureflow.c =================================================================== --- apps/plugins/pictureflow.c (Revision 15951) +++ apps/plugins/pictureflow.c (Arbeitskopie) @@ -50,10 +50,10 @@ #endif #ifdef SCROLLWHEEL -#define PICTUREFLOW_NEXT_ALBUM PLA_UP -#define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_UP_REPEAT -#define PICTUREFLOW_PREV_ALBUM PLA_DOWN -#define PICTUREFLOW_PREV_ALBUM_REPEAT PLA_DOWN_REPEAT +#define PICTUREFLOW_NEXT_ALBUM PLA_DOWN +#define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_DOWN_REPEAT +#define PICTUREFLOW_PREV_ALBUM PLA_UP +#define PICTUREFLOW_PREV_ALBUM_REPEAT PLA_UP_REPEAT #else #define PICTUREFLOW_NEXT_ALBUM PLA_RIGHT #define PICTUREFLOW_NEXT_ALBUM_REPEAT PLA_RIGHT_REPEAT Index: apps/plugins/grayscale.c =================================================================== --- apps/plugins/grayscale.c (Revision 15951) +++ apps/plugins/grayscale.c (Arbeitskopie) @@ -57,8 +57,8 @@ #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define GRAYSCALE_SHIFT BUTTON_SELECT -#define GRAYSCALE_UP BUTTON_SCROLL_BACK -#define GRAYSCALE_DOWN BUTTON_SCROLL_FWD +#define GRAYSCALE_UP BUTTON_SCROLL_COUNTER +#define GRAYSCALE_DOWN BUTTON_SCROLL_CLOCK #define GRAYSCALE_LEFT BUTTON_LEFT #define GRAYSCALE_RIGHT BUTTON_RIGHT #define GRAYSCALE_OFF BUTTON_MENU Index: apps/plugins/bounce.c =================================================================== --- apps/plugins/bounce.c (Revision 15951) +++ apps/plugins/bounce.c (Arbeitskopie) @@ -59,8 +59,8 @@ #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) -#define BOUNCE_UP BUTTON_SCROLL_BACK -#define BOUNCE_DOWN BUTTON_SCROLL_FWD +#define BOUNCE_UP BUTTON_SCROLL_COUNTER +#define BOUNCE_DOWN BUTTON_SCROLL_CLOCK #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) #define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) @@ -77,8 +77,8 @@ #define BOUNCE_MODE BUTTON_A #elif CONFIG_KEYPAD == SANSA_E200_PAD -#define BOUNCE_UP BUTTON_SCROLL_UP -#define BOUNCE_DOWN BUTTON_SCROLL_DOWN +#define BOUNCE_UP BUTTON_SCROLL_COUNTER +#define BOUNCE_DOWN BUTTON_SCROLL_CLOCK #define BOUNCE_QUIT BUTTON_POWER #define BOUNCE_MODE BUTTON_SELECT Index: apps/plugins/doom/i_video.c =================================================================== --- apps/plugins/doom/i_video.c (Revision 15951) +++ apps/plugins/doom/i_video.c (Arbeitskopie) @@ -181,8 +181,8 @@ #define DOOMBUTTON_WEAPON BUTTON_FF #elif CONFIG_KEYPAD == SANSA_E200_PAD #define DOOMBUTTON_SCROLLWHEEL -#define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_UP -#define DOOMBUTTON_SCROLLWHEEL_CW BUTTON_SCROLL_DOWN +#define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_COUNTER +#define DOOMBUTTON_SCROLLWHEEL_CW BUTTON_SCROLL_CLOCK #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN #define DOOMBUTTON_LEFT BUTTON_LEFT Index: apps/plugins/cube.c =================================================================== --- apps/plugins/cube.c (Revision 15951) +++ apps/plugins/cube.c (Arbeitskopie) @@ -103,8 +103,8 @@ #define CUBE_QUIT BUTTON_MENU #define CUBE_X_INC BUTTON_RIGHT #define CUBE_X_DEC BUTTON_LEFT -#define CUBE_Y_INC BUTTON_SCROLL_FWD -#define CUBE_Y_DEC BUTTON_SCROLL_BACK +#define CUBE_Y_INC BUTTON_SCROLL_CLOCK +#define CUBE_Y_DEC BUTTON_SCROLL_COUNTER #define CUBE_Z_INC (BUTTON_SELECT | BUTTON_RIGHT) #define CUBE_Z_DEC (BUTTON_SELECT | BUTTON_LEFT) #define CUBE_MODE (BUTTON_SELECT | BUTTON_MENU) @@ -153,8 +153,8 @@ #define CUBE_QUIT BUTTON_POWER #define CUBE_X_INC BUTTON_LEFT #define CUBE_X_DEC BUTTON_RIGHT -#define CUBE_Y_INC BUTTON_SCROLL_UP -#define CUBE_Y_DEC BUTTON_SCROLL_DOWN +#define CUBE_Y_INC BUTTON_SCROLL_CLOCK +#define CUBE_Y_DEC BUTTON_SCROLL_COUNTER #define CUBE_Z_INC BUTTON_UP #define CUBE_Z_DEC BUTTON_DOWN #define CUBE_MODE_PRE BUTTON_SELECT Index: apps/plugins/minesweeper.c =================================================================== --- apps/plugins/minesweeper.c (Revision 15951) +++ apps/plugins/minesweeper.c (Arbeitskopie) @@ -79,8 +79,8 @@ # define MINESWP_SCROLLWHEEL # define MINESWP_UP BUTTON_MENU # define MINESWP_DOWN BUTTON_PLAY -# define MINESWP_NEXT BUTTON_SCROLL_FWD -# define MINESWP_PREV BUTTON_SCROLL_BACK +# define MINESWP_NEXT BUTTON_SCROLL_CLOCK +# define MINESWP_PREV BUTTON_SCROLL_COUNTER # define MINESWP_QUIT (BUTTON_SELECT | BUTTON_MENU) # define MINESWP_TOGGLE_PRE BUTTON_SELECT # define MINESWP_TOGGLE (BUTTON_SELECT | BUTTON_REL) @@ -108,8 +108,8 @@ # define MINESWP_UP BUTTON_UP # define MINESWP_DOWN BUTTON_DOWN # define MINESWP_QUIT BUTTON_POWER -# define MINESWP_NEXT BUTTON_SCROLL_DOWN -# define MINESWP_PREV BUTTON_SCROLL_UP +# define MINESWP_NEXT BUTTON_SCROLL_CLOCK +# define MINESWP_PREV BUTTON_SCROLL_COUNTER # define MINESWP_TOGGLE BUTTON_REC # define MINESWP_DISCOVER BUTTON_SELECT # define MINESWP_INFO (BUTTON_REC|BUTTON_REPEAT) Index: apps/plugins/lib/pluginlib_actions.c =================================================================== --- apps/plugins/lib/pluginlib_actions.c (Revision 15951) +++ apps/plugins/lib/pluginlib_actions.c (Arbeitskopie) @@ -83,13 +83,14 @@ { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ || (CONFIG_KEYPAD == IPOD_3G_PAD) \ + || (CONFIG_KEYPAD == SANSA_E200_PAD) \ || (CONFIG_KEYPAD == IPOD_4G_PAD) - { PLA_UP, BUTTON_SCROLL_FWD, BUTTON_NONE}, - { PLA_DOWN, BUTTON_SCROLL_BACK, BUTTON_NONE}, + { PLA_UP, BUTTON_SCROLL_COUNTER, BUTTON_NONE}, + { PLA_DOWN, BUTTON_SCROLL_CLOCK, BUTTON_NONE}, { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, - { PLA_UP_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, - { PLA_DOWN_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_UP_REPEAT, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_DOWN_REPEAT, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE}, { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, #elif CONFIG_KEYPAD == ONDIO_PAD @@ -110,8 +111,7 @@ {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, -#elif (CONFIG_KEYPAD == SANSA_E200_PAD) \ - || (CONFIG_KEYPAD == IRIVER_H10_PAD) +#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, @@ -151,10 +151,10 @@ #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ || (CONFIG_KEYPAD == IPOD_3G_PAD) \ || (CONFIG_KEYPAD == IPOD_4G_PAD) - { PLA_LEFT, BUTTON_SCROLL_BACK, BUTTON_NONE}, - { PLA_RIGHT, BUTTON_SCROLL_FWD, BUTTON_NONE}, - { PLA_LEFT_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, - { PLA_RIGHT_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_LEFT, BUTTON_SCROLL_COUNTER, BUTTON_NONE}, + { PLA_RIGHT, BUTTON_SCROLL_CLOCK, BUTTON_NONE}, + { PLA_LEFT_REPEAT, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE}, + { PLA_RIGHT_REPEAT, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE}, { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, #elif CONFIG_KEYPAD == ONDIO_PAD Index: apps/plugins/jpeg.c =================================================================== --- apps/plugins/jpeg.c (Revision 15951) +++ apps/plugins/jpeg.c (Arbeitskopie) @@ -94,8 +94,8 @@ #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) -#define JPEG_ZOOM_IN BUTTON_SCROLL_FWD -#define JPEG_ZOOM_OUT BUTTON_SCROLL_BACK +#define JPEG_ZOOM_IN BUTTON_SCROLL_CLOCK +#define JPEG_ZOOM_OUT BUTTON_SCROLL_COUNTER #define JPEG_UP BUTTON_MENU #define JPEG_DOWN BUTTON_PLAY #define JPEG_LEFT BUTTON_LEFT @@ -137,10 +137,10 @@ #define JPEG_RIGHT BUTTON_RIGHT #define JPEG_MENU BUTTON_POWER #define JPEG_SLIDE_SHOW BUTTON_REC -#define JPEG_NEXT BUTTON_SCROLL_DOWN -#define JPEG_NEXT_REPEAT (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) -#define JPEG_PREVIOUS BUTTON_SCROLL_UP -#define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_UP|BUTTON_REPEAT) +#define JPEG_NEXT BUTTON_SCROLL_CLOCK +#define JPEG_NEXT_REPEAT (BUTTON_SCROLL_CLOCK|BUTTON_REPEAT) +#define JPEG_PREVIOUS BUTTON_SCROLL_COUNTER +#define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_COUNTER|BUTTON_REPEAT) #elif CONFIG_KEYPAD == SANSA_C200_PAD #define JPEG_ZOOM_PRE BUTTON_SELECT Index: apps/plugins/vu_meter.c =================================================================== --- apps/plugins/vu_meter.c (Revision 15951) +++ apps/plugins/vu_meter.c (Arbeitskopie) @@ -73,8 +73,8 @@ #define VUMETER_MENU BUTTON_SELECT #define VUMETER_MENU_EXIT BUTTON_SELECT #define VUMETER_MENU_EXIT2 BUTTON_MENU -#define VUMETER_UP BUTTON_SCROLL_FWD -#define VUMETER_DOWN BUTTON_SCROLL_BACK +#define VUMETER_UP BUTTON_SCROLL_CLOCK +#define VUMETER_DOWN BUTTON_SCROLL_COUNTER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define VUMETER_QUIT BUTTON_POWER @@ -91,8 +91,8 @@ #define VUMETER_MENU BUTTON_SELECT #define VUMETER_MENU_EXIT BUTTON_SELECT #define VUMETER_MENU_EXIT2 BUTTON_POWER -#define VUMETER_UP BUTTON_SCROLL_DOWN -#define VUMETER_DOWN BUTTON_SCROLL_UP +#define VUMETER_UP BUTTON_SCROLL_CLOCK +#define VUMETER_DOWN BUTTON_SCROLL_COUNTER #elif (CONFIG_KEYPAD == SANSA_C200_PAD) #define VUMETER_QUIT BUTTON_POWER Index: apps/plugins/rockboy/menu.c =================================================================== --- apps/plugins/rockboy/menu.c (Revision 15951) +++ apps/plugins/rockboy/menu.c (Arbeitskopie) @@ -13,8 +13,8 @@ #include "pcm.h" #if CONFIG_KEYPAD == IPOD_4G_PAD -#define MENU_BUTTON_UP BUTTON_SCROLL_BACK -#define MENU_BUTTON_DOWN BUTTON_SCROLL_FWD +#define MENU_BUTTON_UP BUTTON_SCROLL_COUNTER +#define MENU_BUTTON_DOWN BUTTON_SCROLL_CLOCK #define MENU_BUTTON_LEFT BUTTON_LEFT #define MENU_BUTTON_RIGHT BUTTON_RIGHT Index: apps/plugins/rockboy/sys_rockbox.c =================================================================== --- apps/plugins/rockboy/sys_rockbox.c (Revision 15951) +++ apps/plugins/rockboy/sys_rockbox.c (Arbeitskopie) @@ -26,8 +26,8 @@ #if CONFIG_KEYPAD == SANSA_E200_PAD #define ROCKBOY_SCROLLWHEEL -#define ROCKBOY_SCROLLWHEEL_CC BUTTON_SCROLL_UP -#define ROCKBOY_SCROLLWHEEL_CW BUTTON_SCROLL_DOWN +#define ROCKBOY_SCROLLWHEEL_CC BUTTON_SCROLL_COUNTER +#define ROCKBOY_SCROLLWHEEL_CW BUTTON_SCROLL_CLOCK #endif struct fb fb IBSS_ATTR; Index: apps/plugins/rockboy/rockboy.c =================================================================== --- apps/plugins/rockboy/rockboy.c (Revision 15951) +++ apps/plugins/rockboy/rockboy.c (Arbeitskopie) @@ -153,8 +153,8 @@ options.A=BUTTON_SELECT; options.B=BUTTON_REC; - options.START=BUTTON_SCROLL_UP; - options.SELECT=BUTTON_SCROLL_DOWN; + options.START=BUTTON_SCROLL_COUNTER; + options.SELECT=BUTTON_SCROLL_CLOCK; options.MENU=BUTTON_POWER; #elif CONFIG_KEYPAD == SANSA_C200_PAD Index: apps/plugins/spacerocks.c =================================================================== --- apps/plugins/spacerocks.c (Revision 15951) +++ apps/plugins/spacerocks.c (Arbeitskopie) @@ -102,10 +102,10 @@ #define AST_THRUST BUTTON_MENU #define AST_THRUST_REP (BUTTON_MENU | BUTTON_REPEAT) #define AST_HYPERSPACE BUTTON_PLAY -#define AST_LEFT BUTTON_SCROLL_BACK -#define AST_LEFT_REP (BUTTON_SCROLL_BACK | BUTTON_REPEAT) -#define AST_RIGHT BUTTON_SCROLL_FWD -#define AST_RIGHT_REP (BUTTON_SCROLL_FWD | BUTTON_REPEAT) +#define AST_LEFT BUTTON_SCROLL_COUNTER +#define AST_LEFT_REP (BUTTON_SCROLL_COUNTER | BUTTON_REPEAT) +#define AST_RIGHT BUTTON_SCROLL_CLOCK +#define AST_RIGHT_REP (BUTTON_SCROLL_CLOCK | BUTTON_REPEAT) #define AST_FIRE BUTTON_SELECT #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) @@ -128,10 +128,10 @@ #define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT) #define AST_THRUST BUTTON_UP #define AST_HYPERSPACE BUTTON_DOWN -#define AST_LEFT BUTTON_SCROLL_UP -#define AST_LEFT_REP (BUTTON_SCROLL_UP | BUTTON_REPEAT) -#define AST_RIGHT BUTTON_SCROLL_DOWN -#define AST_RIGHT_REP (BUTTON_SCROLL_DOWN | BUTTON_REPEAT) +#define AST_LEFT BUTTON_SCROLL_COUNTER +#define AST_LEFT_REP (BUTTON_SCROLL_COUNTER | BUTTON_REPEAT) +#define AST_RIGHT BUTTON_SCROLL_CLOCK +#define AST_RIGHT_REP (BUTTON_SCROLL_CLOCK | BUTTON_REPEAT) #define AST_FIRE BUTTON_SELECT #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) Index: apps/plugins/reversi/reversi-gui.h =================================================================== --- apps/plugins/reversi/reversi-gui.h (Revision 15951) +++ apps/plugins/reversi/reversi-gui.h (Arbeitskopie) @@ -63,8 +63,8 @@ #define REVERSI_BUTTON_DOWN BUTTON_PLAY #define REVERSI_BUTTON_LEFT BUTTON_LEFT #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT -#define REVERSI_BUTTON_ALT_LEFT BUTTON_SCROLL_BACK -#define REVERSI_BUTTON_ALT_RIGHT BUTTON_SCROLL_FWD +#define REVERSI_BUTTON_ALT_LEFT BUTTON_SCROLL_COUNTER +#define REVERSI_BUTTON_ALT_RIGHT BUTTON_SCROLL_CLOCK #define REVERSI_BUTTON_MAKE_MOVE (BUTTON_SELECT | BUTTON_REL) #define REVERSI_BUTTON_MENU (BUTTON_MENU | BUTTON_SELECT) Index: apps/plugins/test_scanrate.c =================================================================== --- apps/plugins/test_scanrate.c (Revision 15951) +++ apps/plugins/test_scanrate.c (Arbeitskopie) @@ -41,8 +41,8 @@ #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) \ || (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define SCANRATE_DONE BUTTON_MENU -#define SCANRATE_FASTINC BUTTON_SCROLL_FWD -#define SCANRATE_FASTDEC BUTTON_SCROLL_BACK +#define SCANRATE_FASTINC BUTTON_SCROLL_CLOCK +#define SCANRATE_FASTDEC BUTTON_SCROLL_COUNTER #define SCANRATE_INC BUTTON_RIGHT #define SCANRATE_DEC BUTTON_LEFT Index: apps/plugins/logo.c =================================================================== --- apps/plugins/logo.c (Revision 15951) +++ apps/plugins/logo.c (Arbeitskopie) @@ -189,8 +189,8 @@ #define LP_QUIT BUTTON_MENU #define LP_DEC_X BUTTON_LEFT #define LP_INC_X BUTTON_RIGHT -#define LP_DEC_Y BUTTON_SCROLL_BACK -#define LP_INC_Y BUTTON_SCROLL_FWD +#define LP_DEC_Y BUTTON_SCROLL_COUNTER +#define LP_INC_Y BUTTON_SCROLL_CLOCK #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD #define LP_QUIT BUTTON_PLAY #define LP_DEC_X BUTTON_LEFT Index: apps/plugins/brickmania.c =================================================================== --- apps/plugins/brickmania.c (Revision 15951) +++ apps/plugins/brickmania.c (Arbeitskopie) @@ -36,8 +36,8 @@ #define RC_QUIT BUTTON_RC_STOP /* Only iPod have scroll events */ -#define SCROLL_FWD(x) (0) -#define SCROLL_BACK(x) (0) +#define SCROLL_CLOCK(x) (0) +#define SCROLL_COUNTER(x) (0) #elif CONFIG_KEYPAD == ONDIO_PAD @@ -49,8 +49,8 @@ #define DOWN BUTTON_DOWN /* Only iPod have scroll events */ -#define SCROLL_FWD(x) (0) -#define SCROLL_BACK(x) (0) +#define SCROLL_CLOCK(x) (0) +#define SCROLL_COUNTER(x) (0) #elif CONFIG_KEYPAD == RECORDER_PAD @@ -62,8 +62,8 @@ #define DOWN BUTTON_DOWN /* Only iPod have scroll events */ -#define SCROLL_FWD(x) (0) -#define SCROLL_BACK(x) (0) +#define SCROLL_CLOCK(x) (0) +#define SCROLL_COUNTER(x) (0) #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD @@ -75,8 +75,8 @@ #define DOWN BUTTON_DOWN /* Only iPod have scroll events */ -#define SCROLL_FWD(x) (0) -#define SCROLL_BACK(x) (0) +#define SCROLL_CLOCK(x) (0) +#define SCROLL_COUNTER(x) (0) #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ (CONFIG_KEYPAD == IPOD_3G_PAD) || \ @@ -86,12 +86,9 @@ #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define SELECT BUTTON_SELECT -#define UP BUTTON_SCROLL_BACK -#define DOWN BUTTON_SCROLL_FWD +#define UP BUTTON_SCROLL_COUNTER +#define DOWN BUTTON_SCROLL_CLOCK -#define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_FWD) -#define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK) - #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define QUIT BUTTON_POWER @@ -101,8 +98,8 @@ #define UP BUTTON_UP #define DOWN BUTTON_DOWN -#define SCROLL_FWD(x) (0) -#define SCROLL_BACK(x) (0) +#define SCROLL_CLOCK(x) (0) +#define SCROLL_COUNTER(x) (0) #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD /* grayscale at the moment */ @@ -114,8 +111,8 @@ #define DOWN BUTTON_DOWN /* Only iPod have scroll events */ -#define SCROLL_FWD(x) (0) -#define SCROLL_BACK(x) (0) +#define SCROLL_CLOCK(x) (0) +#define SCROLL_COUNTER(x) (0) #elif CONFIG_KEYPAD == SANSA_E200_PAD @@ -123,12 +120,9 @@ #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define SELECT BUTTON_SELECT -#define UP BUTTON_SCROLL_UP -#define DOWN BUTTON_SCROLL_DOWN +#define UP BUTTON_SCROLL_COUNTER +#define DOWN BUTTON_SCROLL_CLOCK -#define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_DOWN) -#define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_UP) - #elif CONFIG_KEYPAD == IRIVER_H10_PAD /* grayscale at the moment */ #define QUIT BUTTON_POWER @@ -139,13 +133,16 @@ #define DOWN BUTTON_SCROLL_DOWN /* Only iPod have scroll events */ -#define SCROLL_FWD(x) (0) -#define SCROLL_BACK(x) (0) +#define SCROLL_CLOCK(x) (0) +#define SCROLL_COUNTER(x) (0) #else #error Unsupported keypad #endif +#define SCROLL_CLOCK(x) ((x) & BUTTON_SCROLL_CLOCK) +#define SCROLL_COUNTER(x) ((x) & BUTTON_SCROLL_COUNTER) + static struct plugin_api* rb; enum menu_items { @@ -1856,8 +1853,8 @@ move_button=rb->button_status(); - button_right=((move_button & RIGHT) || (SCROLL_FWD(button))); - button_left=((move_button & LEFT) || (SCROLL_BACK(button))); + button_right=((move_button & RIGHT) || (SCROLL_CLOCK(button))); + button_left=((move_button & LEFT) || (SCROLL_COUNTER(button))); if ((con_game== 1 && start_game!=1) && (button_right || button_left)) continue; if ((button_right && flip_sides==false) || Index: apps/plugins/viewer.c =================================================================== --- apps/plugins/viewer.c (Revision 15951) +++ apps/plugins/viewer.c (Arbeitskopie) @@ -134,8 +134,8 @@ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define VIEWER_QUIT_PRE BUTTON_SELECT #define VIEWER_QUIT (BUTTON_SELECT | BUTTON_MENU) -#define VIEWER_PAGE_UP BUTTON_SCROLL_BACK -#define VIEWER_PAGE_DOWN BUTTON_SCROLL_FWD +#define VIEWER_PAGE_UP BUTTON_SCROLL_COUNTER +#define VIEWER_PAGE_DOWN BUTTON_SCROLL_CLOCK #define VIEWER_SCREEN_LEFT BUTTON_LEFT #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT #define VIEWER_MENU BUTTON_MENU @@ -180,8 +180,8 @@ #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT #define VIEWER_MENU BUTTON_SELECT #define VIEWER_AUTOSCROLL BUTTON_REC -#define VIEWER_LINE_UP BUTTON_SCROLL_UP -#define VIEWER_LINE_DOWN BUTTON_SCROLL_DOWN +#define VIEWER_LINE_UP BUTTON_SCROLL_CLOCK +#define VIEWER_LINE_DOWN BUTTON_SCROLL_COUNTER /* Sansa C200 keys */ #elif CONFIG_KEYPAD == SANSA_C200_PAD Index: apps/plugins/beatbox/beatbox.c =================================================================== --- apps/plugins/beatbox/beatbox.c (Revision 15951) +++ apps/plugins/beatbox/beatbox.c (Arbeitskopie) @@ -51,8 +51,8 @@ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define BTN_QUIT (BUTTON_SELECT | BUTTON_MENU) #define BTN_RIGHT BUTTON_RIGHT -#define BTN_UP BUTTON_SCROLL_FWD -#define BTN_DOWN BUTTON_SCROLL_BACK +#define BTN_UP BUTTON_SCROLL_CLOCK +#define BTN_DOWN BUTTON_SCROLL_COUNTER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define BTN_QUIT BUTTON_POWER Index: apps/plugins/matrix.c =================================================================== --- apps/plugins/matrix.c (Revision 15951) +++ apps/plugins/matrix.c (Arbeitskopie) @@ -51,8 +51,8 @@ (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define MATRIX_EXIT BUTTON_MENU -#define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT -#define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT +#define MATRIX_SLEEP_MORE BUTTON_SCROLL_COUNTER|BUTTON_REPEAT +#define MATRIX_SLEEP_LESS BUTTON_SCROLL_CLOCK|BUTTON_REPEAT #define MATRIX_PAUSE BUTTON_PLAY #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ (CONFIG_KEYPAD == IRIVER_H300_PAD) @@ -77,8 +77,8 @@ #define MATRIX_PAUSE BUTTON_SELECT #elif CONFIG_KEYPAD == SANSA_E200_PAD #define MATRIX_EXIT BUTTON_POWER -#define MATRIX_SLEEP_MORE BUTTON_SCROLL_UP|BUTTON_REPEAT -#define MATRIX_SLEEP_LESS BUTTON_SCROLL_DOWN|BUTTON_REPEAT +#define MATRIX_SLEEP_MORE BUTTON_SCROLL_COUNTER|BUTTON_REPEAT +#define MATRIX_SLEEP_LESS BUTTON_SCROLL_CLOCK|BUTTON_REPEAT #define MATRIX_PAUSE BUTTON_SELECT #elif CONFIG_KEYPAD == SANSA_C200_PAD #define MATRIX_EXIT BUTTON_POWER Index: apps/plugins/metronome.c =================================================================== --- apps/plugins/metronome.c (Revision 15951) +++ apps/plugins/metronome.c (Arbeitskopie) @@ -20,12 +20,21 @@ #include "metronome.h" PLUGIN_HEADER +#define METRONOME_QUIT PLA_QUIT -#define METRONOME_QUIT PLA_QUIT +/* for volume changes, PLA with scrollwheel isn't proper */ + +#ifdef HAVE_SCROLLWHEEL +#define METRONOME_VOL_UP PLA_DOWN +#define METRONOME_VOL_DOWN PLA_UP +#define METRONOME_VOL_UP_REP PLA_DOWN_REPEAT +#define METRONOME_VOL_DOWN_REP PLA_UP_REPEAT +#else #define METRONOME_VOL_UP PLA_UP #define METRONOME_VOL_DOWN PLA_DOWN #define METRONOME_VOL_UP_REP PLA_UP_REPEAT #define METRONOME_VOL_DOWN_REP PLA_DOWN_REPEAT +#endif #define METRONOME_LEFT PLA_LEFT #define METRONOME_RIGHT PLA_RIGHT #define METRONOME_LEFT_REP PLA_LEFT_REPEAT Index: apps/plugins/blackjack.c =================================================================== --- apps/plugins/blackjack.c (Revision 15951) +++ apps/plugins/blackjack.c (Arbeitskopie) @@ -101,15 +101,15 @@ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define BJACK_START BUTTON_SELECT #define BJACK_QUIT BUTTON_MENU -#define BJACK_MAX (BUTTON_SELECT|BUTTON_SCROLL_FWD) -#define BJACK_MIN (BUTTON_SELECT|BUTTON_SCROLL_BACK) +#define BJACK_MAX (BUTTON_SELECT|BUTTON_SCROLL_CLOCK) +#define BJACK_MIN (BUTTON_SELECT|BUTTON_SCROLL_COUNTER) #define BJACK_HIT BUTTON_SELECT #define BJACK_STAY BUTTON_RIGHT #define BJACK_DOUBLEDOWN BUTTON_LEFT #define BJACK_SCORES BUTTON_RIGHT #define BJACK_RESUME BUTTON_PLAY -#define BJACK_UP BUTTON_SCROLL_FWD -#define BJACK_DOWN BUTTON_SCROLL_BACK +#define BJACK_UP BUTTON_SCROLL_CLOCK +#define BJACK_DOWN BUTTON_SCROLL_COUNTER #define BJACK_RIGHT BUTTON_RIGHT #define BJACK_LEFT BUTTON_LEFT @@ -168,8 +168,8 @@ #define BJACK_DOUBLEDOWN BUTTON_LEFT #define BJACK_SCORES BUTTON_UP #define BJACK_RESUME BUTTON_REC -#define BJACK_UP BUTTON_SCROLL_UP -#define BJACK_DOWN BUTTON_SCROLL_DOWN +#define BJACK_UP BUTTON_SCROLL_CLOCK +#define BJACK_DOWN BUTTON_SCROLL_COUNTER #define BJACK_RIGHT BUTTON_RIGHT #define BJACK_LEFT BUTTON_LEFT Index: apps/plugins/chip8.c =================================================================== --- apps/plugins/chip8.c (Revision 15951) +++ apps/plugins/chip8.c (Arbeitskopie) @@ -994,11 +994,11 @@ (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) #define CHIP8_OFF BUTTON_MENU -#define CHIP8_KEY2 BUTTON_SCROLL_BACK +#define CHIP8_KEY2 BUTTON_SCROLL_COUNTER #define CHIP8_KEY4 BUTTON_LEFT #define CHIP8_KEY5 BUTTON_PLAY #define CHIP8_KEY6 BUTTON_RIGHT -#define CHIP8_KEY8 BUTTON_SCROLL_FWD +#define CHIP8_KEY8 BUTTON_SCROLL_CLOCK #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) #define CHIP8_OFF BUTTON_POWER @@ -1022,11 +1022,11 @@ #elif CONFIG_KEYPAD == SANSA_E200_PAD #define CHIP8_OFF BUTTON_POWER -#define CHIP8_KEY2 BUTTON_SCROLL_UP +#define CHIP8_KEY2 BUTTON_SCROLL_COUNTER #define CHIP8_KEY4 BUTTON_LEFT #define CHIP8_KEY5 BUTTON_SELECT #define CHIP8_KEY6 BUTTON_RIGHT -#define CHIP8_KEY8 BUTTON_SCROLL_DOWN +#define CHIP8_KEY8 BUTTON_SCROLL_CLOCK #elif CONFIG_KEYPAD == SANSA_C200_PAD #define CHIP8_OFF BUTTON_POWER Index: apps/plugins/stopwatch.c =================================================================== --- apps/plugins/stopwatch.c (Revision 15951) +++ apps/plugins/stopwatch.c (Arbeitskopie) @@ -77,8 +77,8 @@ #define STOPWATCH_START_STOP BUTTON_SELECT #define STOPWATCH_RESET_TIMER BUTTON_LEFT #define STOPWATCH_LAP_TIMER BUTTON_RIGHT -#define STOPWATCH_SCROLL_UP BUTTON_SCROLL_FWD -#define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_BACK +#define STOPWATCH_SCROLL_UP BUTTON_SCROLL_CLOCK +#define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_COUNTER #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD #define STOPWATCH_QUIT BUTTON_PLAY #define STOPWATCH_START_STOP BUTTON_MODE Index: apps/plugins/chessclock.c =================================================================== --- apps/plugins/chessclock.c (Revision 15951) +++ apps/plugins/chessclock.c (Arbeitskopie) @@ -84,8 +84,8 @@ #define CHC_STARTSTOP BUTTON_SELECT #define CHC_RESET BUTTON_LEFT #define CHC_MENU BUTTON_MENU -#define CHC_SETTINGS_INC BUTTON_SCROLL_FWD -#define CHC_SETTINGS_DEC BUTTON_SCROLL_BACK +#define CHC_SETTINGS_INC BUTTON_SCROLL_CLOCK +#define CHC_SETTINGS_DEC BUTTON_SCROLL_COUNTER #define CHC_SETTINGS_OK BUTTON_SELECT #define CHC_SETTINGS_CANCEL BUTTON_MENU Index: apps/plugins/jewels.c =================================================================== --- apps/plugins/jewels.c (Revision 15951) +++ apps/plugins/jewels.c (Arbeitskopie) @@ -67,8 +67,8 @@ #define JEWELS_DOWN BUTTON_PLAY #define JEWELS_LEFT BUTTON_LEFT #define JEWELS_RIGHT BUTTON_RIGHT -#define JEWELS_PREV BUTTON_SCROLL_BACK -#define JEWELS_NEXT BUTTON_SCROLL_FWD +#define JEWELS_PREV BUTTON_SCROLL_COUNTER +#define JEWELS_NEXT BUTTON_SCROLL_CLOCK #define JEWELS_SELECT BUTTON_SELECT #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD Index: apps/plugins/calculator.c =================================================================== --- apps/plugins/calculator.c (Revision 15951) +++ apps/plugins/calculator.c (Arbeitskopie) @@ -149,8 +149,8 @@ (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) -#define CALCULATOR_UP BUTTON_SCROLL_BACK -#define CALCULATOR_DOWN BUTTON_SCROLL_FWD +#define CALCULATOR_UP BUTTON_SCROLL_COUNTER +#define CALCULATOR_DOWN BUTTON_SCROLL_CLOCK #define CALCULATOR_QUIT BUTTON_MENU #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT #define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL) Index: apps/keymaps/keymap-ipod.c =================================================================== --- apps/keymaps/keymap-ipod.c (Revision 15951) +++ apps/keymaps/keymap-ipod.c (Arbeitskopie) @@ -39,10 +39,10 @@ */ static const struct button_mapping button_context_standard[] = { - { ACTION_STD_PREV, BUTTON_SCROLL_BACK, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, @@ -83,10 +83,10 @@ { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, - { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_VOLUP, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_WPS_VOLUP, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, @@ -96,10 +96,10 @@ }; /* button_context_wps */ static const struct button_mapping button_context_settings[] = { - { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_INC, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, @@ -133,10 +133,10 @@ }; /* button_context_quickscreen */ static const struct button_mapping button_context_pitchscreen[] = { - { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE }, - { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE }, - { ACTION_PS_DEC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_PS_INC_SMALL, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_PS_INC_BIG, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_PS_DEC_BIG, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, @@ -156,10 +156,10 @@ { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, { ACTION_KBD_DONE, BUTTON_PLAY, BUTTON_NONE }, { ACTION_KBD_ABORT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, - { ACTION_KBD_UP, BUTTON_SCROLL_BACK, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_UP, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_KBD_UP, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_DOWN, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_KBD_DOWN, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_MORSE_INPUT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, LAST_ITEM_IN_LIST Index: apps/keymaps/keymap-e200.c =================================================================== --- apps/keymaps/keymap-e200.c (Revision 15951) +++ apps/keymaps/keymap-e200.c (Arbeitskopie) @@ -31,10 +31,10 @@ * Insert LAST_ITEM_IN_LIST at the end of each mapping */ static const struct button_mapping button_context_standard[] = { - { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, @@ -67,10 +67,10 @@ { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, - { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_UP, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_VOLUP, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_WPS_VOLUP, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, @@ -88,10 +88,10 @@ static const struct button_mapping button_context_settings[] = { { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, - { ACTION_SETTINGS_INC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_SCROLL_UP, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_INC, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, @@ -103,8 +103,8 @@ }; /* button_context_settings */ static const struct button_mapping button_context_list[] = { - { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_UP, BUTTON_REC }, - { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC }, + { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_SCROLL_COUNTER, BUTTON_REC }, + { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_CLOCK, BUTTON_REC }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_list */ @@ -162,10 +162,10 @@ }; /* button_context_quickscreen */ static const struct button_mapping button_context_settings_right_is_inc[] = { - { ACTION_SETTINGS_INC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_SCROLL_UP, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT,BUTTON_NONE }, + { ACTION_SETTINGS_INC, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT,BUTTON_NONE }, { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, @@ -190,10 +190,10 @@ }; /* button_context_settings_time */ static const struct button_mapping button_context_pitchscreen[] = { - { ACTION_PS_INC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE }, - { ACTION_PS_INC_BIG, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE }, - { ACTION_PS_DEC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_PS_INC_SMALL, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_PS_INC_BIG, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_PS_DEC_BIG, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, @@ -215,10 +215,10 @@ { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, - { ACTION_STD_PREV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_STD_PREV, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_STD_NEXT, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen */ @@ -245,10 +245,10 @@ { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_SCROLL_UP, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_UP, BUTTON_SCROLL_COUNTER, BUTTON_NONE }, + { ACTION_KBD_UP, BUTTON_SCROLL_COUNTER|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_DOWN, BUTTON_SCROLL_CLOCK, BUTTON_NONE }, + { ACTION_KBD_DOWN, BUTTON_SCROLL_CLOCK|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, { ACTION_KBD_BACKSPACE, BUTTON_DOWN, BUTTON_NONE }, { ACTION_KBD_BACKSPACE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, Index: firmware/target/arm/ipod/button-target.h =================================================================== --- firmware/target/arm/ipod/button-target.h (Revision 15951) +++ firmware/target/arm/ipod/button-target.h (Arbeitskopie) @@ -39,14 +39,14 @@ #define BUTTON_LEFT 0x00000004 #define BUTTON_RIGHT 0x00000008 -#define BUTTON_SCROLL_FWD 0x00000010 -#define BUTTON_SCROLL_BACK 0x00000020 +#define BUTTON_SCROLL_CLOCK 0x00000010 +#define BUTTON_SCROLL_COUNTER 0x00000020 #define BUTTON_PLAY 0x00000040 #define BUTTON_MAIN (BUTTON_SELECT|BUTTON_MENU\ - |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_SCROLL_FWD\ - |BUTTON_SCROLL_BACK|BUTTON_PLAY) + |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_SCROLL_CLOCK\ + |BUTTON_SCROLL_COUNTER|BUTTON_PLAY) #define BUTTON_REMOTE 0 Index: firmware/target/arm/ipod/button-clickwheel.c =================================================================== --- firmware/target/arm/ipod/button-clickwheel.c (Revision 15951) +++ firmware/target/arm/ipod/button-clickwheel.c (Arbeitskopie) @@ -176,9 +176,9 @@ /* Getting direction and wheel_keycode from wheel_delta. * Need at least some clicks to be sure to avoid haptic fuzziness */ if (wheel_delta >= WHEEL_SENSITIVITY) - wheel_keycode = BUTTON_SCROLL_FWD; + wheel_keycode = BUTTON_SCROLL_CLOCK; else if (wheel_delta <= -WHEEL_SENSITIVITY) - wheel_keycode = BUTTON_SCROLL_BACK; + wheel_keycode = BUTTON_SCROLL_COUNTER; else wheel_keycode = BUTTON_NONE; Index: firmware/target/arm/ipod/button-1g-3g.c =================================================================== --- firmware/target/arm/ipod/button-1g-3g.c (Revision 15951) +++ firmware/target/arm/ipod/button-1g-3g.c (Arbeitskopie) @@ -84,21 +84,21 @@ case 1: if (reverse) { /* 'r' keypress */ - wheel_keycode = BUTTON_SCROLL_FWD; + wheel_keycode = BUTTON_SCROLL_CLOCK; } else { /* 'l' keypress */ - wheel_keycode = BUTTON_SCROLL_BACK; + wheel_keycode = BUTTON_SCROLL_COUNTER; } break; case -1: if (reverse) { /* 'l' keypress */ - wheel_keycode = BUTTON_SCROLL_BACK; + wheel_keycode = BUTTON_SCROLL_COUNTER; } else { /* 'r' keypress */ - wheel_keycode = BUTTON_SCROLL_FWD; + wheel_keycode = BUTTON_SCROLL_CLOCK; } break; default: Index: firmware/target/arm/ipod/button-mini1g.c =================================================================== --- firmware/target/arm/ipod/button-mini1g.c (Revision 15951) +++ firmware/target/arm/ipod/button-mini1g.c (Arbeitskopie) @@ -77,21 +77,21 @@ case 1: if (reverse) { /* 'r' keypress */ - wheel_keycode = BUTTON_SCROLL_FWD; + wheel_keycode = BUTTON_SCROLL_CLOCK; } else { /* 'l' keypress */ - wheel_keycode = BUTTON_SCROLL_BACK; + wheel_keycode = BUTTON_SCROLL_COUNTER; } break; case -1: if (reverse) { /* 'l' keypress */ - wheel_keycode = BUTTON_SCROLL_BACK; + wheel_keycode = BUTTON_SCROLL_COUNTER; } else { /* 'r' keypress */ - wheel_keycode = BUTTON_SCROLL_FWD; + wheel_keycode = BUTTON_SCROLL_CLOCK; } break; default: Index: firmware/target/arm/sandisk/sansa-e200/button-e200.c =================================================================== --- firmware/target/arm/sandisk/sansa-e200/button-e200.c (Revision 15951) +++ firmware/target/arm/sandisk/sansa-e200/button-e200.c (Arbeitskopie) @@ -128,9 +128,9 @@ unsigned int btn = BUTTON_NONE; if (old_wheel_value == wheel_tbl[0][wheel_value >> 6]) - btn = BUTTON_SCROLL_DOWN; + btn = BUTTON_SCROLL_CLOCK; else if (old_wheel_value == wheel_tbl[1][wheel_value >> 6]) - btn = BUTTON_SCROLL_UP; + btn = BUTTON_SCROLL_COUNTER; if (btn != BUTTON_NONE) { Index: firmware/target/arm/sandisk/sansa-e200/button-target.h =================================================================== --- firmware/target/arm/sandisk/sansa-e200/button-target.h (Revision 15951) +++ firmware/target/arm/sandisk/sansa-e200/button-target.h (Arbeitskopie) @@ -40,8 +40,8 @@ #define BUTTON_UP 0x00000020 #define BUTTON_POWER 0x00000040 -#define BUTTON_SCROLL_UP 0x00000080 -#define BUTTON_SCROLL_DOWN 0x00000100 +#define BUTTON_SCROLL_COUNTER 0x00000080 +#define BUTTON_SCROLL_CLOCK 0x00000100 #define BUTTON_MAIN 0x00000fff Index: firmware/drivers/button.c =================================================================== --- firmware/drivers/button.c (Revision 15951) +++ firmware/drivers/button.c (Arbeitskopie) @@ -412,8 +412,8 @@ #if defined(BUTTON_UP) && defined(BUTTON_DOWN) | BUTTON_UP | BUTTON_DOWN #endif -#if defined(BUTTON_SCROLL_UP) && defined(BUTTON_SCROLL_DOWN) - | BUTTON_SCROLL_UP | BUTTON_SCROLL_DOWN +#if defined(BUTTON_SCROLL_COUNTER) && defined(BUTTON_SCROLL_CLOCK) + | BUTTON_SCROLL_COUNTER | BUTTON_SCROLL_CLOCK #endif #if CONFIG_KEYPAD == RECORDER_PAD | BUTTON_F1 | BUTTON_F3 @@ -430,11 +430,11 @@ if (button & BUTTON_DOWN) newbutton |= BUTTON_UP; #endif -#if defined(BUTTON_SCROLL_UP) && defined(BUTTON_SCROLL_DOWN) - if (button & BUTTON_SCROLL_UP) - newbutton |= BUTTON_SCROLL_DOWN; - if (button & BUTTON_SCROLL_DOWN) - newbutton |= BUTTON_SCROLL_UP; +#if defined(BUTTON_SCROLL_COUNTER) && defined(BUTTON_SCROLL_CLOCK) + if (button & BUTTON_SCROLL_COUNTER) + newbutton |= BUTTON_SCROLL_CLOCK; + if (button & BUTTON_SCROLL_CLOCK) + newbutton |= BUTTON_SCROLL_COUNTER; #endif #if CONFIG_KEYPAD == RECORDER_PAD if (button & BUTTON_F1) Index: uisimulator/sdl/button.c =================================================================== --- uisimulator/sdl/button.c (Revision 15951) +++ uisimulator/sdl/button.c (Arbeitskopie) @@ -235,11 +235,11 @@ break; case SDLK_KP8: case SDLK_UP: - new_btn = BUTTON_SCROLL_BACK; + new_btn = BUTTON_SCROLL_COUNTER; break; case SDLK_KP2: case SDLK_DOWN: - new_btn = BUTTON_SCROLL_FWD; + new_btn = BUTTON_SCROLL_CLOCK; break; case SDLK_KP_PLUS: case SDLK_F8: @@ -537,11 +537,11 @@ break; case SDLK_KP8: case SDLK_UP: - new_btn = BUTTON_SCROLL_UP; + new_btn = BUTTON_SCROLL_COUNTER; break; case SDLK_KP2: case SDLK_DOWN: - new_btn = BUTTON_SCROLL_DOWN; + new_btn = BUTTON_SCROLL_CLOCK; break; case SDLK_KP9: new_btn = BUTTON_UP;