diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2012-01-04 00:10:47 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2012-01-04 00:10:47 +0000 |
| commit | 0f714756061924b2e7a4f93d5246b83e96220726 (patch) | |
| tree | 952a39f97d22412e97ffdacc033f66a73f5fb483 | |
| parent | 5d9759a76e7e6fc73c89751a1644fc57e1111ec4 (diff) | |
| download | rockbox-0f714756061924b2e7a4f93d5246b83e96220726.zip rockbox-0f714756061924b2e7a4f93d5246b83e96220726.tar.gz rockbox-0f714756061924b2e7a4f93d5246b83e96220726.tar.bz2 rockbox-0f714756061924b2e7a4f93d5246b83e96220726.tar.xz | |
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
| -rw-r--r-- | firmware/drivers/audio/android.c | 6 | ||||
| -rw-r--r-- | 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 8bd0263..ff36ca2 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 e48e910..b3c4cdc 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 */ } |