diff options
author | Stéphane Doyon <s.doyon@videotron.ca> | 2007-11-07 01:45:43 +0000 |
---|---|---|
committer | Stéphane Doyon <s.doyon@videotron.ca> | 2007-11-07 01:45:43 +0000 |
commit | 8024aad1f1606d42a40a6a0c88ddc2942f7f7afd (patch) | |
tree | 0ea52ed2dbbe360415e587f6f81eacae6932059f | |
parent | 6f4c6ed99007f89099b74bfbb95f5ca58b0ead3c (diff) | |
download | rockbox-8024aad1f1606d42a40a6a0c88ddc2942f7f7afd.tar.gz rockbox-8024aad1f1606d42a40a6a0c88ddc2942f7f7afd.zip |
Accept FS#7653: Say file type.
In the file browser, when spelling of directory or file names is enabled,
say the file type (or "folder").
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15506 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/tree.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/tree.c b/apps/tree.c index 6a4c97adc1..1d1592b4fa 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -268,11 +268,16 @@ static int tree_voice_cb(int selected_item, void * data) | |||
268 | talk_id(is_dir ? VOICE_DIR : VOICE_FILE, false); | 268 | talk_id(is_dir ? VOICE_DIR : VOICE_FILE, false); |
269 | talk_number(selected_item+1 - (is_dir ? 0 : local_tc->dirsindir), | 269 | talk_number(selected_item+1 - (is_dir ? 0 : local_tc->dirsindir), |
270 | true); | 270 | true); |
271 | if(!is_dir) | 271 | if(!is_dir && *local_tc->dirfilter < NUM_FILTER_MODES) |
272 | say_filetype(attr); | 272 | say_filetype(attr); |
273 | break; | 273 | break; |
274 | case 2: /* spelled */ | 274 | case 2: /* spelled */ |
275 | talk_spell(name, false); | 275 | talk_shutup(); |
276 | if(is_dir) | ||
277 | talk_id(VOICE_DIR, true); | ||
278 | else if(*local_tc->dirfilter < NUM_FILTER_MODES) | ||
279 | say_filetype(attr); | ||
280 | talk_spell(name, true); | ||
276 | break; | 281 | break; |
277 | } | 282 | } |
278 | } | 283 | } |
@@ -1203,6 +1208,7 @@ static int ft_play_dirname(char* name) | |||
1203 | DEBUGF("Found: %s\n", dirname_mp3_filename); | 1208 | DEBUGF("Found: %s\n", dirname_mp3_filename); |
1204 | 1209 | ||
1205 | talk_file(dirname_mp3_filename, false); | 1210 | talk_file(dirname_mp3_filename, false); |
1211 | talk_id(VOICE_DIR, true); | ||
1206 | return 1; | 1212 | return 1; |
1207 | } | 1213 | } |
1208 | 1214 | ||