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

On canon liveview, enable the viewfinder mode if it is not enabled.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15281 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2014-12-21 18:59:00 +00:00
parent fb683c8296
commit e2ff2a4996
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
camlibs/ptp2/library.c
View File

@@ -2236,13 +2236,23 @@ camera_capture_preview (Camera *camera, CameraFile *file, GPContext *context)
if (!params->eos_captureenabled)
camera_prepare_capture (camera, context);
memset (&dpd,0,sizeof(dpd));
/* do not set it everytime, it will cause delays */
ret = ptp_canon_eos_getdevicepropdesc (params, PTP_DPC_CANON_EOS_EVFMode, &dpd);
if ((ret != PTP_RC_OK) || (dpd.CurrentValue.u16 != 1)) {
/* 0 means off, 1 means on */
val.u16 = 1;
C_PTP_MSG (ptp_canon_eos_setdevicepropvalue (params, PTP_DPC_CANON_EOS_EVFMode, &val, PTP_DTC_UINT16),
"setval of evf enable to 1 failed (curval is %d)!", dpd.CurrentValue.u16);
}
ptp_free_devicepropdesc (&dpd);
/* do not set it everytime, it will cause delays */
ret = ptp_canon_eos_getdevicepropdesc (params, PTP_DPC_CANON_EOS_EVFOutputDevice, &dpd);
if ((ret != PTP_RC_OK) || (dpd.CurrentValue.u32 != 2)) {
/* 2 means PC, 1 means TFT */
val.u32 = 2;
C_PTP_MSG (ptp_canon_eos_setdevicepropvalue (params, PTP_DPC_CANON_EOS_EVFOutputDevice, &val, PTP_DTC_UINT32),
"setval of evf outputmode to 2 failed!");
"setval of evf outputmode to 2 failed (curval is %d)!", dpd.CurrentValue.u32);
}
ptp_free_devicepropdesc (&dpd);