Move 'Playback Settings' up from 'General Settings' to 'Settings' (FS#9472 by William Poetra Yoga Hadisoeseno but without the menu rearrangement) also closes FS#9154. Update manual to reflect the menu change, Playback Settings is now its own chapter. As a bonus that makes it a bit easier to find stuff in the toc.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18799 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2008-10-13 15:11:11 +00:00
parent 4b7ebdc6f2
commit 5aa0665b5b
4 changed files with 98 additions and 88 deletions

View file

@ -549,6 +549,7 @@ static int mainmenu_callback(int action,const struct menu_item_ex *this_item)
MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), mainmenu_callback,
Icon_Submenu_Entered,
&sound_settings,
&playback_settings,
&settings_menu_item, &theme_menu,
#ifdef HAVE_RECORDING
&recording_settings,

View file

@ -499,7 +499,7 @@ MENUITEM_FUNCTION(browse_langs, 0, ID2P(LANG_LANGUAGE), language_browse,
MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0,
Icon_General_settings_menu,
&playback_settings, &playlist_settings, &file_menu,
&playlist_settings, &file_menu,
#ifdef HAVE_TAGCACHE
&tagcache_menu,
#endif

View file

@ -2,10 +2,13 @@
\label{ref:configure_rockbox_sound}
\input{configure_rockbox/sound_settings.tex}
\chapter{Playback Settings}
\label{ref:configure_rockbox_playback}
\input{configure_rockbox/playback_options.tex}
\chapter{General Settings}
\label{ref:configure_rockbox_general}
\input{configure_rockbox/general_settings.tex}
\input{configure_rockbox/playback_options.tex}
\input{configure_rockbox/playlist_options.tex}
\input{configure_rockbox/file_view.tex}
\input{configure_rockbox/database.tex}

View file

@ -1,16 +1,16 @@
% $Id$ %
\section{\label{ref:PlaybackOptions}Playback}
The \setting{Playback} sub menu allows you to configure settings
The \setting{Playback Settings} menu allows you to configure settings
related to audio playback.
\begin{description}
\item[Shuffle]Turning shuffle on will cause Rockbox to randomly re-order the
\section{Shuffle}
Turning shuffle on will cause Rockbox to randomly re-order the
playlist. Thus, to shuffle all of the audio files on the player, you first
need to create a playlist containing all of them. For more information on
creating playlists refer to \reference{ref:working_with_playlists}.\\
Options: \setting{Yes}/\setting{No}.
%
\item[Repeat]Configures settings related to repeating of directories or
playlists.\\
\section{Repeat}
Configures settings related to repeating of directories or playlists.\\
Options: \setting{Off} / \setting{All} / \setting{One} / \setting{Shuffle} /
\setting{A-B}:
\begin{description}
@ -49,16 +49,19 @@ related to audio playback.
}%
\end{description}
\item[Play Selected First]This setting controls what happens when you
\section{Play Selected First}
This setting controls what happens when you
select a file for playback while shuffle mode is on. If the
\setting{Play Selected First} setting is \setting{Yes}, the file you
selected will be played first. If this setting is \setting{No}, a random
file in the directory will be played first.
\item[Fast-Forward/Rewind]These settings control the speed and acceleration during fast forward and rewind.
\section{Fast-Forward/Rewind}
These settings control the speed and acceleration during fast forward and rewind.
The setting \setting{FF/RW Min Step} controls the initial speed and \setting{FF/RW Accel} controls the acceleration.
\item[Anti-Skip Buffer]This setting allows you to control how much music is
\section{Anti-Skip Buffer}
This setting allows you to control how much music is
stored in the \daps{} memory whilst playing a song, acting as a buffer
against shock or playback problems. The \dap{} transfers the selected
amount of the forthcoming song into its memory at high speed whilst you are
@ -89,18 +92,20 @@ related to audio playback.
reduce your battery life. It is recommended to always use the lowest
possible setting that allows correct and continuous playback.}
\item[Fade on Stop/Pause]Enables and disables a fade effect when you
\section{Fade on Stop/Pause}
Enables and disables a fade effect when you
pause or stop playing a song. If the Fade on Stop/Pause option is
set to \setting{Yes}, your music will fade out when you stop or pause
playback, and fade in when you resume playback.
\item[Party Mode]Enables unstoppable music playback. When new songs are
\section{Party Mode}
Enables unstoppable music playback. When new songs are
selected, they are queued at the end of the current dynamic playlist
instead of being played immediately. Pausing and stopping playback is
disabled as well as skipping songs and launching plugins.
\opt{swcodec}{
\item[Crossfade]
\section{Crossfade}
This setting enables a cross-fader. At the end of a song, the song will
fade out as the next song fades in, creating a smooth transition between
songs. The crossfade setting is particularly effective when the player is
@ -145,10 +150,9 @@ related to audio playback.
The graphic below illustrates how the different settings work in practice.
\includegraphics[width=14cm]{configure_rockbox/images/crossfade_graphic.png}
}%
\opt{swcodec}{
\item[Replaygain]This allows you to control the replaygain function.
\section{Replaygain}
This allows you to control the replaygain function.
The purpose of replaygain is to adjust the volume of the music played
so that all songs (or albums, depending on your settings) have the
same apparent volume. This prevents sudden changes in volume when
@ -188,20 +192,22 @@ related to audio playback.
prevent clipping is enabled. The pre-amp can be set to any
decibel (dB) value between -12dB and +12dB, in increments of 0.1{}dB.
\end{description}
}
\opt{swcodec}{
\item[Beep Volume]Controls the volume of the beep that is heard when
\section{Beep Volume}
Controls the volume of the beep that is heard when
skipping forward or backward between tracks. The beep is disabled when
set to \setting{Off}.
}
}%\opt{swcodec}
\opt{spdif_power}{
\item[Optical Output. ]Enables or disables the optical S/PDIF output to
\section{Optical Output}
Enables or disables the optical S/PDIF output to
allow a digital connection to a suitable external decoder. To enable
optical output, set to \setting{Yes}
}
\item[Auto-Change Directory]Control what Rockbox does when it reaches the end
\section{Auto-Change Directory}
Control what Rockbox does when it reaches the end
of a directory. If \setting{Auto-Change Directory} is set to \setting{Yes},
Rockbox will continue to the next directory. If
\setting{Auto-Change Directory} is set to \setting{No}, playback will stop at
@ -215,7 +221,8 @@ related to audio playback.
%
\opt{headphone_detection}{
\item[Pause on Headphone Unplug] Enables and disables automatic pausing of
\section{Pause on Headphone Unplug}
Enables and disables automatic pausing of
playback when the headphones are disconnected from the \daps{} headphone
socket.
%
@ -240,7 +247,7 @@ related to audio playback.
}%
\item[Last.fm Log]\index{Last.fm Log}\index{Audioscrobbler|see{Last.fm Log}}
\section{Last.fm Log}\index{Last.fm Log}\index{Audioscrobbler|see{Last.fm Log}}
Enables logging of your played tracks for submittal to
\url{http://www.last.fm}. This service was formely known as
\emph{Audioscrobbler}. When you enable this option, you'll have to reboot to
@ -251,7 +258,7 @@ related to audio playback.
\note{See \wikilink{LastFMLog} for a further description, and for tools you
can use to submit your Last.fm log.}
\item[Cuesheet Support]\index{Cuesheet Support}
\section{Cuesheet Support}\index{Cuesheet Support}
Enables reading of cuesheet files for played tracks. If a cuesheet is found
for a track, track markers are displayed on the progressbar and it is
possible to skip between the tracks within the cuesheet. Also the information
@ -259,7 +266,7 @@ related to audio playback.
When you enable this option, you'll have to reboot for it to come into
effect.
\item[Skip Length]\index{Skip Length}
\section{Skip Length}\index{Skip Length}
Designed to speed up navigation and prevent unintentional track skipping when
listening to long audio tracks, \setting{Skip Length} changes the behavior of
the \ActionWpsSkipPrev{} and \ActionWpsSkipNext{} buttons so that they skip
@ -269,4 +276,3 @@ related to audio playback.
\ActionWpsSkipPrev{} + Long \ActionWpsSkipNext{} to go forward and Short
\ActionWpsSkipNext{} + Long \ActionWpsSkipPrev{} to go back.}
\end{description}