diff options
Diffstat (limited to 'manual')
-rw-r--r-- | manual/configure_rockbox/playlist_options.tex | 6 | ||||
-rw-r--r-- | manual/main_menu/main.tex | 2 | ||||
-rw-r--r-- | manual/plugins/pictureflow.tex | 2 | ||||
-rw-r--r-- | manual/rockbox_interface/browsing_and_playing.tex | 10 | ||||
-rw-r--r-- | manual/rockbox_interface/wps.tex | 10 | ||||
-rw-r--r-- | manual/working_with_playlists/main.tex | 38 |
6 files changed, 34 insertions, 34 deletions
diff --git a/manual/configure_rockbox/playlist_options.tex b/manual/configure_rockbox/playlist_options.tex index b29842ceed..d881ba5b40 100644 --- a/manual/configure_rockbox/playlist_options.tex +++ b/manual/configure_rockbox/playlist_options.tex | |||
@@ -33,17 +33,17 @@ related to playlists. | |||
33 | 33 | ||
34 | \item[Keep Current Track When Replacing Playlist.] | 34 | \item[Keep Current Track When Replacing Playlist.] |
35 | If set to \setting{Yes}, then \setting{Play} and \setting{Play Shuffled} in | 35 | If set to \setting{Yes}, then \setting{Play} and \setting{Play Shuffled} in |
36 | the \setting{Current Playlist submenu} will allow the current track to finish | 36 | the \setting{Playing Next Submenu} will allow the current track to finish |
37 | playing before the new tracks play. If set to \setting{No}, the current | 37 | playing before the new tracks play. If set to \setting{No}, the current |
38 | track will be interrupted and new tracks will start playing immediately. | 38 | track will be interrupted and new tracks will start playing immediately. |
39 | 39 | ||
40 | \item[Show Shuffled Adding Options.] | 40 | \item[Show Shuffled Adding Options.] |
41 | If set to \setting{No}, Rockbox will not offer to add shuffled tracks | 41 | If set to \setting{No}, Rockbox will not offer to add shuffled tracks |
42 | in the \setting{Current Playlist submenu}. | 42 | in the \setting{Playing Next Submenu}. |
43 | 43 | ||
44 | \item[Show Queue Options.] | 44 | \item[Show Queue Options.] |
45 | If set to \setting{No}, Rockbox will not display the options to queue items in | 45 | If set to \setting{No}, Rockbox will not display the options to queue items in |
46 | the \setting{Current Playlist submenu}. | 46 | the \setting{Playing Next Submenu}. |
47 | If set to \setting{In Submenu}, Rockbox will move the options into a | 47 | If set to \setting{In Submenu}, Rockbox will move the options into a |
48 | separate submenu. | 48 | separate submenu. |
49 | 49 | ||
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex index 4aded9810b..34868ca759 100644 --- a/manual/main_menu/main.tex +++ b/manual/main_menu/main.tex | |||
@@ -160,7 +160,7 @@ The details of this menu are covered in | |||
160 | three ways. Playing a file in a directory causes all the files in it | 160 | three ways. Playing a file in a directory causes all the files in it |
161 | to be placed in a playlist. Playlists can be created manually by | 161 | to be placed in a playlist. Playlists can be created manually by |
162 | either using the \setting{Context Menu} (see \reference{ref:Contextmenu}) or using | 162 | either using the \setting{Context Menu} (see \reference{ref:Contextmenu}) or using |
163 | the \setting{Playlist} menu. Both automatically and manually created | 163 | the \setting{Current Playlist} menu. Both automatically and manually created |
164 | playlists can be edited using this menu. | 164 | playlists can be edited using this menu. |
165 | 165 | ||
166 | \subsection{\label{ref:playlistcatalogue_contextmenu}The Playlist Catalogue Context Menu} | 166 | \subsection{\label{ref:playlistcatalogue_contextmenu}The Playlist Catalogue Context Menu} |
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex index 0d249299d5..5b4e80e107 100644 --- a/manual/plugins/pictureflow.tex +++ b/manual/plugins/pictureflow.tex | |||
@@ -3,7 +3,7 @@ | |||
3 | PictureFlow is a visual browser for your albums. After you've selected something to play, | 3 | PictureFlow is a visual browser for your albums. After you've selected something to play, |
4 | PictureFlow will continue running by default, or can optionally show the WPS. Using the | 4 | PictureFlow will continue running by default, or can optionally show the WPS. Using the |
5 | context menu, albums or songs can be added to the dynamic playlist directly from | 5 | context menu, albums or songs can be added to the dynamic playlist directly from |
6 | PictureFlow (see \reference{ref:currentplaylist_submenu}). | 6 | PictureFlow (see \reference{ref:playingnext_submenu}). |
7 | 7 | ||
8 | 8 | ||
9 | \subsubsection{Sort Options} | 9 | \subsubsection{Sort Options} |
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex index d97d227fe9..8460c12ec9 100644 --- a/manual/rockbox_interface/browsing_and_playing.tex +++ b/manual/rockbox_interface/browsing_and_playing.tex | |||
@@ -123,11 +123,11 @@ each option pertains both to files and directories): | |||
123 | \begin{description} | 123 | \begin{description} |
124 | \item [View.] | 124 | \item [View.] |
125 | Displays the contents of the selected playlist file. | 125 | Displays the contents of the selected playlist file. |
126 | \item [Current Playlist.] | 126 | \item [Playing Next...] |
127 | Enters the \setting{Current Playlist Submenu} (see \reference{ref:currentplaylist_submenu}). | 127 | Enters the \setting{Playing Next Submenu} (see \reference{ref:playingnext_submenu}). |
128 | \item [Playlist Catalogue.] | 128 | \item [Add to Playlist...] |
129 | Enters the \setting{Playlist Catalogue Submenu} (see | 129 | Enters the \setting{Add to Playlist Submenu} (see |
130 | \reference{ref:playlist_catalogue}). | 130 | \reference{ref:addtoplaylist_submenu}). |
131 | \item [Rename.] | 131 | \item [Rename.] |
132 | This function lets the user modify the name of a file or directory. | 132 | This function lets the user modify the name of a file or directory. |
133 | \item [Cut.] | 133 | \item [Cut.] |
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex index 7623f89146..45b3860b0e 100644 --- a/manual/rockbox_interface/wps.tex +++ b/manual/rockbox_interface/wps.tex | |||
@@ -179,8 +179,8 @@ several indicators. | |||
179 | Like the context menu for the \setting{File Browser}, the \setting{WPS Context Menu} | 179 | Like the context menu for the \setting{File Browser}, the \setting{WPS Context Menu} |
180 | allows you quick access to some often used functions. | 180 | allows you quick access to some often used functions. |
181 | 181 | ||
182 | \subsubsection{Playlist} | 182 | \subsubsection{Current Playlist} |
183 | The \setting{Playlist} submenu allows you to view, save, search, reshuffle, | 183 | The \setting{Current Playlist} submenu allows you to view, save, search, reshuffle, |
184 | and display the play time of the current playlist. These and other operations | 184 | and display the play time of the current playlist. These and other operations |
185 | are detailed in \reference{ref:working_with_playlists}. To change settings for | 185 | are detailed in \reference{ref:working_with_playlists}. To change settings for |
186 | the \setting{Playlist Viewer} press \ActionStdContext{} while viewing the | 186 | the \setting{Playlist Viewer} press \ActionStdContext{} while viewing the |
@@ -198,12 +198,12 @@ menu, you can find the \setting{Playlist Viewer Settings}. | |||
198 | \end{description} | 198 | \end{description} |
199 | 199 | ||
200 | 200 | ||
201 | \subsubsection{Playlist catalogue} | 201 | \subsubsection{Add to Playlist...} |
202 | \begin{description} | 202 | \begin{description} |
203 | \item [Add to playlist.] Adds the currently playing file to a playlist. | 203 | \item [Add to Existing Playlist.] Adds the currently playing file to a playlist. |
204 | Select the playlist you want the file to be added to and it will get | 204 | Select the playlist you want the file to be added to and it will get |
205 | appended to that playlist. | 205 | appended to that playlist. |
206 | \item [Add to new playlist.] Similar to the previous entry this will | 206 | \item [Add to New Playlist.] Similar to the previous entry this will |
207 | add the currently playing track to a playlist. You need to enter a name | 207 | add the currently playing track to a playlist. You need to enter a name |
208 | for the new playlist first. | 208 | for the new playlist first. |
209 | \end{description} | 209 | \end{description} |
diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex index 8571aac61c..c0e5615dea 100644 --- a/manual/working_with_playlists/main.tex +++ b/manual/working_with_playlists/main.tex | |||
@@ -17,7 +17,7 @@ playlists: | |||
17 | 17 | ||
18 | \item[Dynamic playlist.] A dynamic playlist is a playlist that is created | 18 | \item[Dynamic playlist.] A dynamic playlist is a playlist that is created |
19 | ``On the fly.'' Any time you insert or queue tracks using the | 19 | ``On the fly.'' Any time you insert or queue tracks using the |
20 | \setting{Current Playlist submenu} (see \reference{ref:currentplaylist_submenu}), you are | 20 | \setting{Playing Next Submenu} (see \reference{ref:playingnext_submenu}), you are |
21 | creating (or adding to) a dynamic playlist. | 21 | creating (or adding to) a dynamic playlist. |
22 | 22 | ||
23 | \item[Insert.] In Rockbox, to \setting{Insert} an item into a playlist means | 23 | \item[Insert.] In Rockbox, to \setting{Insert} an item into a playlist means |
@@ -49,17 +49,17 @@ song. | |||
49 | playlist, see the section below on how to add music to a playlist.} | 49 | playlist, see the section below on how to add music to a playlist.} |
50 | 50 | ||
51 | \subsubsection{By using the Play or Play Shuffled functions} | 51 | \subsubsection{By using the Play or Play Shuffled functions} |
52 | The \setting{Play} function as described in \ref{ref:currentplaylist_submenu} | 52 | The \setting{Play} function as described in \ref{ref:playingnext_submenu} |
53 | will replace the dynamic playlist with the selected tracks. The \setting{Play | 53 | will replace the dynamic playlist with the selected tracks. The \setting{Play |
54 | Shuffled} function is similar, except the selected tracks will be added to the | 54 | Shuffled} function is similar, except the selected tracks will be added to the |
55 | playlist in a random order. | 55 | playlist in a random order. |
56 | 56 | ||
57 | \subsubsection{\label{ref:playlist_catalogue}By using the Playlist catalogue} | 57 | \subsubsection{\label{ref:addtoplaylist_submenu}By using the Add to Playlist submenu} |
58 | The \setting{Playlist catalogue} makes it possible to modify and create | 58 | The \setting{Add to Playlist submenu} makes it possible to modify and create |
59 | playlists that are not currently playing. To do this select \setting{Playlist | 59 | playlists that are not currently playing. To do this select \setting{Add to Playlist...} |
60 | catalogue} in the \setting{Context Menu}. There you will have two choices, | 60 | in the \setting{Context Menu}. There you will have two choices, |
61 | \setting{Add to playlist} adds the selected track or directory to an existing | 61 | \setting{Add to Existing Playlist} adds the selected track or directory to an existing |
62 | playlist and \setting{Add to a new playlist} creates a new playlist containing | 62 | playlist and \setting{Add to New Playlist} creates a new playlist containing |
63 | the selected track or directory. | 63 | the selected track or directory. |
64 | 64 | ||
65 | \note{All playlists in the \setting{Playlist catalogue} are stored by default | 65 | \note{All playlists in the \setting{Playlist catalogue} are stored by default |
@@ -75,9 +75,9 @@ To create a playlist containing some or all of the music on your \dap{}, you can | |||
75 | 75 | ||
76 | \subsection{Adding music to playlists} | 76 | \subsection{Adding music to playlists} |
77 | 77 | ||
78 | \subsubsection{\label{ref:currentplaylist_submenu}Adding music to a dynamic playlist} | 78 | \subsubsection{\label{ref:playingnext_submenu}Adding music to a dynamic playlist} |
79 | \screenshot{rockbox_interface/images/ss-playlist-menu}{The Current Playlist Submenu}{} | 79 | \screenshot{rockbox_interface/images/ss-playlist-menu}{The Playing Next Submenu}{} |
80 | The \setting{Current Playlist Submenu} is a submenu in the \setting{Context Menu} (see | 80 | The \setting{Playing Next Submenu} is a submenu in the \setting{Context Menu} (see |
81 | \reference{ref:Contextmenu}), it allows you to put tracks into a | 81 | \reference{ref:Contextmenu}), it allows you to put tracks into a |
82 | ``dynamic playlist''. The place in which the newly | 82 | ``dynamic playlist''. The place in which the newly |
83 | selected tracks are added to the playlist is determined by these | 83 | selected tracks are added to the playlist is determined by these |
@@ -133,10 +133,10 @@ The latter can also be put into its own submenu. Simply go to | |||
133 | $\rightarrow$ \setting{Current Playlist} and select either \setting{Show Shuffled Adding Options} | 133 | $\rightarrow$ \setting{Current Playlist} and select either \setting{Show Shuffled Adding Options} |
134 | or \setting{Show Queue Options} to customize the displayed set of options.} | 134 | or \setting{Show Queue Options} to customize the displayed set of options.} |
135 | 135 | ||
136 | The \setting{Current Playlist Submenu} can be used to add either single tracks or | 136 | The \setting{Playing Next Submenu} can be used to add either single tracks or |
137 | entire directories to a playlist. If the \setting{Current Playlist Submenu} is | 137 | entire directories to a playlist. If the \setting{Playing Next Submenu} is |
138 | invoked on a single track, it will put only that track into the playlist. | 138 | invoked on a single track, it will put only that track into the playlist. |
139 | On the other hand, if the \setting{Current Playlist Submenu} is invoked on a | 139 | On the other hand, if the \setting{Playing Next Submenu} is invoked on a |
140 | directory, Rockbox adds all of the tracks in that directory to the | 140 | directory, Rockbox adds all of the tracks in that directory to the |
141 | playlist. | 141 | playlist. |
142 | 142 | ||
@@ -157,13 +157,13 @@ were before shutdown. | |||
157 | 157 | ||
158 | \subsection{Modifying playlists} | 158 | \subsection{Modifying playlists} |
159 | \subsubsection{Reshuffling} | 159 | \subsubsection{Reshuffling} |
160 | Reshuffling the current playlist is easily done from the \setting{Playlist} | 160 | Reshuffling the current playlist is easily done from the \setting{Current Playlist} |
161 | sub menu in the WPS, just select \setting{Reshuffle}. | 161 | sub menu in the WPS, just select \setting{Reshuffle}. |
162 | 162 | ||
163 | \subsubsection{Moving and removing tracks} | 163 | \subsubsection{Moving and removing tracks} |
164 | To move or remove a track from the current playlist enter the | 164 | To move or remove a track from the current playlist enter the |
165 | \setting{Playlist Viewer} by selecting \setting{View Current Playlist} in the | 165 | \setting{Playlist Viewer} by selecting \setting{View Current Playlist} in the |
166 | \setting{Playlist} submenu in the WPS context menu or the \setting{Main Menu}. | 166 | \setting{Current Playlist} submenu in the WPS context menu or the \setting{Main Menu}. |
167 | Once in the \setting{Playlist Viewer} open the context menu on the track you | 167 | Once in the \setting{Playlist Viewer} open the context menu on the track you |
168 | want to move or remove. If you want to move the track, select \setting{Move} in | 168 | want to move or remove. If you want to move the track, select \setting{Move} in |
169 | the context menu and then move the blinking cursor to the place where you want | 169 | the context menu and then move the blinking cursor to the place where you want |
@@ -171,10 +171,10 @@ the track to be moved and confirm with \ActionStdOk. To remove a track, simply | |||
171 | select \setting{Remove} in the context menu. | 171 | select \setting{Remove} in the context menu. |
172 | 172 | ||
173 | \subsection{Saving playlists} | 173 | \subsection{Saving playlists} |
174 | To save the current playlist either enter the \setting{Playlist} submenu | 174 | To save the current playlist either enter the \setting{Current Playlist} submenu |
175 | in the \setting{WPS Context Menu} (see \reference{sec:contextmenu}) and | 175 | in the \setting{WPS Context Menu} (see \reference{sec:contextmenu}) and |
176 | select \setting{Save Current Playlist} or enter the | 176 | select \setting{Save Current Playlist} or enter the context menu for the |
177 | \setting{Playlist Options} menu in the \setting{Main Menu} and select | 177 | \setting{Playlist catalogue} in the \setting{Main Menu} and select |
178 | \setting{Save Current Playlist}. | 178 | \setting{Save Current Playlist}. |
179 | Either method will bring you to the \setting{Virtual Keyboard} (see | 179 | Either method will bring you to the \setting{Virtual Keyboard} (see |
180 | \reference{sec:virtual_keyboard}), enter a filename for your playlist and | 180 | \reference{sec:virtual_keyboard}), enter a filename for your playlist and |