X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fandroid%2Fcamera%2FAutoFocusCallback.java;h=1e3f199ffe04223fd0eb1bfe8c23d854f8c36c27;hb=0a06a7e84233ebec1f07fa05d7853783a1723e46;hp=2af5f4d631a1d78cde139c011c6aaf337d082662;hpb=798a85a93d6f7129fc5a5beb958c0dc307f1a11b;p=zxing.git diff --git a/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java b/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java index 2af5f4d6..1e3f199f 100644 --- a/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java +++ b/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java @@ -27,15 +27,9 @@ final class AutoFocusCallback implements Camera.AutoFocusCallback { private static final long AUTOFOCUS_INTERVAL_MS = 1500L; - private final CameraConfigurationManager configManager; - private boolean reinitCamera; private Handler autoFocusHandler; private int autoFocusMessage; - AutoFocusCallback(CameraConfigurationManager configManager) { - this.configManager = configManager; - } - void setHandler(Handler autoFocusHandler, int autoFocusMessage) { this.autoFocusHandler = autoFocusHandler; this.autoFocusMessage = autoFocusMessage; @@ -46,15 +40,11 @@ final class AutoFocusCallback implements Camera.AutoFocusCallback { Message message = autoFocusHandler.obtainMessage(autoFocusMessage, success); // Simulate continuous autofocus by sending a focus request every // AUTOFOCUS_INTERVAL_MS milliseconds. - Log.v(TAG, "Got auto-focus callback; requesting another"); + //Log.d(TAG, "Got auto-focus callback; requesting another"); autoFocusHandler.sendMessageDelayed(message, AUTOFOCUS_INTERVAL_MS); autoFocusHandler = null; - if (!reinitCamera) { - reinitCamera = true; - configManager.setDesiredCameraParameters(camera); - } } else { - Log.v(TAG, "Got auto-focus callback, but no handler for it"); + Log.d(TAG, "Got auto-focus callback, but no handler for it"); } }