diff options
-rw-r--r-- | apps/tagnavi.config | 8 | ||||
-rw-r--r-- | apps/tagtree.c | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/apps/tagnavi.config b/apps/tagnavi.config index b9d50c5c9b..74dfb1d1d9 100644 --- a/apps/tagnavi.config +++ b/apps/tagnavi.config | |||
@@ -2,8 +2,12 @@ | |||
2 | # ^ Version header must be the first line of every file | 2 | # ^ Version header must be the first line of every file |
3 | 3 | ||
4 | # Tag Browser configuration file, do not edit as changes will be lost! | 4 | # Tag Browser configuration file, do not edit as changes will be lost! |
5 | # Instead, you can modify "/.rockbox/tagnavi_custom.config" which will never | 5 | # Instead, copy this file to "/.rockbox/tagnavi_user.config" and edit |
6 | # get overwritten automatically. | 6 | # that, so your changes will not be overwritten automatically. |
7 | # | ||
8 | # If you only want to add menus and don't need to modify the default | ||
9 | # ones, you can edit "/.rockbox/tagnavi_custom.config" instead, which | ||
10 | # is included by this file and will not be overwritten automatically. | ||
7 | 11 | ||
8 | # Basic format declarations | 12 | # Basic format declarations |
9 | %format "fmt_title" "%s - %02d:%02d (%s)" basename Lm Ls filename ? title == "<Untagged>" | 13 | %format "fmt_title" "%s - %02d:%02d (%s)" basename Lm Ls filename ? title == "<Untagged>" |
diff --git a/apps/tagtree.c b/apps/tagtree.c index 454875ded2..74f0021d6a 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -58,7 +58,8 @@ | |||
58 | 58 | ||
59 | #define str_or_empty(x) (x ? x : "(NULL)") | 59 | #define str_or_empty(x) (x ? x : "(NULL)") |
60 | 60 | ||
61 | #define FILE_SEARCH_INSTRUCTIONS ROCKBOX_DIR "/tagnavi.config" | 61 | #define TAGNAVI_DEFAULT_CONFIG ROCKBOX_DIR "/tagnavi.config" |
62 | #define TAGNAVI_USER_CONFIG ROCKBOX_DIR "/tagnavi_user.config" | ||
62 | 63 | ||
63 | static int tagtree_play_folder(struct tree_context* c); | 64 | static int tagtree_play_folder(struct tree_context* c); |
64 | 65 | ||
@@ -1262,7 +1263,14 @@ void tagtree_init(void) | |||
1262 | if (tagtree_handle < 0) | 1263 | if (tagtree_handle < 0) |
1263 | panicf("tagtree OOM"); | 1264 | panicf("tagtree OOM"); |
1264 | 1265 | ||
1265 | if (!parse_menu(FILE_SEARCH_INSTRUCTIONS)) | 1266 | /* Use the user tagnavi config if present, otherwise use the default. */ |
1267 | const char* tagnavi_file; | ||
1268 | if(file_exists(TAGNAVI_USER_CONFIG)) | ||
1269 | tagnavi_file = TAGNAVI_USER_CONFIG; | ||
1270 | else | ||
1271 | tagnavi_file = TAGNAVI_DEFAULT_CONFIG; | ||
1272 | |||
1273 | if (!parse_menu(tagnavi_file)) | ||
1266 | { | 1274 | { |
1267 | tagtree_unload(NULL); | 1275 | tagtree_unload(NULL); |
1268 | return; | 1276 | return; |