diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/tagnavi.config | 1 | ||||
-rw-r--r-- | apps/tagtree.c | 17 | ||||
-rw-r--r-- | apps/tagtree.h | 1 | ||||
-rw-r--r-- | apps/tree.c | 23 |
4 files changed, 35 insertions, 7 deletions
diff --git a/apps/tagnavi.config b/apps/tagnavi.config index 9821c30faf..4d8a4b5847 100644 --- a/apps/tagnavi.config +++ b/apps/tagnavi.config | |||
@@ -15,7 +15,6 @@ | |||
15 | # Define the search sub menu | 15 | # Define the search sub menu |
16 | %menu_start "search" "Search by..." | 16 | %menu_start "search" "Search by..." |
17 | "Artist" -> artist ? artist ~ "" -> album -> title = "%02d. %s" tracknum title | 17 | "Artist" -> artist ? artist ~ "" -> album -> title = "%02d. %s" tracknum title |
18 | "Artist -> (score > 85)" artist ? artist ~ "" & autoscore >= "85" -> album -> title = "%02d. %s" tracknum title | ||
19 | "Album" -> album ? album ~ "" -> title = "%02d. %s" tracknum title | 18 | "Album" -> album ? album ~ "" -> title = "%02d. %s" tracknum title |
20 | "Title" -> title ? title ~ "" | 19 | "Title" -> title ? title ~ "" |
21 | "Filename" -> filename ? filename ~ "" | 20 | "Filename" -> filename ? filename ~ "" |
diff --git a/apps/tagtree.c b/apps/tagtree.c index 7a710c6fc3..d03623b295 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -1401,6 +1401,23 @@ struct tagentry* tagtree_get_entry(struct tree_context *c, int id) | |||
1401 | return &entry[realid]; | 1401 | return &entry[realid]; |
1402 | } | 1402 | } |
1403 | 1403 | ||
1404 | char *tagtree_get_title(struct tree_context* c) | ||
1405 | { | ||
1406 | switch (c->currtable) | ||
1407 | { | ||
1408 | case root: | ||
1409 | return menu->title; | ||
1410 | |||
1411 | case navibrowse: | ||
1412 | return (char *)tagcache_tag_to_str(csi->tagorder[c->currextra]); | ||
1413 | |||
1414 | case allsubentries: | ||
1415 | return "Tracks"; | ||
1416 | } | ||
1417 | |||
1418 | return "?"; | ||
1419 | } | ||
1420 | |||
1404 | int tagtree_get_attr(struct tree_context* c) | 1421 | int tagtree_get_attr(struct tree_context* c) |
1405 | { | 1422 | { |
1406 | int attr = -1; | 1423 | int attr = -1; |
diff --git a/apps/tagtree.h b/apps/tagtree.h index 0c612ad395..30e00f6c99 100644 --- a/apps/tagtree.h +++ b/apps/tagtree.h | |||
@@ -38,6 +38,7 @@ void tagtree_exit(struct tree_context* c); | |||
38 | int tagtree_load(struct tree_context* c); | 38 | int tagtree_load(struct tree_context* c); |
39 | struct tagentry* tagtree_get_entry(struct tree_context *c, int id); | 39 | struct tagentry* tagtree_get_entry(struct tree_context *c, int id); |
40 | bool tagtree_insert_selection_playlist(int position, bool queue); | 40 | bool tagtree_insert_selection_playlist(int position, bool queue); |
41 | char *tagtree_get_title(struct tree_context* c); | ||
41 | int tagtree_get_attr(struct tree_context* c); | 42 | int tagtree_get_attr(struct tree_context* c); |
42 | #ifdef HAVE_LCD_BITMAP | 43 | #ifdef HAVE_LCD_BITMAP |
43 | const unsigned char* tagtree_get_icon(struct tree_context* c); | 44 | const unsigned char* tagtree_get_icon(struct tree_context* c); |
diff --git a/apps/tree.c b/apps/tree.c index 584aaa8006..4b23bbef89 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -349,7 +349,22 @@ static int update_dir(void) | |||
349 | gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL)); | 349 | gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL)); |
350 | } | 350 | } |
351 | } | 351 | } |
352 | if (!id3db) { | 352 | if (id3db) |
353 | { | ||
354 | if (global_settings.show_path_in_browser == SHOW_PATH_FULL | ||
355 | || global_settings.show_path_in_browser == SHOW_PATH_CURRENT) | ||
356 | { | ||
357 | gui_synclist_set_title(&tree_lists, tagtree_get_title(&tc), | ||
358 | filetype_get_icon(ATTR_DIRECTORY)); | ||
359 | } | ||
360 | else | ||
361 | { | ||
362 | /* Must clear the title as the list is reused */ | ||
363 | gui_synclist_set_title(&tree_lists, NULL, NOICON); | ||
364 | } | ||
365 | } | ||
366 | else | ||
367 | { | ||
353 | if (global_settings.show_path_in_browser == SHOW_PATH_FULL) | 368 | if (global_settings.show_path_in_browser == SHOW_PATH_FULL) |
354 | { | 369 | { |
355 | gui_synclist_set_title(&tree_lists, tc.currdir, | 370 | gui_synclist_set_title(&tree_lists, tc.currdir, |
@@ -373,11 +388,7 @@ static int update_dir(void) | |||
373 | gui_synclist_set_title(&tree_lists, NULL, NOICON); | 388 | gui_synclist_set_title(&tree_lists, NULL, NOICON); |
374 | } | 389 | } |
375 | } | 390 | } |
376 | else | 391 | |
377 | { | ||
378 | /* This currently doesn't work too well in id3db so turn it off */ | ||
379 | gui_synclist_set_title(&tree_lists, NULL, NOICON); | ||
380 | } | ||
381 | gui_synclist_set_nb_items(&tree_lists, tc.filesindir); | 392 | gui_synclist_set_nb_items(&tree_lists, tc.filesindir); |
382 | gui_synclist_set_icon_callback(&tree_lists, | 393 | gui_synclist_set_icon_callback(&tree_lists, |
383 | global_settings.show_icons?&tree_get_fileicon:NULL); | 394 | global_settings.show_icons?&tree_get_fileicon:NULL); |