From 105eef98fa7c4f4863d8093a27e61062bc348d1c Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 7 Jul 2008 07:04:07 +0000 Subject: [PATCH] AB repeat: define single button mode for the Player so that it becomes usable, and enable AB repeat for the Ondios, also in single button mode. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17975 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-ondiofm.h | 3 ++ firmware/export/config-ondiosp.h | 3 ++ firmware/export/config-player.h | 5 +- manual/configure_rockbox/playback_options.tex | 47 ++++++++----------- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index 18c0ad7deb..d750b2d756 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h @@ -27,6 +27,9 @@ /* define this if you have an Ondio style 6-key keyboard */ #define CONFIG_KEYPAD ONDIO_PAD +#define AB_REPEAT_ENABLE 1 +#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE + /* define this if you have access to the pitchscreen */ #define HAVE_PITCHSCREEN diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index 41ee1e068e..43dbaaf06b 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h @@ -20,6 +20,9 @@ /* define this if you have an Ondio style 6-key keyboard */ #define CONFIG_KEYPAD ONDIO_PAD +#define AB_REPEAT_ENABLE 1 +#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE + /* define this if you have access to the pitchscreen */ #define HAVE_PITCHSCREEN diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 94d5edf451..2fefcbdcac 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h @@ -16,11 +16,12 @@ /* define this if you have the Player's keyboard */ #define CONFIG_KEYPAD PLAYER_PAD +#define AB_REPEAT_ENABLE 1 +#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE + /* The number of bytes reserved for loadable plugins */ #define PLUGIN_BUFFER_SIZE 0x8000 -#define AB_REPEAT_ENABLE 1 - /* Define this if you have a MAS3507D */ #define CONFIG_CODEC MAS3507D diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex index d800f7df23..7faf237f83 100644 --- a/manual/configure_rockbox/playback_options.tex +++ b/manual/configure_rockbox/playback_options.tex @@ -11,8 +11,8 @@ related to audio playback. % \item[Repeat]Configures settings related to repeating of directories or playlists.\\ - Options: \setting{Off} / \setting{All} / \setting{One} / \setting{Shuffle} - \nopt{ondiosp,ondiofm}{\setting{/A-B}}: + Options: \setting{Off} / \setting{All} / \setting{One} / \setting{Shuffle} / + \setting{A-B}: \begin{description} % \item[Off]The current playlist will not repeat when it is finished. @@ -30,32 +30,23 @@ related to audio playback. \item[Shuffle]When the current playlist has finished playing, it will be shuffled and then repeated. % - \nopt{ondiosp,ondiofm}{ - \item[A-B]Repeats between two user defined points within a track, - typically used by musicians when attempting to learn a piece of music. - This option is more complicated to use than the others as the \dap\ - must first be placed into A-B repeat mode and then the start and end - points defined.\\ - - \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD% - ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{% - To set the Start Point (A) press \ActionWpsAbSetAPrevDir{}. - Setting the End Point (B) is done accordingly using - \ActionWpsAbSetBNextDir{}. To reset the markers press \ActionWpsAbReset{}. - }% - \opt{ipod,IAUDIO_X5_PAD}{% - To set the Start Point (A) press \ActionWpsBrowse{}. The following - press of \ActionWpsBrowse{} will set the End Point (B), and a third - successive \ActionWpsBrowse{} will reset the markers. - }% - \opt{PLAYER_PAD}{% - \fixme{ - Fix Me: Fill in keypresses - --- Sets Start Point (A)\\ - --- Sets End Point (B)\\ - } - }% - } + \item[A-B]Repeats between two user defined points within a track, + typically used by musicians when attempting to learn a piece of music. + This option is more complicated to use than the others as the \dap\ + must first be placed into A-B repeat mode and then the start and end + points defined.\\ + + \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD% + ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{% + To set the Start Point (A) press \ActionWpsAbSetAPrevDir{}. + Setting the End Point (B) is done accordingly using + \ActionWpsAbSetBNextDir{}. To reset the markers press \ActionWpsAbReset{}. + }% + \opt{ipod,IAUDIO_X5_PAD,ONDIO_PAD,PLAYER_PAD}{% + To set the Start Point (A) press \ActionWpsBrowse{}. The following + press of \ActionWpsBrowse{} will set the End Point (B), and a third + successive \ActionWpsBrowse{} will reset the markers. + }% \end{description} \item[Play Selected First]This setting controls what happens when you