fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

move camera init into a standalone function

Browse Source
This commit is contained in:
tibbi
2017-03-26 12:11:22 +02:00
parent f62f5314f6
commit fa9eb58012
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
View File

@ -123,7 +123,17 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
releaseCamera() releaseCamera()
mCamera = newCamera mCamera = newCamera
if (mCamera != null) { if (initCamera() && mIsVideoMode) {
initRecorder()
}
return true
}
private fun initCamera(): Boolean {
if (mCamera == null)
return false
mParameters = mCamera!!.parameters mParameters = mCamera!!.parameters
mMaxZoom = mParameters!!.maxZoom mMaxZoom = mParameters!!.maxZoom
mZoomRatios = mParameters!!.zoomRatios mZoomRatios = mParameters!!.zoomRatios
@ -134,7 +144,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE))
mParameters!!.focusMode = Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE mParameters!!.focusMode = Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE
mCamera!!.setDisplayOrientation(mActivity.getPreviewRotation(cameraId)) mCamera!!.setDisplayOrientation(mActivity.getPreviewRotation(mCurrCameraId))
mCamera!!.parameters = mParameters mCamera!!.parameters = mParameters
if (mCanTakePicture) { if (mCanTakePicture) {
@ -147,12 +157,6 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
} }
mCallback.setFlashAvailable(hasFlash(mCamera)) mCallback.setFlashAvailable(hasFlash(mCamera))
}
if (mIsVideoMode) {
initRecorder()
}
return true return true
} }