diff options
author | Peter D'Hoye <peter.dhoye@gmail.com> | 2007-08-14 21:02:44 +0000 |
---|---|---|
committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2007-08-14 21:02:44 +0000 |
commit | 360d951271659af590103dd81efb8166f5b226a2 (patch) | |
tree | 1f8bba542699fe80e9733b0a7e05cc25858ac4ed | |
parent | d746b94c574e1ba437baf09c897f691675602e84 (diff) | |
download | rockbox-360d951271659af590103dd81efb8166f5b226a2.tar.gz rockbox-360d951271659af590103dd81efb8166f5b226a2.zip |
Small optimisation
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14344 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/tree.c | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/apps/tree.c b/apps/tree.c index b7e196f482..d6c6d3eca4 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -156,32 +156,30 @@ static char * tree_get_filename(int selected_item, void * data, char *buffer) | |||
156 | attr = e->attr; | 156 | attr = e->attr; |
157 | } | 157 | } |
158 | 158 | ||
159 | switch(global_settings.show_filename_ext) | 159 | if(!(attr & ATTR_DIRECTORY)) |
160 | { | 160 | { |
161 | case 0: | 161 | switch(global_settings.show_filename_ext) |
162 | /* show file extension: off */ | 162 | { |
163 | stripit = true; | 163 | case 0: |
164 | break; | 164 | /* show file extension: off */ |
165 | case 1: | 165 | stripit = true; |
166 | /* show file extension: on */ | 166 | break; |
167 | stripit = false; | 167 | case 1: |
168 | break; | 168 | /* show file extension: on */ |
169 | case 2: | 169 | break; |
170 | /* show file extension: only unknown types */ | 170 | case 2: |
171 | stripit = filetype_supported(attr); | 171 | /* show file extension: only unknown types */ |
172 | break; | 172 | stripit = filetype_supported(attr); |
173 | case 3: | 173 | break; |
174 | default: | 174 | case 3: |
175 | /* show file extension: only when viewing all */ | 175 | default: |
176 | stripit = (*(local_tc->dirfilter) != SHOW_ID3DB) && | 176 | /* show file extension: only when viewing all */ |
177 | (*(local_tc->dirfilter) != SHOW_ALL); | 177 | stripit = (*(local_tc->dirfilter) != SHOW_ID3DB) && |
178 | break; | 178 | (*(local_tc->dirfilter) != SHOW_ALL); |
179 | break; | ||
180 | } | ||
179 | } | 181 | } |
180 | 182 | ||
181 | /* global overrule: don't strip if it's a dir */ | ||
182 | if(attr & ATTR_DIRECTORY) | ||
183 | stripit = false; | ||
184 | |||
185 | if(stripit) | 183 | if(stripit) |
186 | { | 184 | { |
187 | return(strip_extension(name, buffer)); | 185 | return(strip_extension(name, buffer)); |