summaryrefslogtreecommitdiff
path: root/apps/tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/tree.c')
-rw-r--r--apps/tree.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/tree.c b/apps/tree.c
index 1f7102dbb9..f50d424a82 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -128,7 +128,7 @@ static const char* tree_get_filename(int selected_item, void *data,
128 { 128 {
129 return tagtree_get_entry_name(&tc, selected_item, buffer, buffer_len); 129 return tagtree_get_entry_name(&tc, selected_item, buffer, buffer_len);
130 } 130 }
131 else 131 else
132#endif 132#endif
133 { 133 {
134 struct entry *entry = tree_get_entry_at(local_tc, selected_item); 134 struct entry *entry = tree_get_entry_at(local_tc, selected_item);
@@ -137,7 +137,7 @@ static const char* tree_get_filename(int selected_item, void *data,
137 name = entry->name; 137 name = entry->name;
138 attr = entry->attr; 138 attr = entry->attr;
139 } 139 }
140 140
141 if(!(attr & ATTR_DIRECTORY)) 141 if(!(attr & ATTR_DIRECTORY))
142 { 142 {
143 switch(global_settings.show_filename_ext) 143 switch(global_settings.show_filename_ext)
@@ -363,7 +363,7 @@ static int update_dir(void)
363 changed = true; 363 changed = true;
364 } 364 }
365 } 365 }
366 else 366 else
367#endif 367#endif
368 { 368 {
369 tc.sort_dir = global_settings.sort_dir; 369 tc.sort_dir = global_settings.sort_dir;
@@ -391,7 +391,7 @@ static int update_dir(void)
391 { 391 {
392 if( 392 if(
393#ifdef HAVE_TAGCACHE 393#ifdef HAVE_TAGCACHE
394 !id3db && 394 !id3db &&
395#endif 395#endif
396 tc.dirfull ) 396 tc.dirfull )
397 { 397 {
@@ -474,7 +474,7 @@ void resume_directory(const char *dir)
474#ifdef HAVE_TAGCACHE 474#ifdef HAVE_TAGCACHE
475 if (!id3db) 475 if (!id3db)
476#endif 476#endif
477 *tc.dirfilter = global_settings.dirfilter; 477 *tc.dirfilter = global_settings.dirfilter;
478 ret = ft_load(&tc, dir); 478 ret = ft_load(&tc, dir);
479 *tc.dirfilter = dirfilter; 479 *tc.dirfilter = dirfilter;
480 if (ret < 0) 480 if (ret < 0)
@@ -534,7 +534,7 @@ char* get_current_file(char* buffer, size_t buffer_len)
534 return NULL; 534 return NULL;
535} 535}
536 536
537/* Allow apps to change our dirfilter directly (required for sub browsers) 537/* Allow apps to change our dirfilter directly (required for sub browsers)
538 if they're suddenly going to become a file browser for example */ 538 if they're suddenly going to become a file browser for example */
539void set_dirfilter(int l_dirfilter) 539void set_dirfilter(int l_dirfilter)
540{ 540{
@@ -712,7 +712,7 @@ static int dirbrowse(void)
712#endif 712#endif
713 if (ft_exit(&tc) == 3) 713 if (ft_exit(&tc) == 3)
714 exit_func = true; 714 exit_func = true;
715 715
716 restore = true; 716 restore = true;
717 break; 717 break;
718 718
@@ -976,7 +976,7 @@ int rockbox_browse(struct browse_context *browse)
976 browse->root, browse->selected); 976 browse->root, browse->selected);
977 set_current_file(current); 977 set_current_file(current);
978 /* set_current_file changes dirlevel, change it back */ 978 /* set_current_file changes dirlevel, change it back */
979 tc.dirlevel = 0; 979 tc.dirlevel = 0;
980 } 980 }
981 981
982 ret_val = dirbrowse(); 982 ret_val = dirbrowse();
@@ -1100,7 +1100,7 @@ bool bookmark_play(char *resume_file, int index, unsigned long elapsed,
1100 else search for it */ 1100 else search for it */
1101 peek_filename = playlist_peek(index, filename_buf, 1101 peek_filename = playlist_peek(index, filename_buf,
1102 sizeof(filename_buf)); 1102 sizeof(filename_buf));
1103 1103
1104 if (peek_filename == NULL) 1104 if (peek_filename == NULL)
1105 { 1105 {
1106 /* playlist has shrunk, search from the top */ 1106 /* playlist has shrunk, search from the top */
@@ -1110,7 +1110,7 @@ bool bookmark_play(char *resume_file, int index, unsigned long elapsed,
1110 if (peek_filename == NULL) 1110 if (peek_filename == NULL)
1111 return false; 1111 return false;
1112 } 1112 }
1113 1113
1114 if (strcmp(strrchr(peek_filename, '/') + 1, filename)) 1114 if (strcmp(strrchr(peek_filename, '/') + 1, filename))
1115 { 1115 {
1116 for ( i=0; i < playlist_amount(); i++ ) 1116 for ( i=0; i < playlist_amount(); i++ )
@@ -1209,7 +1209,7 @@ void tree_flush(void)
1209 global_status.dircache_size = info.last_size; 1209 global_status.dircache_size = info.last_size;
1210 #ifdef HAVE_EEPROM_SETTINGS 1210 #ifdef HAVE_EEPROM_SETTINGS
1211 savecache = firmware_settings.initialized; 1211 savecache = firmware_settings.initialized;
1212 #endif 1212 #endif
1213 } 1213 }
1214 else 1214 else
1215 { 1215 {
@@ -1231,11 +1231,11 @@ void tree_restore(void)
1231#ifdef HAVE_EEPROM_SETTINGS 1231#ifdef HAVE_EEPROM_SETTINGS
1232 firmware_settings.disk_clean = false; 1232 firmware_settings.disk_clean = false;
1233#endif 1233#endif
1234 1234
1235#ifdef HAVE_TC_RAMCACHE 1235#ifdef HAVE_TC_RAMCACHE
1236 remove(TAGCACHE_STATEFILE); 1236 remove(TAGCACHE_STATEFILE);
1237#endif 1237#endif
1238 1238
1239#ifdef HAVE_DIRCACHE 1239#ifdef HAVE_DIRCACHE
1240 if (global_settings.dircache && dircache_resume() > 0) 1240 if (global_settings.dircache && dircache_resume() > 0)
1241 { 1241 {