diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-11-17 07:34:00 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-11-17 07:34:00 +0000 |
commit | ee1c231779c2e75c2d267e88ef859209a7c93d9c (patch) | |
tree | 2dadc9eed7e52ce184510b104da818ffbe81774a /apps | |
parent | aeb60e20a30bc53e1fc9bfe605cce167f6fb55b4 (diff) | |
download | rockbox-ee1c231779c2e75c2d267e88ef859209a7c93d9c.tar.gz rockbox-ee1c231779c2e75c2d267e88ef859209a7c93d9c.zip |
move the scrobbler and playlist shutdown/restart calls out of tree.c and move them into the regular usb/shutdown handlers.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19124 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/misc.c | 4 | ||||
-rw-r--r-- | apps/tree.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/apps/misc.c b/apps/misc.c index 02d8bed2d8..9559b0c44f 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -620,6 +620,8 @@ bool settings_parseline(char* line, char** name, char** value) | |||
620 | 620 | ||
621 | static void system_flush(void) | 621 | static void system_flush(void) |
622 | { | 622 | { |
623 | scrobbler_shutdown(); | ||
624 | playlist_shutdown(); | ||
623 | tree_flush(); | 625 | tree_flush(); |
624 | call_storage_idle_notifys(true); /*doesnt work on usb and shutdown from ata thread */ | 626 | call_storage_idle_notifys(true); /*doesnt work on usb and shutdown from ata thread */ |
625 | } | 627 | } |
@@ -627,6 +629,7 @@ static void system_flush(void) | |||
627 | static void system_restore(void) | 629 | static void system_restore(void) |
628 | { | 630 | { |
629 | tree_restore(); | 631 | tree_restore(); |
632 | scrobbler_init(); | ||
630 | } | 633 | } |
631 | 634 | ||
632 | static bool clean_shutdown(void (*callback)(void *), void *parameter) | 635 | static bool clean_shutdown(void (*callback)(void *), void *parameter) |
@@ -915,7 +918,6 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame | |||
915 | (mmc_remove_request() == SYS_HOTSWAP_EXTRACTED)) | 918 | (mmc_remove_request() == SYS_HOTSWAP_EXTRACTED)) |
916 | #endif | 919 | #endif |
917 | { | 920 | { |
918 | scrobbler_flush_cache(); | ||
919 | system_flush(); | 921 | system_flush(); |
920 | #ifdef BOOTFILE | 922 | #ifdef BOOTFILE |
921 | #if !defined(USB_NONE) && !defined(USB_IPODSTYLE) | 923 | #if !defined(USB_NONE) && !defined(USB_IPODSTYLE) |
diff --git a/apps/tree.c b/apps/tree.c index dbc47e31b6..a3765d74d3 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -1085,11 +1085,9 @@ static void ft_play_filename(char *dir, char *file) | |||
1085 | /* These two functions are called by the USB and shutdown handlers */ | 1085 | /* These two functions are called by the USB and shutdown handlers */ |
1086 | void tree_flush(void) | 1086 | void tree_flush(void) |
1087 | { | 1087 | { |
1088 | scrobbler_shutdown(); | ||
1089 | #ifdef HAVE_TAGCACHE | 1088 | #ifdef HAVE_TAGCACHE |
1090 | tagcache_shutdown(); | 1089 | tagcache_shutdown(); |
1091 | #endif | 1090 | #endif |
1092 | playlist_shutdown(); | ||
1093 | 1091 | ||
1094 | #ifdef HAVE_TC_RAMCACHE | 1092 | #ifdef HAVE_TC_RAMCACHE |
1095 | tagcache_unload_ramcache(); | 1093 | tagcache_unload_ramcache(); |
@@ -1141,5 +1139,4 @@ void tree_restore(void) | |||
1141 | #ifdef HAVE_TAGCACHE | 1139 | #ifdef HAVE_TAGCACHE |
1142 | tagcache_start_scan(); | 1140 | tagcache_start_scan(); |
1143 | #endif | 1141 | #endif |
1144 | scrobbler_init(); | ||
1145 | } | 1142 | } |