diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-06-10 10:41:27 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-06-10 10:41:27 +0000 |
commit | 2cda994431174ab809143761a3c72412acc54dc3 (patch) | |
tree | 6788c583da17659f0db91a25afc2b0893ba8827c /apps | |
parent | 601ede7f9cc88cc40e074cc9d9cfdc2c0ba46d4c (diff) | |
download | rockbox-2cda994431174ab809143761a3c72412acc54dc3.tar.gz rockbox-2cda994431174ab809143761a3c72412acc54dc3.zip |
Move the root_menu() call out of tree.c.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13609 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main.c | 7 | ||||
-rw-r--r-- | apps/tree.c | 7 | ||||
-rw-r--r-- | apps/tree.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/apps/main.c b/apps/main.c index e515c9ddd2..3dfab06280 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -122,7 +122,8 @@ static void app_main(void) | |||
122 | #endif | 122 | #endif |
123 | { | 123 | { |
124 | init(); | 124 | init(); |
125 | browse_root(); | 125 | tree_gui_init(); |
126 | root_menu(); | ||
126 | } | 127 | } |
127 | 128 | ||
128 | static int init_dircache(bool preinit) | 129 | static int init_dircache(bool preinit) |
@@ -272,7 +273,7 @@ static void init(void) | |||
272 | init_tagcache(); | 273 | init_tagcache(); |
273 | #endif | 274 | #endif |
274 | sleep(HZ/2); | 275 | sleep(HZ/2); |
275 | tree_init(); | 276 | tree_mem_init(); |
276 | filetype_init(); | 277 | filetype_init(); |
277 | playlist_init(); | 278 | playlist_init(); |
278 | 279 | ||
@@ -503,7 +504,7 @@ static void init(void) | |||
503 | #endif | 504 | #endif |
504 | status_init(); | 505 | status_init(); |
505 | playlist_init(); | 506 | playlist_init(); |
506 | tree_init(); | 507 | tree_mem_init(); |
507 | filetype_init(); | 508 | filetype_init(); |
508 | scrobbler_init(); | 509 | scrobbler_init(); |
509 | cuesheet_init(); | 510 | cuesheet_init(); |
diff --git a/apps/tree.c b/apps/tree.c index 53aca47d49..1f76994968 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -202,7 +202,8 @@ bool check_rockboxdir(void) | |||
202 | return true; | 202 | return true; |
203 | } | 203 | } |
204 | 204 | ||
205 | void browse_root(void) | 205 | /* do this really late in the init sequence */ |
206 | void tree_gui_init(void) | ||
206 | { | 207 | { |
207 | gui_sync_wps_screen_init(); | 208 | gui_sync_wps_screen_init(); |
208 | 209 | ||
@@ -222,8 +223,6 @@ void browse_root(void) | |||
222 | #endif | 223 | #endif |
223 | gui_synclist_init(&tree_lists, &tree_get_filename, &tc, false, 1); | 224 | gui_synclist_init(&tree_lists, &tree_get_filename, &tc, false, 1); |
224 | gui_synclist_set_icon_callback(&tree_lists, &tree_get_fileicon); | 225 | gui_synclist_set_icon_callback(&tree_lists, &tree_get_fileicon); |
225 | /* not the best place for this call... but... */ | ||
226 | root_menu(); | ||
227 | } | 226 | } |
228 | 227 | ||
229 | 228 | ||
@@ -1078,7 +1077,7 @@ int rockbox_browse(const char *root, int dirfilter) | |||
1078 | return ret_val; | 1077 | return ret_val; |
1079 | } | 1078 | } |
1080 | 1079 | ||
1081 | void tree_init(void) | 1080 | void tree_mem_init(void) |
1082 | { | 1081 | { |
1083 | /* We copy the settings value in case it is changed by the user. We can't | 1082 | /* We copy the settings value in case it is changed by the user. We can't |
1084 | use it until the next reboot. */ | 1083 | use it until the next reboot. */ |
diff --git a/apps/tree.h b/apps/tree.h index 0d783b4b0e..96cb712a1a 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -67,8 +67,8 @@ struct tree_context { | |||
67 | bool dirfull; | 67 | bool dirfull; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | void tree_init(void); | 70 | void tree_mem_init(void); |
71 | void browse_root(void); | 71 | void tree_gui_init(void); |
72 | void get_current_file(char* buffer, int buffer_len); | 72 | void get_current_file(char* buffer, int buffer_len); |
73 | int rockbox_browse(const char *root, int dirfilter); | 73 | int rockbox_browse(const char *root, int dirfilter); |
74 | bool create_playlist(void); | 74 | bool create_playlist(void); |