diff options
Diffstat (limited to 'apps/database.c')
-rw-r--r-- | apps/database.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/apps/database.c b/apps/database.c index 1691e2221b..90cdc37f2c 100644 --- a/apps/database.c +++ b/apps/database.c | |||
@@ -43,7 +43,13 @@ | |||
43 | #include "keyboard.h" | 43 | #include "keyboard.h" |
44 | #include "database.h" | 44 | #include "database.h" |
45 | #include "autoconf.h" | 45 | #include "autoconf.h" |
46 | |||
47 | #if CONFIG_HWCODEC == MASNONE | ||
46 | #include "playback.h" | 48 | #include "playback.h" |
49 | #else | ||
50 | #include "mpeg.h" | ||
51 | #endif | ||
52 | |||
47 | #include "logf.h" | 53 | #include "logf.h" |
48 | 54 | ||
49 | /* internal functions */ | 55 | /* internal functions */ |
@@ -328,9 +334,6 @@ void rundb_buffer_track(struct mp3entry *id, bool last_track) { | |||
328 | 334 | ||
329 | int rundb_init(void) | 335 | int rundb_init(void) |
330 | { | 336 | { |
331 | #if CONFIG_HWCODEC != MASNONE | ||
332 | return -1; | ||
333 | #else | ||
334 | unsigned char* ptr = (char*)&rundbheader.version; | 337 | unsigned char* ptr = (char*)&rundbheader.version; |
335 | #ifdef ROCKBOX_LITTLE_ENDIAN | 338 | #ifdef ROCKBOX_LITTLE_ENDIAN |
336 | int i, *p; | 339 | int i, *p; |
@@ -376,17 +379,13 @@ int rundb_init(void) | |||
376 | } | 379 | } |
377 | 380 | ||
378 | rundb_initialized = 1; | 381 | rundb_initialized = 1; |
379 | /* hooks disabled for archos, rendering the runtime database not working, | ||
380 | * re enable when these callbacks are implemented in mpeg.c */ | ||
381 | #if CONFIG_HWCODEC == MASNONE | ||
382 | audio_set_track_buffer_event(&rundb_buffer_track); | 382 | audio_set_track_buffer_event(&rundb_buffer_track); |
383 | audio_set_track_changed_event(&rundb_track_change); | 383 | audio_set_track_changed_event(&rundb_track_change); |
384 | audio_set_track_unbuffer_event(&rundb_unbuffer_track); | 384 | audio_set_track_unbuffer_event(&rundb_unbuffer_track); |
385 | logf("rundb inited."); | 385 | logf("rundb inited."); |
386 | #endif | 386 | |
387 | rundbsize=lseek(rundb_fd,0,SEEK_END); | 387 | rundbsize=lseek(rundb_fd,0,SEEK_END); |
388 | return 0; | 388 | return 0; |
389 | #endif | ||
390 | } | 389 | } |
391 | 390 | ||
392 | void rundb_shutdown(void) | 391 | void rundb_shutdown(void) |
@@ -394,11 +393,9 @@ void rundb_shutdown(void) | |||
394 | if (rundb_fd >= 0) | 393 | if (rundb_fd >= 0) |
395 | close(rundb_fd); | 394 | close(rundb_fd); |
396 | rundb_initialized = 0; | 395 | rundb_initialized = 0; |
397 | #if CONFIG_HWCODEC == MASNONE | ||
398 | audio_set_track_buffer_event(NULL); | 396 | audio_set_track_buffer_event(NULL); |
399 | audio_set_track_unbuffer_event(NULL); | 397 | audio_set_track_unbuffer_event(NULL); |
400 | audio_set_track_changed_event(NULL); | 398 | audio_set_track_changed_event(NULL); |
401 | #endif | ||
402 | } | 399 | } |
403 | 400 | ||
404 | void writerundbheader(void) | 401 | void writerundbheader(void) |