Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
database: Respect global "talk menu" setting in the database tree
Should fix FS#13625
Change-Id: Ibc6210be45941b2074da1e5c11536bcd31b5ac8f
+9
-7
+9
-7
apps/tree.c
+9
-7
apps/tree.c
···
223
223
/* See if name is an encoded ID, if it is, then speak it normally */
224
224
int lang_id = P2ID(name);
225
225
/*debugf("%s Found name %s id %d\n", __func__, P2STR(name), lang_id);*/
226
-
if (lang_id >= 0)
227
-
{
228
-
talk_id(lang_id, true);
226
+
if (lang_id >= 0) {
227
+
if (global_settings.talk_menu)
228
+
talk_id(lang_id, true);
229
229
return 0;
230
230
}
231
231
···
237
237
// each entry type ("artist", "album", etc) should be delineated
238
238
// so we can split the clips into subdirs.
239
239
#if 0
240
-
if (talk_file(LANG_DIR"/database/", NULL,
241
-
P2STR(name), file_thumbnail_ext, NULL, true) > 0)
242
-
{
240
+
if (global_settings.talk_file_clip) {
241
+
if (talk_file(LANG_DIR"/database/", NULL,
242
+
P2STR(name), file_thumbnail_ext, NULL, true) > 0)
243
+
return 0;
244
+
245
+
// XXX fall back to spelling it out?
243
246
return 0;
244
247
}
245
-
// XXX fall back to spelling it out?
246
248
#endif
247
249
}
248
250
else