From d628e27f561c4bedf0d457f64270fc12740b5280 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Tue, 8 Nov 2011 16:12:32 -0800 Subject: Switch sound playing to use Camera.playSound() Instead of using a few private APIs to properly manage audio output for panorama, effects recording, and focus notification, use the new Camera API for sound playback. Bug: 5447107 Change-Id: I7d5a3d9502f36c199ea75a89e2c6b878185f880f --- src/com/android/camera/Camera.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/com/android/camera/Camera.java') diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 1fad8a8..c768d00 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -384,7 +384,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener, boolean mirror = (info.facing == CameraInfo.CAMERA_FACING_FRONT); mFocusManager.initialize(mFocusIndicator, mPreviewFrame, mFaceView, this, mirror, mDisplayOrientation); - mFocusManager.initializeSoundPlayer(getResources().openRawResourceFd(R.raw.camera_focus)); mImageSaver = new ImageSaver(); Util.initializeScreenBrightness(getWindow(), getContentResolver()); installIntentFilter(); @@ -443,7 +442,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener, mLocationManager.recordLocation(recordLocation); installIntentFilter(); - mFocusManager.initializeSoundPlayer(getResources().openRawResourceFd(R.raw.camera_focus)); mImageSaver = new ImageSaver(); initializeZoom(); keepMediaProviderInstance(); @@ -997,6 +995,11 @@ public class Camera extends ActivityBase implements FocusManager.Listener, setCameraParameters(UPDATE_PARAM_PREFERENCE); } + @Override + public void playSound(int soundId) { + mCameraDevice.playSound(soundId); + } + private boolean saveDataToFile(String filePath, byte[] data) { FileOutputStream f = null; try { @@ -1525,8 +1528,6 @@ public class Camera extends ActivityBase implements FocusManager.Listener, if (mLocationManager != null) mLocationManager.recordLocation(false); updateExposureOnScreenIndicator(0); - mFocusManager.releaseSoundPlayer(); - if (mStorageHint != null) { mStorageHint.cancel(); mStorageHint = null; -- cgit v1.1