mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 18:17:39 -04:00
database: Respect global "talk menu" setting in the database tree
Should fix FS#13625 Change-Id: Ibc6210be45941b2074da1e5c11536bcd31b5ac8f
This commit is contained in:
parent
944026f2b7
commit
4ab056ab15
1 changed files with 9 additions and 7 deletions
10
apps/tree.c
10
apps/tree.c
|
@ -223,8 +223,8 @@ static int tree_voice_cb(int selected_item, void * data)
|
||||||
/* See if name is an encoded ID, if it is, then speak it normally */
|
/* See if name is an encoded ID, if it is, then speak it normally */
|
||||||
int lang_id = P2ID(name);
|
int lang_id = P2ID(name);
|
||||||
/*debugf("%s Found name %s id %d\n", __func__, P2STR(name), lang_id);*/
|
/*debugf("%s Found name %s id %d\n", __func__, P2STR(name), lang_id);*/
|
||||||
if (lang_id >= 0)
|
if (lang_id >= 0) {
|
||||||
{
|
if (global_settings.talk_menu)
|
||||||
talk_id(lang_id, true);
|
talk_id(lang_id, true);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -237,12 +237,14 @@ static int tree_voice_cb(int selected_item, void * data)
|
||||||
// each entry type ("artist", "album", etc) should be delineated
|
// each entry type ("artist", "album", etc) should be delineated
|
||||||
// so we can split the clips into subdirs.
|
// so we can split the clips into subdirs.
|
||||||
#if 0
|
#if 0
|
||||||
|
if (global_settings.talk_file_clip) {
|
||||||
if (talk_file(LANG_DIR"/database/", NULL,
|
if (talk_file(LANG_DIR"/database/", NULL,
|
||||||
P2STR(name), file_thumbnail_ext, NULL, true) > 0)
|
P2STR(name), file_thumbnail_ext, NULL, true) > 0)
|
||||||
{
|
return 0;
|
||||||
|
|
||||||
|
// XXX fall back to spelling it out?
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
// XXX fall back to spelling it out?
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue