From 4fd97158762b4cdd4c73a6e29960e371d9de56e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Sat, 24 Mar 2018 15:45:25 +0100 Subject: Cleanup sound manager class (#7158) * Cleanup sound manager client * Use some const refs * Use auto on iterators * Drop unused parameters * Move sound_openal.* to client folder * Move sound.cpp + OnDemandSoundFetcher to client/ folder + reorganize includes properly --- build/android/jni/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build/android/jni') diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 4f2e788a8..1fa8fb7b0 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -227,8 +227,6 @@ LOCAL_SRC_FILES := \ jni/src/serverobject.cpp \ jni/src/shader.cpp \ jni/src/sky.cpp \ - jni/src/sound.cpp \ - jni/src/sound_openal.cpp \ jni/src/staticobject.cpp \ jni/src/subgame.cpp \ jni/src/tileanimation.cpp \ @@ -280,6 +278,8 @@ LOCAL_SRC_FILES := \ jni/src/client/hud.cpp \ jni/src/client/inputhandler.cpp \ jni/src/client/renderingengine.cpp \ + jni/src/client/sound.cpp \ + jni/src/client/sound_openal.cpp \ jni/src/client/tile.cpp \ jni/src/client/joystick_controller.cpp \ jni/src/client/render/factory.cpp \ -- cgit v1.2.3