summaryrefslogtreecommitdiff
path: root/camlibs/ptp2/ptp-pack.c
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2021-02-07 11:45:33 +0100
committerMarcus Meissner <marcus@jet.franken.de>2021-02-07 11:45:33 +0100
commit5ece5a9c8e077b0c220957dc9ae515de8c9b3b4b (patch)
tree433c9f1dc3e00f11bead993f94ed456f05acd241 /camlibs/ptp2/ptp-pack.c
parent5a0f8cd04399963b07db86f6193a9ae3af3c28d2 (diff)
downloadlibgphoto2-5ece5a9c8e077b0c220957dc9ae515de8c9b3b4b.tar.gz
move some enums to their known places, eos cameranickname is a string
Diffstat (limited to 'camlibs/ptp2/ptp-pack.c')
-rw-r--r--camlibs/ptp2/ptp-pack.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c
index d7b4955e9..b8e95abcb 100644
--- a/camlibs/ptp2/ptp-pack.c
+++ b/camlibs/ptp2/ptp-pack.c
@@ -2310,6 +2310,10 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, unsigned int d
case PTP_DPC_CANON_EOS_ColorTemperature:
case PTP_DPC_CANON_EOS_FixedMovie:
case PTP_DPC_CANON_EOS_AutoPowerOff:
+ case PTP_DPC_CANON_EOS_AloMode:
+ case PTP_DPC_CANON_EOS_LvViewTypeSelect:
+ case PTP_DPC_CANON_EOS_EVFColorTemp:
+ case PTP_DPC_CANON_EOS_LvAfSystem:
dpd->DataType = PTP_DTC_UINT32;
break;
/* enumeration for AEM is never provided, but is available to set */
@@ -2348,6 +2352,7 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, unsigned int d
case PTP_DPC_CANON_EOS_Copyright:
case PTP_DPC_CANON_EOS_SerialNumber:
case PTP_DPC_CANON_EOS_LensName:
+ case PTP_DPC_CANON_EOS_CameraNickname:
dpd->DataType = PTP_DTC_STR;
break;
case PTP_DPC_CANON_EOS_WhiteBalanceAdjustA:
@@ -2389,13 +2394,9 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, unsigned int d
case PTP_DPC_CANON_EOS_EVFSharpness:
case PTP_DPC_CANON_EOS_EVFWBMode:
case PTP_DPC_CANON_EOS_EVFClickWBCoeffs:
- case PTP_DPC_CANON_EOS_EVFColorTemp:
case PTP_DPC_CANON_EOS_ExposureSimMode:
- case PTP_DPC_CANON_EOS_LvAfSystem:
case PTP_DPC_CANON_EOS_MovSize:
case PTP_DPC_CANON_EOS_DepthOfField:
- case PTP_DPC_CANON_EOS_LvViewTypeSelect:
- case PTP_DPC_CANON_EOS_AloMode:
case PTP_DPC_CANON_EOS_Brightness:
case PTP_DPC_CANON_EOS_GPSLogCtrl:
case PTP_DPC_CANON_EOS_GPSDeviceActive: