|
|
@ -180,7 +180,7 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera |
|
|
|
mergeLocation(params, null); |
|
|
|
mergeLocation(params, null); |
|
|
|
mergeWhiteBalance(params, WhiteBalance.DEFAULT); |
|
|
|
mergeWhiteBalance(params, WhiteBalance.DEFAULT); |
|
|
|
mergeHdr(params, Hdr.DEFAULT); |
|
|
|
mergeHdr(params, Hdr.DEFAULT); |
|
|
|
applyPlaySound(); |
|
|
|
mergePlaySound(true); |
|
|
|
params.setRecordingHint(mSessionType == SessionType.VIDEO); |
|
|
|
params.setRecordingHint(mSessionType == SessionType.VIDEO); |
|
|
|
mCamera.setParameters(params); |
|
|
|
mCamera.setParameters(params); |
|
|
|
|
|
|
|
|
|
|
@ -370,14 +370,17 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@TargetApi(17) |
|
|
|
@TargetApi(17) |
|
|
|
private void applyPlaySound() { |
|
|
|
private boolean mergePlaySound(boolean oldPlaySound) { |
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { |
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { |
|
|
|
Camera.CameraInfo info = new Camera.CameraInfo(); |
|
|
|
Camera.CameraInfo info = new Camera.CameraInfo(); |
|
|
|
Camera.getCameraInfo(mCameraId, info); |
|
|
|
Camera.getCameraInfo(mCameraId, info); |
|
|
|
if (info.canDisableShutterSound && isCameraAvailable()) { |
|
|
|
if (info.canDisableShutterSound && isCameraAvailable()) { |
|
|
|
mCamera.enableShutterSound(mPlaySounds); |
|
|
|
mCamera.enableShutterSound(mPlaySounds); |
|
|
|
|
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
mPlaySounds = oldPlaySound; |
|
|
|
|
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -878,8 +881,16 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
void setPlaySounds(boolean playSounds) { |
|
|
|
void setPlaySounds(boolean playSounds) { |
|
|
|
|
|
|
|
final boolean old = mPlaySounds; |
|
|
|
mPlaySounds = playSounds; |
|
|
|
mPlaySounds = playSounds; |
|
|
|
applyPlaySound(); |
|
|
|
schedule(null, true, new Runnable() { |
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
|
|
public void run() { |
|
|
|
|
|
|
|
if (!mergePlaySound(old)) { |
|
|
|
|
|
|
|
mPlaySounds = old; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// -----------------
|
|
|
|
// -----------------
|
|
|
|