summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2018-12-16 19:33:51 +0100
committerMarcus Meissner <marcus@jet.franken.de>2018-12-16 19:33:51 +0100
commita938dcf0c99166d80a5ea2870631efce7cf3cd19 (patch)
treeda685033c513fd7084f2a6ce565e74b4081ab40c
parentefde6b68fbac1c24677e5b0b036667cba2e3003d (diff)
downloadlibgphoto2-a938dcf0c99166d80a5ea2870631efce7cf3cd19.tar.gz
added powerzoomspeed, uint32
-rw-r--r--camlibs/ptp2/config.c1
-rw-r--r--camlibs/ptp2/ptp-pack.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index 454ba14d4..46ab0e428 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -8186,6 +8186,7 @@ static struct submenu capture_settings_menu[] = {
{ N_("Auto Focus Mode 2"), "autofocusmode2", PTP_DPC_NIKON_A4AFActivation, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_Nikon_OnOff_UINT8 },
{ N_("Zoom"), "zoom", PTP_DPC_CANON_Zoom, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_ZoomRange, _put_Canon_ZoomRange },
{ N_("Zoom"), "zoom", PTP_DPC_CANON_EOS_PowerZoomPosition, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_INT, _put_INT },
+ { N_("Zoom Speed"), "zoomspeed", PTP_DPC_CANON_EOS_PowerZoomSpeed, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_INT, _put_INT },
{ N_("Assist Light"), "assistlight", PTP_DPC_CANON_AssistLight, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_AssistLight, _put_Canon_AssistLight },
{ N_("Rotation Flag"), "autorotation", PTP_DPC_CANON_RotationScene, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_AutoRotation, _put_Canon_AutoRotation },
{ N_("Self Timer"), "selftimer", PTP_DPC_CANON_SelfTime, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_SelfTimer, _put_Canon_SelfTimer },
diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c
index 47ed03ad8..70a36a4d4 100644
--- a/camlibs/ptp2/ptp-pack.c
+++ b/camlibs/ptp2/ptp-pack.c
@@ -2228,6 +2228,7 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize,
case PTP_DPC_CANON_EOS_MirrorUpSetting:
case PTP_DPC_CANON_EOS_OLCInfoVersion:
case PTP_DPC_CANON_EOS_PowerZoomPosition:
+ case PTP_DPC_CANON_EOS_PowerZoomSpeed:
dpd->DataType = PTP_DTC_UINT32;
break;
/* enumeration for AEM is never provided, but is available to set */