Try UTC time for EOS Cameras first. (newer EOS)

handle UTCTime and Summertime as uint32


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14976 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2014-06-01 14:09:19 +00:00
parent d650381336
commit 8900612804
2 changed files with 3 additions and 0 deletions

View File

@@ -6156,6 +6156,7 @@ static struct submenu camera_status_menu[] = {
static struct submenu camera_settings_menu[] = {
{ N_("Camera Date and Time"), "datetime", PTP_DPC_CANON_UnixTime, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_UINT32_as_time, _put_UINT32_as_time },
{ N_("Camera Date and Time"), "datetime", PTP_DPC_CANON_EOS_UTCTime, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_UINT32_as_time, _put_UINT32_as_time },
{ N_("Camera Date and Time"), "datetime", PTP_DPC_CANON_EOS_CameraTime, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_UINT32_as_time, _put_UINT32_as_time },
{ N_("Camera Date and Time"), "datetime", PTP_DPC_DateTime, 0, PTP_DTC_STR, _get_STR_as_time, _put_STR_as_time },
{ N_("Beep Mode"), "beep", PTP_DPC_CANON_BeepMode, PTP_VENDOR_CANON, PTP_DTC_UINT8, _get_Canon_BeepMode, _put_Canon_BeepMode },

View File

@@ -1811,6 +1811,8 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize,
/* set DataType */
switch (proptype) {
case PTP_DPC_CANON_EOS_CameraTime:
case PTP_DPC_CANON_EOS_UTCTime:
case PTP_DPC_CANON_EOS_Summertime: /* basical the DST flag */
case PTP_DPC_CANON_EOS_AvailableShots:
case PTP_DPC_CANON_EOS_CaptureDestination:
case PTP_DPC_CANON_EOS_WhiteBalanceXA: