diff options
author | Michiel Van Der Kolk <not.valid@email.address> | 2005-07-04 22:10:42 +0000 |
---|---|---|
committer | Michiel Van Der Kolk <not.valid@email.address> | 2005-07-04 22:10:42 +0000 |
commit | d6ab723584a34efc0d9bf8baa2582b77ca5ab18c (patch) | |
tree | 0a06ccd72689ecdf31b891b1a8f980124d1ee41d /apps | |
parent | afe0941ae5ae8f5e69d7b3935db1b168da8c14fd (diff) | |
download | rockbox-d6ab723584a34efc0d9bf8baa2582b77ca5ab18c.tar.gz 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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main.c | 5 | ||||
-rw-r--r-- | apps/tree.c | 1 |
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) | |||
263 | status_init(); | 263 | status_init(); |
264 | playlist_init(); | 264 | playlist_init(); |
265 | tree_init(); | 265 | tree_init(); |
266 | 266 | ||
267 | /* No buffer allocation (see buffer.c) may take place after the call to | 267 | /* No buffer allocation (see buffer.c) may take place after the call to |
268 | audio_init() since the mpeg thread takes the rest of the buffer space */ | 268 | audio_init() since the mpeg thread takes the rest of the buffer space */ |
269 | mp3_init( global_settings.volume, | 269 | mp3_init( global_settings.volume, |
@@ -289,6 +289,9 @@ void init(void) | |||
289 | pcm_init_recording(); | 289 | pcm_init_recording(); |
290 | #endif | 290 | #endif |
291 | talk_init(); | 291 | talk_init(); |
292 | /* runtime database has to be initialized after audio_init() */ | ||
293 | rundb_init(); | ||
294 | |||
292 | 295 | ||
293 | #ifdef AUTOROCK | 296 | #ifdef AUTOROCK |
294 | { | 297 | { |
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) | |||
1476 | tc.dirfilter = &global_settings.dirfilter; | 1476 | tc.dirfilter = &global_settings.dirfilter; |
1477 | 1477 | ||
1478 | tagdb_init(); | 1478 | tagdb_init(); |
1479 | rundb_init(); | ||
1480 | 1479 | ||
1481 | tc.name_buffer_size = AVERAGE_FILENAME_LENGTH * max_files; | 1480 | tc.name_buffer_size = AVERAGE_FILENAME_LENGTH * max_files; |
1482 | tc.name_buffer = buffer_alloc(tc.name_buffer_size); | 1481 | tc.name_buffer = buffer_alloc(tc.name_buffer_size); |