ptp2: shorten 3 overly long EOS property names (remove "Setting" substr)

This commit is contained in:
axxel
2024-09-23 11:24:28 +02:00
committed by Marcus Meissner
parent 18b910932b
commit b3aa6fc607
4 changed files with 8 additions and 8 deletions

View File

@@ -11114,7 +11114,7 @@ static struct submenu capture_settings_menu[] = {
{ N_("Aspect Ratio"), "aspectratio", PTP_DPC_CANON_EOS_MultiAspect, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_EOS_AspectRatio, _put_Canon_EOS_AspectRatio },
{ N_("AF Method"), "afmethod", PTP_DPC_CANON_EOS_LvAfSystem, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_EOS_AFMethod, _put_Canon_EOS_AFMethod },
{ N_("Storage Device"), "storageid", PTP_DPC_CANON_EOS_CurrentStorage, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_EOS_StorageID , _put_Canon_EOS_StorageID },
{ N_("High ISO Noise Reduction"), "highisonr", PTP_DPC_CANON_EOS_HighISOSettingNoiseReduction, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_EOS_HighIsoNr, _put_Canon_EOS_HighIsoNr },
{ N_("High ISO Noise Reduction"), "highisonr", PTP_DPC_CANON_EOS_HighISONoiseReduction,PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_EOS_HighIsoNr, _put_Canon_EOS_HighIsoNr },
{ N_("HDR Mode"), "hdrmode", PTP_DPC_NIKON_HDRMode, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_Nikon_OnOff_UINT8 },
{ N_("HDR High Dynamic"), "hdrhighdynamic", PTP_DPC_NIKON_HDRHighDynamic, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_HDRHighDynamic, _put_Nikon_HDRHighDynamic },
{ N_("HDR Smoothing"), "hdrsmoothing", PTP_DPC_NIKON_HDRSmoothing, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_HDRSmoothing, _put_Nikon_HDRSmoothing },

View File

@@ -2416,7 +2416,7 @@ ptp_unpack_CANON_changes (PTPParams *params, const unsigned char* data, unsigned
case PTP_DPC_CANON_EOS_QuickReviewTime:
case PTP_DPC_CANON_EOS_EVFMode:
case PTP_DPC_CANON_EOS_EVFRecordStatus:
case PTP_DPC_CANON_EOS_HighISOSettingNoiseReduction:
case PTP_DPC_CANON_EOS_HighISONoiseReduction:
dpd->DataType = PTP_DTC_UINT16;
break;
case PTP_DPC_CANON_EOS_PictureStyle:

View File

@@ -6365,7 +6365,7 @@ ptp_get_property_description(PTPParams* params, uint32_t dpc)
{PTP_DPC_CANON_EOS_ImageFormatExtHD,"EOS_ImageFormatExtHD"},
{PTP_DPC_CANON_EOS_RefocusState,"EOS_RefocusState"},
{PTP_DPC_CANON_EOS_CameraNickname,"EOS_CameraNickname"},
{PTP_DPC_CANON_EOS_StroboSettingExpCompositionControl,"EOS_StroboSettingExpCompositionControl"},
{PTP_DPC_CANON_EOS_StroboExpCompositionControl,"EOS_StroboExpCompositionControl"},
{PTP_DPC_CANON_EOS_ConnectStatus,"EOS_ConnectStatus"},
{PTP_DPC_CANON_EOS_LensBarrelStatus,"EOS_LensBarrelStatus"},
{PTP_DPC_CANON_EOS_SilentShutterSetting,"EOS_SilentShutterSetting"},
@@ -6435,7 +6435,7 @@ ptp_get_property_description(PTPParams* params, uint32_t dpc)
{PTP_DPC_CANON_EOS_NetworkCommunicationMode,"EOS_NetworkCommunicationMode"},
{PTP_DPC_CANON_EOS_CanonLogGamma,"EOS_CanonLogGamma"},
{PTP_DPC_CANON_EOS_SmartphoneShowImageConfig,"EOS_SmartphoneShowImageConfig"},
{PTP_DPC_CANON_EOS_HighISOSettingNoiseReduction,"EOS_HighISOSettingNoiseReduction"},
{PTP_DPC_CANON_EOS_HighISONoiseReduction,"EOS_HighISONoiseReduction"},
{PTP_DPC_CANON_EOS_MovieServoAF,"EOS_MovieServoAF"},
{PTP_DPC_CANON_EOS_ContinuousAFValid,"EOS_ContinuousAFValid"},
{PTP_DPC_CANON_EOS_Attenuator,"EOS_Attenuator"},
@@ -6516,7 +6516,7 @@ ptp_get_property_description(PTPParams* params, uint32_t dpc)
{PTP_DPC_CANON_EOS_StroboETTL2Metering,"EOS_StroboETTL2Metering"},
{PTP_DPC_CANON_EOS_ContinousAFMode,"EOS_ContinousAFMode"},
{PTP_DPC_CANON_EOS_MovieParam2,"EOS_MovieParam2"},
{PTP_DPC_CANON_EOS_StroboSettingExpComposition,"EOS_StroboSettingExpComposition"},
{PTP_DPC_CANON_EOS_StroboExpComposition,"EOS_StroboExpComposition"},
{PTP_DPC_CANON_EOS_MovieParam3,"EOS_MovieParam3"},
{PTP_DPC_CANON_EOS_MovieParam4,"EOS_MovieParam4"},
{PTP_DPC_CANON_EOS_LVMedicalRotate,"EOS_LVMedicalRotate"},

View File

@@ -2081,7 +2081,7 @@ typedef struct _PTPCanonEOSDeviceInfo {
#define PTP_DPC_CANON_EOS_ImageFormatExtHD 0xD123 /* file setting exthd */
#define PTP_DPC_CANON_EOS_RefocusState 0xD124
#define PTP_DPC_CANON_EOS_CameraNickname 0xD125
#define PTP_DPC_CANON_EOS_StroboSettingExpCompositionControl 0xD126
#define PTP_DPC_CANON_EOS_StroboExpCompositionControl 0xD126
#define PTP_DPC_CANON_EOS_ConnectStatus 0xD127
#define PTP_DPC_CANON_EOS_LensBarrelStatus 0xD128
#define PTP_DPC_CANON_EOS_SilentShutterSetting 0xD129
@@ -2151,7 +2151,7 @@ typedef struct _PTPCanonEOSDeviceInfo {
#define PTP_DPC_CANON_EOS_NetworkCommunicationMode 0xD175
#define PTP_DPC_CANON_EOS_CanonLogGamma 0xD176
#define PTP_DPC_CANON_EOS_SmartphoneShowImageConfig 0xD177
#define PTP_DPC_CANON_EOS_HighISOSettingNoiseReduction 0xD178
#define PTP_DPC_CANON_EOS_HighISONoiseReduction 0xD178
#define PTP_DPC_CANON_EOS_MovieServoAF 0xD179
#define PTP_DPC_CANON_EOS_ContinuousAFValid 0xD17A
#define PTP_DPC_CANON_EOS_Attenuator 0xD17B
@@ -2232,7 +2232,7 @@ typedef struct _PTPCanonEOSDeviceInfo {
#define PTP_DPC_CANON_EOS_StroboETTL2Metering 0xD1C8
#define PTP_DPC_CANON_EOS_ContinousAFMode 0xD1C9
#define PTP_DPC_CANON_EOS_MovieParam2 0xD1CA
#define PTP_DPC_CANON_EOS_StroboSettingExpComposition 0xD1CB
#define PTP_DPC_CANON_EOS_StroboExpComposition 0xD1CB
#define PTP_DPC_CANON_EOS_MovieParam3 0xD1CC
#define PTP_DPC_CANON_EOS_MovieParam4 0xD1CD
#define PTP_DPC_CANON_EOS_LVMedicalRotate 0xD1CF