diff options
Diffstat (limited to 'apps/tree.c')
-rw-r--r-- | apps/tree.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/apps/tree.c b/apps/tree.c index 1d1592b4fa..13b0756cbb 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -268,15 +268,19 @@ 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 && *local_tc->dirfilter < NUM_FILTER_MODES) | 271 | if(global_settings.talk_filetype |
272 | && !is_dir && *local_tc->dirfilter < NUM_FILTER_MODES) | ||
272 | say_filetype(attr); | 273 | say_filetype(attr); |
273 | break; | 274 | break; |
274 | case 2: /* spelled */ | 275 | case 2: /* spelled */ |
275 | talk_shutup(); | 276 | talk_shutup(); |
276 | if(is_dir) | 277 | if(global_settings.talk_filetype) |
277 | talk_id(VOICE_DIR, true); | 278 | { |
278 | else if(*local_tc->dirfilter < NUM_FILTER_MODES) | 279 | if(is_dir) |
279 | say_filetype(attr); | 280 | talk_id(VOICE_DIR, true); |
281 | else if(*local_tc->dirfilter < NUM_FILTER_MODES) | ||
282 | say_filetype(attr); | ||
283 | } | ||
280 | talk_spell(name, true); | 284 | talk_spell(name, true); |
281 | break; | 285 | break; |
282 | } | 286 | } |
@@ -1208,7 +1212,8 @@ static int ft_play_dirname(char* name) | |||
1208 | DEBUGF("Found: %s\n", dirname_mp3_filename); | 1212 | DEBUGF("Found: %s\n", dirname_mp3_filename); |
1209 | 1213 | ||
1210 | talk_file(dirname_mp3_filename, false); | 1214 | talk_file(dirname_mp3_filename, false); |
1211 | talk_id(VOICE_DIR, true); | 1215 | if(global_settings.talk_filetype) |
1216 | talk_id(VOICE_DIR, true); | ||
1212 | return 1; | 1217 | return 1; |
1213 | } | 1218 | } |
1214 | 1219 | ||