diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2014-11-29 12:55:31 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2014-11-29 12:55:31 +0000 |
| commit | 7544f127a01741101f276e27f8d348f7abcf8f43 (patch) | |
| tree | f43509bc4230e5c119bbd87e2b6216a67bb7bf6b | |
| parent | a44e9401bb1d0c41c1fa30a631a528755bd715f0 (diff) | |
| download | libgphoto2-7544f127a01741101f276e27f8d348f7abcf8f43.tar.gz | |
try hooking up focusarea... does not seem to work
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15251 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | camlibs/ptp2/config.c | 3 | ||||
| -rw-r--r-- | camlibs/ptp2/ptp-pack.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index eb5a50c9a..a70dd9c17 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -6230,7 +6230,8 @@ static struct submenu camera_settings_menu[] = { { N_("Clean Sensor"), "cleansensor", PTP_DPC_NIKON_CleanImageSensor, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_CleanSensor, _put_Nikon_CleanSensor }, { N_("Flicker Reduction"), "flickerreduction", PTP_DPC_NIKON_FlickerReduction, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_FlickerReduction, _put_Nikon_FlickerReduction }, { N_("Custom Functions Ex"), "customfuncex", PTP_DPC_CANON_EOS_CustomFuncEx, PTP_VENDOR_CANON, PTP_DTC_STR, _get_STR, _put_STR }, - { N_("Focus Info Ex"), "focusinfo", PTP_DPC_CANON_EOS_FocusInfoEx, PTP_VENDOR_CANON, PTP_DTC_STR, _get_STR, _put_None }, + { N_("Focus Info"), "focusinfo", PTP_DPC_CANON_EOS_FocusInfoEx, PTP_VENDOR_CANON, PTP_DTC_STR, _get_STR, _put_None }, + { N_("Focus Area"), "focusarea", PTP_DPC_CANON_EOS_AFSelectFocusArea,PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_INT, _put_INT }, { N_("Auto Power Off"), "autopoweroff", PTP_DPC_CANON_EOS_AutoPowerOff, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_INT, _put_INT }, { N_("Depth of Field"), "depthoffield", PTP_DPC_CANON_EOS_DepthOfFieldPreview, PTP_VENDOR_CANON,PTP_DTC_UINT32, _get_INT, _put_INT }, { N_("Menus and Playback"), "menusandplayback", PTP_DPC_NIKON_MenusAndPlayback, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_MenusAndPlayback, _put_Nikon_MenusAndPlayback }, diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index f6c81e0aa..e9e40ea73 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -1939,6 +1939,7 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, case PTP_DPC_CANON_EOS_ModelID: case PTP_DPC_CANON_EOS_LensID: case PTP_DPC_CANON_EOS_StroboFiring: + case PTP_DPC_CANON_EOS_AFSelectFocusArea: dpd->DataType = PTP_DTC_UINT32; break; /* enumeration for AEM is never provided, but is available to set */ |