Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
Rename “Current Playlist” and “Playlist Catalogue” context menus
Use action-oriented and more descriptive titles
"Add to Playlist..." instead of "Playlist Catalogue"
- "Add to Existing Playlist" instead of "Add to Playlist"
- "Add to New Playlist" (unchanged)
- "Playing Next..." instead of "Current Playlist"
In WPS context menu:
- "Current Playlist" instead of "Playlist"
Change-Id: I5cce9e317676537988682f46ac6b920598af3b9e
+86
-43
+47
-4
apps/lang/english.lang
+47
-4
apps/lang/english.lang
···
6452
6452
</phrase>
6453
6453
<phrase>
6454
6454
id: LANG_CATALOG_ADD_TO
6455
-
desc: in onplay playlist catalogue submenu
6455
+
desc: deprecated
6456
6456
user: core
6457
6457
<source>
6458
-
*: "Add to Playlist"
6458
+
*: ""
6459
6459
</source>
6460
6460
<dest>
6461
-
*: "Add to Playlist"
6461
+
*: ""
6462
6462
</dest>
6463
6463
<voice>
6464
-
*: "Add to Playlist"
6464
+
*: ""
6465
6465
</voice>
6466
6466
</phrase>
6467
6467
<phrase>
···
16461
16461
recording: "Recording Directory"
16462
16462
</voice>
16463
16463
</phrase>
16464
+
<phrase>
16465
+
id: LANG_ADD_TO_PL
16466
+
desc: used in the onplay menu
16467
+
user: core
16468
+
<source>
16469
+
*: "Add to Playlist..."
16470
+
</source>
16471
+
<dest>
16472
+
*: "Add to Playlist..."
16473
+
</dest>
16474
+
<voice>
16475
+
*: "Add to Playlist..."
16476
+
</voice>
16477
+
</phrase>
16478
+
<phrase>
16479
+
id: LANG_ADD_TO_EXISTING_PL
16480
+
desc: used in the onplay menu
16481
+
user: core
16482
+
<source>
16483
+
*: "Add to Existing Playlist"
16484
+
</source>
16485
+
<dest>
16486
+
*: "Add to Existing Playlist"
16487
+
</dest>
16488
+
<voice>
16489
+
*: "Add to Existing Playlist"
16490
+
</voice>
16491
+
</phrase>
16492
+
<phrase>
16493
+
id: LANG_PLAYING_NEXT
16494
+
desc: used in the onplay menu
16495
+
user: core
16496
+
<source>
16497
+
*: "Playing Next..."
16498
+
</source>
16499
+
<dest>
16500
+
*: "Playing Next..."
16501
+
</dest>
16502
+
<voice>
16503
+
*: "Playing Next..."
16504
+
</voice>
16505
+
</phrase>
16506
+
+4
-4
apps/onplay.c
+4
-4
apps/onplay.c
···
491
491
shuffle_playlist, NULL, Icon_Playlist);
492
492
MENUITEM_FUNCTION(playing_time_item, 0, ID2P(LANG_PLAYING_TIME),
493
493
playing_time, NULL, Icon_Playlist);
494
-
MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST),
494
+
MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_CURRENT_PLAYLIST),
495
495
NULL, Icon_Playlist,
496
496
&wps_view_cur_playlist_item, &search_playlist_item,
497
497
&playlist_save_item, &reshuffle_item, &playing_time_item
···
676
676
add_to_playlist, &addtopl_replace_shuffled,
677
677
treeplaylist_callback, Icon_Playlist);
678
678
679
-
MAKE_ONPLAYMENU(tree_playlist_menu, ID2P(LANG_CURRENT_PLAYLIST),
679
+
MAKE_ONPLAYMENU(tree_playlist_menu, ID2P(LANG_PLAYING_NEXT),
680
680
treeplaylist_callback, Icon_Playlist,
681
681
682
682
/* insert */
···
801
801
const struct menu_item_ex *this_item,
802
802
struct gui_synclist *this_list);
803
803
804
-
MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_CATALOG_ADD_TO),
804
+
MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_ADD_TO_EXISTING_PL),
805
805
cat_add_to_a_playlist, NULL, Icon_Playlist);
806
806
MENUITEM_FUNCTION(cat_add_to_new, 0, ID2P(LANG_CATALOG_ADD_TO_NEW),
807
807
cat_add_to_a_new_playlist, NULL, Icon_Playlist);
808
-
MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_CATALOG),
808
+
MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_ADD_TO_PL),
809
809
cat_playlist_callback, Icon_Playlist,
810
810
&cat_add_to_list, &cat_add_to_new);
811
811
+1
-1
apps/playlist_viewer.c
+1
-1
apps/playlist_viewer.c
···
598
598
struct playlist_entry * current_track =
599
599
playlist_buffer_get_track(&viewer.buffer, index);
600
600
MENUITEM_STRINGLIST(menu_items, ID2P(LANG_PLAYLIST), NULL,
601
-
ID2P(LANG_CURRENT_PLAYLIST), ID2P(LANG_CATALOG),
601
+
ID2P(LANG_PLAYING_NEXT), ID2P(LANG_ADD_TO_PL),
602
602
ID2P(LANG_REMOVE), ID2P(LANG_MOVE), ID2P(LANG_MENU_SHOW_ID3_INFO),
603
603
ID2P(LANG_SHUFFLE),
604
604
ID2P(LANG_SAVE),
+3
-3
manual/configure_rockbox/playlist_options.tex
+3
-3
manual/configure_rockbox/playlist_options.tex
···
33
33
34
34
\item[Keep Current Track When Replacing Playlist.]
35
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
37
playing before the new tracks play. If set to \setting{No}, the current
38
38
track will be interrupted and new tracks will start playing immediately.
39
39
40
40
\item[Show Shuffled Adding Options.]
41
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
44
\item[Show Queue Options.]
45
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
47
If set to \setting{In Submenu}, Rockbox will move the options into a
48
48
separate submenu.
49
49
+1
-1
manual/plugins/pictureflow.tex
+1
-1
manual/plugins/pictureflow.tex
···
3
3
PictureFlow is a visual browser for your albums. After you've selected something to play,
4
4
PictureFlow will continue running by default, or can optionally show the WPS. Using the
5
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
9
\subsubsection{Sort Options}
+5
-5
manual/rockbox_interface/browsing_and_playing.tex
+5
-5
manual/rockbox_interface/browsing_and_playing.tex
···
123
123
\begin{description}
124
124
\item [View.]
125
125
Displays the contents of the selected playlist file.
126
-
\item [Current Playlist.]
127
-
Enters the \setting{Current Playlist Submenu} (see \reference{ref:currentplaylist_submenu}).
128
-
\item [Playlist Catalogue.]
129
-
Enters the \setting{Playlist Catalogue Submenu} (see
130
-
\reference{ref:playlist_catalogue}).
126
+
\item [Playing Next...]
127
+
Enters the \setting{Playing Next Submenu} (see \reference{ref:playingnext_submenu}).
128
+
\item [Add to Playlist...]
129
+
Enters the \setting{Add to Playlist Submenu} (see
130
+
\reference{ref:addtoplaylist_submenu}).
131
131
\item [Rename.]
132
132
This function lets the user modify the name of a file or directory.
133
133
\item [Cut.]
+5
-5
manual/rockbox_interface/wps.tex
+5
-5
manual/rockbox_interface/wps.tex
···
179
179
Like the context menu for the \setting{File Browser}, the \setting{WPS Context Menu}
180
180
allows you quick access to some often used functions.
181
181
182
-
\subsubsection{Playlist}
183
-
The \setting{Playlist} submenu allows you to view, save, search, reshuffle,
182
+
\subsubsection{Current Playlist}
183
+
The \setting{Current Playlist} submenu allows you to view, save, search, reshuffle,
184
184
and display the play time of the current playlist. These and other operations
185
185
are detailed in \reference{ref:working_with_playlists}. To change settings for
186
186
the \setting{Playlist Viewer} press \ActionStdContext{} while viewing the
···
198
198
\end{description}
199
199
200
200
201
-
\subsubsection{Playlist catalogue}
201
+
\subsubsection{Add to Playlist...}
202
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
204
Select the playlist you want the file to be added to and it will get
205
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
207
add the currently playing track to a playlist. You need to enter a name
208
208
for the new playlist first.
209
209
\end{description}
+19
-19
manual/working_with_playlists/main.tex
+19
-19
manual/working_with_playlists/main.tex
···
17
17
18
18
\item[Dynamic playlist.] A dynamic playlist is a playlist that is created
19
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
21
creating (or adding to) a dynamic playlist.
22
22
23
23
\item[Insert.] In Rockbox, to \setting{Insert} an item into a playlist means
···
49
49
playlist, see the section below on how to add music to a playlist.}
50
50
51
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
53
will replace the dynamic playlist with the selected tracks. The \setting{Play
54
54
Shuffled} function is similar, except the selected tracks will be added to the
55
55
playlist in a random order.
56
56
57
-
\subsubsection{\label{ref:playlist_catalogue}By using the Playlist catalogue}
58
-
The \setting{Playlist catalogue} makes it possible to modify and create
59
-
playlists that are not currently playing. To do this select \setting{Playlist
60
-
catalogue} 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
62
-
playlist and \setting{Add to a new playlist} creates a new playlist containing
57
+
\subsubsection{\label{ref:addtoplaylist_submenu}By using the Add to Playlist submenu}
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{Add to Playlist...}
60
+
in the \setting{Context Menu}. There you will have two choices,
61
+
\setting{Add to Existing Playlist} adds the selected track or directory to an existing
62
+
playlist and \setting{Add to New Playlist} creates a new playlist containing
63
63
the selected track or directory.
64
64
65
65
\note{All playlists in the \setting{Playlist catalogue} are stored by default
···
75
75
76
76
\subsection{Adding music to playlists}
77
77
78
-
\subsubsection{\label{ref:currentplaylist_submenu}Adding music to a dynamic playlist}
79
-
\screenshot{rockbox_interface/images/ss-playlist-menu}{The Current Playlist Submenu}{}
80
-
The \setting{Current Playlist Submenu} is a submenu in the \setting{Context Menu} (see
78
+
\subsubsection{\label{ref:playingnext_submenu}Adding music to a dynamic playlist}
79
+
\screenshot{rockbox_interface/images/ss-playlist-menu}{The Playing Next Submenu}{}
80
+
The \setting{Playing Next Submenu} is a submenu in the \setting{Context Menu} (see
81
81
\reference{ref:Contextmenu}), it allows you to put tracks into a
82
82
``dynamic playlist''. The place in which the newly
83
83
selected tracks are added to the playlist is determined by these
···
133
133
$\rightarrow$ \setting{Current Playlist} and select either \setting{Show Shuffled Adding Options}
134
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
137
-
entire directories to a playlist. If the \setting{Current Playlist Submenu} is
136
+
The \setting{Playing Next Submenu} can be used to add either single tracks or
137
+
entire directories to a playlist. If the \setting{Playing Next Submenu} is
138
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
140
directory, Rockbox adds all of the tracks in that directory to the
141
141
playlist.
142
142
···
157
157
158
158
\subsection{Modifying playlists}
159
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
161
sub menu in the WPS, just select \setting{Reshuffle}.
162
162
163
163
\subsubsection{Moving and removing tracks}
164
164
To move or remove a track from the current playlist enter the
165
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
167
Once in the \setting{Playlist Viewer} open the context menu on the track you
168
168
want to move or remove. If you want to move the track, select \setting{Move} in
169
169
the context menu and then move the blinking cursor to the place where you want
···
171
171
select \setting{Remove} in the context menu.
172
172
173
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
175
in the \setting{WPS Context Menu} (see \reference{sec:contextmenu}) and
176
-
select \setting{Save Current Playlist} or enter the
177
-
\setting{Playlist Options} menu in the \setting{Main Menu} and select
176
+
select \setting{Save Current Playlist} or enter the context menu for the
177
+
\setting{Playlist catalogue} in the \setting{Main Menu} and select
178
178
\setting{Save Current Playlist}.
179
179
Either method will bring you to the \setting{Virtual Keyboard} (see
180
180
\reference{sec:virtual_keyboard}), enter a filename for your playlist and