apps: Change playlist context menu behavior, fix FS#13336

Rename the "Clear List & Play" options to simply Play and Play
Shuffled, and change their behavior slightly. Previously they
would leave the current song playing, but now they will start
playing the first song of the new playlist immediately.

Shuffle options are now consistently hidden whenever a single
file is selected.

Fixes FS#13336 -- Play Shuffled is now always displayed where
applicable, regardless of playback state.

Change-Id: Idd454b4f9ab2c98cda3ce0389add747a3273fb42

1 files changed, 16 insertions, 19 deletions

diff --git a/manual/working_with_playlists/main.tex b/manual/working_with_playlists/main.tex
index d478dcd283..0d1ab7ef04 100644
--- a/manual/working_with_playlists/main.tex
+++ b/manual/working_with_playlists/main.tex
@@ -48,11 +48,11 @@ song.
   rather than erasing the current
   playlist, see the section below on how to add music to a playlist.}
 
-\subsubsection{By using the Clear List \& Play Next function}
-The \setting{Clear List \& Play Next} function as described in
-\ref{ref:currentplaylist_submenu} will replace the dynamic playlist with the selected
-tracks. If a track is currently playing, it is only removed once it’s finished
-playing.
+\subsubsection{By using the Play or Play Shuffled functions}
+The \setting{Play} function as described in \ref{ref:currentplaylist_submenu}
+will replace the dynamic playlist with the selected tracks. The \setting{Play
+Shuffled} function is similar, except the selected tracks will be added to the
+playlist in a random order.
 
 \subsubsection{\label{ref:playlist_catalogue}By using the Playlist catalogue}
 The \setting{Playlist catalogue} makes it possible to modify and create
@@ -96,20 +96,6 @@ have not been added yet, immediately after the currently playing track.
 \item [Insert Last Shuffled.] Add tracks in a random order to the end of the playlist.
 \end{description}
 
-If you want the existing playlist entries to first be removed before
-selected tracks are inserted, the following two options will achieve that effect.
-They are also available when playback is stopped, whereas the rest of the options
-require music to be playing or paused.
-
-\begin{description}
-\item [Clear List \& Play Next.] Replace all entries in the dynamic playlist with
-selected tracks. If a track is currently playing, it will be removed once it’s
-finished playing.
-
-\item [Clear List \& Play Shuffled.] Similar, except tracks are added in random order.
-Only available when playback is stopped.
-\end{description}
-
 Another possibility is to add tracks \emph{temporarily} to the dynamic playlist.
 In Rockbox’s parlance, this is called queuing. Queued tracks are automatically
 removed from the playlist after they have been played. They are also not saved
@@ -127,6 +113,17 @@ to the playlist file (see \reference{ref:playlistoptions}).
 \item [Queue Last Shuffled.] Corresponds to \setting{Insert Last Shuffled}.
 \end{description}
 
+If you'd like to replace the current playlist with the new selection, the
+following two options will achieve that effect.
+
+\begin{description}
+\item [Play.] Replace all entries in the dynamic playlist with the selected
+  tracks and start playing the new playlist immediately.
+
+\item [Play Shuffled.] Similar, except the tracks will be added to the new
+  playlist in random order.
+\end{description}
+
 \note{You can hide the options to add shuffled tracks or to queue tracks, if you wish.
 The latter can also be put into its own submenu.  Simply go to
 \setting{Settings} $\rightarrow$ \setting{General Settings} $\rightarrow$ \setting{Playlists}