(1) New syntax to support conditional formatting.

(2) Reduced tagnavi memory consumption.
(3) There was a bug that splash screen counter was counting down when
inserting tracks next. But in fact that might be preferred, so always
count down after successful tagcache query.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11223 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 23 insertions, 13 deletions

diff --git a/apps/tagnavi.config b/apps/tagnavi.config
index fdf66828af..191b4bdda5 100644
--- a/apps/tagnavi.config
+++ b/apps/tagnavi.config
@@ -5,6 +5,15 @@
 # Instead, you can modify "/.rockbox/tagnavi_custom.config" which will never
 # get overwritten automatically.
 
+# Basic format declarations
+%format "fmt_title"       "%02d. %s" tracknum title ? tracknum > "0"
+%format "fmt_title"       "%s" title
+%format "fmt_mostplayed"  "(%3d) %s" playcount title %sort = "inverse" %limit = "100"
+%format "fmt_lastplayed"  "%06d%s" lastplayed title %sort = "inverse" %limit = "99" %strip = "6"
+%format "fmt_best_tracks" "%02d. %s (%3d)" tracknum title autoscore
+%format "fmt_played"      "(%3d/%d) %s" autoscore playcount title
+%format "fmt_score"       "(%3d) %s" autoscore title
+
 # Include our custom menu
 %include "/.rockbox/tagnavi_custom.config"
 
@@ -14,11 +23,11 @@
 
 # Define the search sub menu
 %menu_start "search" "Search by..."
-"Artist" -> artist ? artist ~ "" -> album -> title = "%02d. %s" tracknum title
-"Album" -> album ? album ~ "" -> title = "%02d. %s" tracknum title
+"Artist" -> artist ? artist ~ "" -> album -> title = "fmt_title"
+"Album" -> album ? album ~ "" -> title = "fmt_title"
 "Title" -> title ? title ~ ""
 "Filename" -> filename ? filename ~ ""
-"Score" -> title = "(%3d) %s" autoscore title ? autoscore > ""
+"Score" -> title = "fmt_score" ? autoscore > ""
 
 # ^ An empy line ends the menu
 
@@ -28,19 +37,20 @@
 
 # Define the title of the main menu
 %menu_start "main" "Browse by..."
-"Artist"   -> artist   -> album  -> title = "%02d. %s" tracknum title
-"Album"    -> album    -> title = "%02d. %s" tracknum title
-"Genre"    -> genre    -> artist -> album -> title = "%02d. %s" tracknum title
-"Composer" -> composer -> album -> title = "%02d. %s" tracknum title
+"Artist"   -> artist   -> album  -> title = "fmt_title"
+"Album"    -> album    -> title = "fmt_title"
+"Genre"    -> genre    -> artist -> album -> title = "fmt_title"
+"Composer" -> composer -> album -> title = "fmt_title"
 "Track"    -> title
-"Year"     -> year ? year > "1000" & year < "2008" -> artist -> album -> title = "%02d. %s" tracknum title
+"Year"     -> year ? year > "1000" & year < "2008" -> artist -> album -> title = "fmt_title"
 "Search..." ==> "search"
-"Most played tracks" -> title = "(%3d) %s" playcount title %sort = "inverse" %limit = "100" ? playcount > "0"
-"Last played tracks" -> title = "%06d%s" lastplayed title %sort = "inverse" %limit = "99" %strip = "6" ? playcount > "0"
-"Never played tracks" -> artist ? playcount == "0" -> album -> title = "%02d. %s" tracknum title
-"Best tracks" -> artist ? playcount > "1" & autoscore > "85" -> album -> title = "%02d. %s (%3d)" tracknum title autoscore
-"List played tracks" -> title = "(%3d/%d) %s" autoscore playcount title ? playcount > "0"
+"Most played tracks" -> title = "fmt_mostplayed" ? playcount > "0"
+"Last played tracks" -> title = "fmt_lastplayed" ? playcount > "0"
+"Never played tracks" -> artist ? playcount == "0" -> album -> title = "fmt_title"
+"Best tracks" -> artist ? playcount > "1" & autoscore > "85" -> album -> title = "fmt_best_tracks"
+"List played tracks" -> title = "fmt_played" ? playcount > "0"
 "Custom view..."  ==> "custom"
 
 # And finally set main menu as our root menu
 %root_menu "main"
+