diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/filetree.h | 2 | ||||
-rw-r--r-- | apps/tree.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/apps/filetree.h b/apps/filetree.h index cdcdfca261..c179959053 100644 --- a/apps/filetree.h +++ b/apps/filetree.h | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | int ft_load(struct tree_context* c, const char* tempdir); | 23 | int ft_load(struct tree_context* c, const char* tempdir); |
24 | int ft_play_filenumber(int pos, int attr); | 24 | int ft_play_filenumber(int pos, int attr); |
25 | int ft_play_dirname(int start_index); | 25 | int ft_play_dirname(char* name); |
26 | void ft_play_filename(char *dir, char *file); | 26 | void ft_play_filename(char *dir, char *file); |
27 | int ft_enter(struct tree_context* c); | 27 | int ft_enter(struct tree_context* c); |
28 | int ft_exit(struct tree_context* c); | 28 | int ft_exit(struct tree_context* c); |
diff --git a/apps/tree.c b/apps/tree.c index e5f4151891..e2541c257c 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -835,7 +835,7 @@ static bool dirbrowse(void) | |||
835 | if (attr & ATTR_DIRECTORY) | 835 | if (attr & ATTR_DIRECTORY) |
836 | { | 836 | { |
837 | DEBUGF("Playing directory thumbnail: %s", currdir); | 837 | DEBUGF("Playing directory thumbnail: %s", currdir); |
838 | res = ft_play_dirname(lasti); | 838 | res = ft_play_dirname(name); |
839 | if (res < 0) /* failed, not existing */ | 839 | if (res < 0) /* failed, not existing */ |
840 | { /* say the number instead, as a fallback */ | 840 | { /* say the number instead, as a fallback */ |
841 | talk_id(VOICE_DIR, false); | 841 | talk_id(VOICE_DIR, false); |
@@ -1298,17 +1298,16 @@ int ft_play_filenumber(int pos, int attr) | |||
1298 | return 1; | 1298 | return 1; |
1299 | } | 1299 | } |
1300 | 1300 | ||
1301 | int ft_play_dirname(int start_index) | 1301 | int ft_play_dirname(char* name) |
1302 | { | 1302 | { |
1303 | int fd; | 1303 | int fd; |
1304 | char dirname_mp3_filename[MAX_PATH+1]; | 1304 | char dirname_mp3_filename[MAX_PATH+1]; |
1305 | struct entry *dircache = tc.dircache; | ||
1306 | 1305 | ||
1307 | if (audio_status() & AUDIO_STATUS_PLAY) | 1306 | if (audio_status() & AUDIO_STATUS_PLAY) |
1308 | return 0; | 1307 | return 0; |
1309 | 1308 | ||
1310 | snprintf(dirname_mp3_filename, sizeof(dirname_mp3_filename), "%s/%s/%s", | 1309 | snprintf(dirname_mp3_filename, sizeof(dirname_mp3_filename), "%s/%s/%s", |
1311 | tc.currdir[1] ? tc.currdir : "" , dircache[start_index].name, | 1310 | tc.currdir[1] ? tc.currdir : "" , name, |
1312 | dir_thumbnail_name); | 1311 | dir_thumbnail_name); |
1313 | 1312 | ||
1314 | DEBUGF("Checking for %s\n", dirname_mp3_filename); | 1313 | DEBUGF("Checking for %s\n", dirname_mp3_filename); |