summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichiel Van Der Kolk <not.valid@email.address>2005-07-04 22:10:42 +0000
committerMichiel Van Der Kolk <not.valid@email.address>2005-07-04 22:10:42 +0000
commitd6ab723584a34efc0d9bf8baa2582b77ca5ab18c (patch)
tree0a06ccd72689ecdf31b891b1a8f980124d1ee41d
parentafe0941ae5ae8f5e69d7b3935db1b168da8c14fd (diff)
downloadrockbox-d6ab723584a34efc0d9bf8baa2582b77ca5ab18c.tar.gz
rockbox-d6ab723584a34efc0d9bf8baa2582b77ca5ab18c.tar.bz2
rockbox-d6ab723584a34efc0d9bf8baa2582b77ca5ab18c.zip
moved rundb_init back to main, it has to be inited after audio_init, also, it has nothing to do with tree (though tagdb does have to do with tree)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7014 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c5
-rw-r--r--apps/tree.c1
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/main.c b/apps/main.c
index 513cda1fcb..9b9ab0eb12 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -263,7 +263,7 @@ void init(void)
status_init();
playlist_init();
tree_init();
-
+
/* No buffer allocation (see buffer.c) may take place after the call to
audio_init() since the mpeg thread takes the rest of the buffer space */
mp3_init( global_settings.volume,
@@ -289,6 +289,9 @@ void init(void)
pcm_init_recording();
#endif
talk_init();
+ /* runtime database has to be initialized after audio_init() */
+ rundb_init();
+
#ifdef AUTOROCK
{
diff --git a/apps/tree.c b/apps/tree.c
index 8a2e661264..b2d46389ae 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -1476,7 +1476,6 @@ void tree_init(void)
tc.dirfilter = &global_settings.dirfilter;
tagdb_init();
- rundb_init();
tc.name_buffer_size = AVERAGE_FILENAME_LENGTH * max_files;
tc.name_buffer = buffer_alloc(tc.name_buffer_size);