darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adjust the focus mode handling for sony even more

Browse Source 
If the mode is not manual, do the focus waiting.

https://github.com/gphoto/gphoto2/issues/268
This commit is contained in:
Marcus Meissner
2019-12-02 17:53:54 +01:00
parent 30d712a649
commit 88cefc5073
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
camlibs/ptp2/library.c
View File

@@ -4238,7 +4238,7 @@ camera_sony_capture (Camera *camera, CameraCaptureType type, CameraFilePath *pat
/* Check if we are in manual focus to skip the wait for focus */
C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_FocusMode, &dpd));
if (dpd.CurrentValue.u16 == 2) {
if (dpd.CurrentValue.u16 != 1) { /* 1 is Manual .. no need to wait there for focusing */
/* Now hold down the shutter button for a bit. We probably need to hold it as long as it takes to
* get focus, indicated by the 0xD213 property. But hold it for at most 1 second.
@@ -5442,8 +5442,7 @@ camera_trigger_capture (Camera *camera, GPContext *context)
/* Wait for focus only in automatic focus mode */
C_PTP (ptp_generic_getdevicepropdesc (params, PTP_DPC_FocusMode, &dpd));
if (dpd.CurrentValue.u16 == 2) {
if (dpd.CurrentValue.u16 != 1) { /* 1 is Manual .. no need to wait there for focusing */
/* Now hold down the shutter button for a bit. We probably need to hold it as long as it takes to
* get focus, indicated by the 0xD213 property. But hold it for at most 1 second.
*/