fix comments

pull/143/head
xp-vit 8 years ago
parent 2c75e9bd48
commit fb75584aad
  1. 17
      cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java
  2. 1
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java

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

@ -1361,6 +1361,7 @@ public class CameraView extends FrameLayout {
*/
public void setPlaySounds(boolean playSounds) {
mPlaySounds = playSounds && Build.VERSION.SDK_INT >= 16;
mCameraController.setPlaySounds(playSounds);
}
/**

Loading…
Cancel
Save