summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStéphane Doyon <s.doyon@videotron.ca>2007-11-07 01:45:43 +0000
committerStéphane Doyon <s.doyon@videotron.ca>2007-11-07 01:45:43 +0000
commit8024aad1f1606d42a40a6a0c88ddc2942f7f7afd (patch)
tree0ea52ed2dbbe360415e587f6f81eacae6932059f
parent6f4c6ed99007f89099b74bfbb95f5ca58b0ead3c (diff)
downloadrockbox-8024aad1f1606d42a40a6a0c88ddc2942f7f7afd.zip
rockbox-8024aad1f1606d42a40a6a0c88ddc2942f7f7afd.tar.gz
rockbox-8024aad1f1606d42a40a6a0c88ddc2942f7f7afd.tar.bz2
rockbox-8024aad1f1606d42a40a6a0c88ddc2942f7f7afd.tar.xz
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.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/tree.c b/apps/tree.c
index 6a4c97a..1d1592b 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -268,11 +268,16 @@ static int tree_voice_cb(int selected_item, void * data)
talk_id(is_dir ? VOICE_DIR : VOICE_FILE, false);
talk_number(selected_item+1 - (is_dir ? 0 : local_tc->dirsindir),
true);
- if(!is_dir)
+ if(!is_dir && *local_tc->dirfilter < NUM_FILTER_MODES)
say_filetype(attr);
break;
case 2: /* spelled */
- talk_spell(name, false);
+ talk_shutup();
+ if(is_dir)
+ talk_id(VOICE_DIR, true);
+ else if(*local_tc->dirfilter < NUM_FILTER_MODES)
+ say_filetype(attr);
+ talk_spell(name, true);
break;
}
}
@@ -1203,6 +1208,7 @@ static int ft_play_dirname(char* name)
DEBUGF("Found: %s\n", dirname_mp3_filename);
talk_file(dirname_mp3_filename, false);
+ talk_id(VOICE_DIR, true);
return 1;
}