From 0f714756061924b2e7a4f93d5246b83e96220726 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Wed, 4 Jan 2012 00:10:47 +0000 Subject: android: move pcm_shutdown() to audiohw_close() now that it's properly called from powermgmt. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31551 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/audio/android.c | 6 +++++- firmware/target/hosted/android/system-android.c | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/firmware/drivers/audio/android.c b/firmware/drivers/audio/android.c index 8bd026320c..ff36ca21d9 100644 --- a/firmware/drivers/audio/android.c +++ b/firmware/drivers/audio/android.c @@ -60,4 +60,8 @@ void audiohw_set_balance(int balance) (void)balance; } -void audiohw_close(void) {} +void audiohw_close(void) +{ + extern void pcm_shutdown(void); + pcm_shutdown(); +} diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c index e48e910c0c..b3c4cdccb5 100644 --- a/firmware/target/hosted/android/system-android.c +++ b/firmware/target/hosted/android/system-android.c @@ -38,7 +38,6 @@ uintptr_t *stackend; extern int main(void); extern void telephony_init_device(void); -extern void pcm_shutdown(void); void system_exception_wait(void) { } void system_reboot(void) { } @@ -93,8 +92,6 @@ Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this) main(); } - - pcm_shutdown(); /* simply return here. this will allow the VM to clean up objects and do * garbage collection */ } -- cgit v1.2.3