From e210faff2cc01d8f30f6fed9619874c2bc636255 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 23 May 2020 18:13:47 +0200 Subject: translate all known PTP errors into strings --- camlibs/ptp2/ptp.c | 76 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 20 deletions(-) diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c index 509e26985..2b00e1ae9 100644 --- a/camlibs/ptp2/ptp.c +++ b/camlibs/ptp2/ptp.c @@ -5129,31 +5129,67 @@ static struct { {PTP_RC_SessionAlreadyOpened, 0, N_("PTP Session Already Opened")}, {PTP_RC_TransactionCanceled, 0, N_("PTP Transaction Canceled")}, {PTP_RC_SpecificationOfDestinationUnsupported, 0, N_("PTP Specification Of Destination Unsupported")}, + {PTP_RC_InvalidEnumHandle, 0, N_("Invalid Enum Handle")}, + {PTP_RC_NoStreamEnabled, 0, N_("No Stream Enabled")}, + {PTP_RC_InvalidDataSet, 0, N_("Invalid Data Set")}, {PTP_RC_EK_FilenameRequired, PTP_VENDOR_EASTMAN_KODAK, N_("Filename Required")}, {PTP_RC_EK_FilenameConflicts, PTP_VENDOR_EASTMAN_KODAK, N_("Filename Conflicts")}, {PTP_RC_EK_FilenameInvalid, PTP_VENDOR_EASTMAN_KODAK, N_("Filename Invalid")}, - {PTP_RC_NIKON_HardwareError, PTP_VENDOR_NIKON, N_("Hardware Error")}, - {PTP_RC_NIKON_OutOfFocus, PTP_VENDOR_NIKON, N_("Out of Focus")}, - {PTP_RC_NIKON_ChangeCameraModeFailed, PTP_VENDOR_NIKON, N_("Change Camera Mode Failed")}, - {PTP_RC_NIKON_InvalidStatus, PTP_VENDOR_NIKON, N_("Invalid Status")}, - {PTP_RC_NIKON_SetPropertyNotSupported, PTP_VENDOR_NIKON, N_("Set Property Not Supported")}, - {PTP_RC_NIKON_WbResetError, PTP_VENDOR_NIKON, N_("Whitebalance Reset Error")}, - {PTP_RC_NIKON_DustReferenceError, PTP_VENDOR_NIKON, N_("Dust Reference Error")}, - {PTP_RC_NIKON_ShutterSpeedBulb, PTP_VENDOR_NIKON, N_("Shutter Speed Bulb")}, - {PTP_RC_NIKON_MirrorUpSequence, PTP_VENDOR_NIKON, N_("Mirror Up Sequence")}, - {PTP_RC_NIKON_CameraModeNotAdjustFNumber, PTP_VENDOR_NIKON, N_("Camera Mode Not Adjust FNumber")}, - {PTP_RC_NIKON_NotLiveView, PTP_VENDOR_NIKON, N_("Not in Liveview")}, - {PTP_RC_NIKON_MfDriveStepEnd, PTP_VENDOR_NIKON, N_("Mf Drive Step End")}, - {PTP_RC_NIKON_MfDriveStepInsufficiency, PTP_VENDOR_NIKON, N_("Mf Drive Step Insufficiency")}, - {PTP_RC_NIKON_AdvancedTransferCancel, PTP_VENDOR_NIKON, N_("Advanced Transfer Cancel")}, - - {PTP_RC_CANON_UNKNOWN_COMMAND, PTP_VENDOR_CANON, N_("Unknown Command")}, - {PTP_RC_CANON_OPERATION_REFUSED,PTP_VENDOR_CANON, N_("Operation Refused")}, - {PTP_RC_CANON_LENS_COVER, PTP_VENDOR_CANON, N_("Lens Cover Present")}, - {PTP_RC_CANON_BATTERY_LOW, PTP_VENDOR_CANON, N_("Battery Low")}, - {PTP_RC_CANON_NOT_READY, PTP_VENDOR_CANON, N_("Camera Not Ready")}, + {PTP_RC_NIKON_HardwareError, PTP_VENDOR_NIKON, N_("Hardware Error")}, + {PTP_RC_NIKON_OutOfFocus, PTP_VENDOR_NIKON, N_("Out of Focus")}, + {PTP_RC_NIKON_ChangeCameraModeFailed, PTP_VENDOR_NIKON, N_("Change Camera Mode Failed")}, + {PTP_RC_NIKON_InvalidStatus, PTP_VENDOR_NIKON, N_("Invalid Status")}, + {PTP_RC_NIKON_SetPropertyNotSupported, PTP_VENDOR_NIKON, N_("Set Property Not Supported")}, + {PTP_RC_NIKON_WbResetError, PTP_VENDOR_NIKON, N_("Whitebalance Reset Error")}, + {PTP_RC_NIKON_DustReferenceError, PTP_VENDOR_NIKON, N_("Dust Reference Error")}, + {PTP_RC_NIKON_ShutterSpeedBulb, PTP_VENDOR_NIKON, N_("Shutter Speed Bulb")}, + {PTP_RC_NIKON_MirrorUpSequence, PTP_VENDOR_NIKON, N_("Mirror Up Sequence")}, + {PTP_RC_NIKON_CameraModeNotAdjustFNumber, PTP_VENDOR_NIKON, N_("Camera Mode Not Adjust FNumber")}, + {PTP_RC_NIKON_NotLiveView, PTP_VENDOR_NIKON, N_("Not in Liveview")}, + {PTP_RC_NIKON_MfDriveStepEnd, PTP_VENDOR_NIKON, N_("Mf Drive Step End")}, + {PTP_RC_NIKON_MfDriveStepInsufficiency, PTP_VENDOR_NIKON, N_("Mf Drive Step Insufficiency")}, + {PTP_RC_NIKON_AdvancedTransferCancel, PTP_VENDOR_NIKON, N_("Advanced Transfer Cancel")}, + {PTP_RC_NIKON_NoFullHDPresent, PTP_VENDOR_NIKON, N_("No Full HD Present")}, + {PTP_RC_NIKON_StoreError, PTP_VENDOR_NIKON, N_("Store Error")}, + {PTP_RC_NIKON_StoreUnformatted, PTP_VENDOR_NIKON, N_("Store Unformatted")}, + {PTP_RC_NIKON_Bulb_Release_Busy, PTP_VENDOR_NIKON, N_("Bulb Release Busy")}, + {PTP_RC_NIKON_Silent_Release_Busy, PTP_VENDOR_NIKON, N_("Silent Release Busy")}, + {PTP_RC_NIKON_MovieFrame_Release_Busy, PTP_VENDOR_NIKON, N_("MovieFrame Release Busy")}, + {PTP_RC_NIKON_Shutter_Speed_Time, PTP_VENDOR_NIKON, N_("Shutter Speed Time")}, + {PTP_RC_NIKON_Waiting_2ndRelease, PTP_VENDOR_NIKON, N_("Waiting for 2nd Release")}, + {PTP_RC_NIKON_MirrorUpCapture_Already_Start, PTP_VENDOR_NIKON, N_("MirrorUpCapture Already Started")}, + {PTP_RC_NIKON_Invalid_SBAttribute_Value, PTP_VENDOR_NIKON, N_("Invalid SBAttribute Value")}, + + {PTP_RC_CANON_UNKNOWN_COMMAND, PTP_VENDOR_CANON, N_("Unknown Command")}, + {PTP_RC_CANON_OPERATION_REFUSED, PTP_VENDOR_CANON, N_("Operation Refused")}, + {PTP_RC_CANON_LENS_COVER, PTP_VENDOR_CANON, N_("Lens Cover Present")}, + {PTP_RC_CANON_BATTERY_LOW, PTP_VENDOR_CANON, N_("Battery Low")}, + {PTP_RC_CANON_NOT_READY, PTP_VENDOR_CANON, N_("Camera Not Ready")}, + {PTP_RC_CANON_EOS_UnknownCommand, PTP_VENDOR_CANON, N_("Unknown Command")}, + {PTP_RC_CANON_EOS_OperationRefused, PTP_VENDOR_CANON, N_("Operation Refused")}, + {PTP_RC_CANON_EOS_LensCoverClosed, PTP_VENDOR_CANON, N_("Lens Cover Closed")}, + {PTP_RC_CANON_EOS_LowBattery, PTP_VENDOR_CANON, N_("Low Battery")}, + {PTP_RC_CANON_EOS_ObjectNotReady, PTP_VENDOR_CANON, N_("Object Not Ready")}, + {PTP_RC_CANON_EOS_CannotMakeObject, PTP_VENDOR_CANON, N_("Cannot Make Object")}, + {PTP_RC_CANON_EOS_MemoryStatusNotReady, PTP_VENDOR_CANON, N_("Memory Status Not Ready")}, + + {PTP_RC_MTP_Undefined, 0, N_("Undefined")}, + {PTP_RC_MTP_Invalid_ObjectPropCode, 0, N_("Invalid ObjectPropCode")}, + {PTP_RC_MTP_Invalid_ObjectProp_Format, 0, N_("Invalid ObjectProp Format")}, + {PTP_RC_MTP_Invalid_ObjectProp_Value, 0, N_("Invalid ObjectProp Value")}, + {PTP_RC_MTP_Invalid_ObjectReference, 0, N_("Invalid ObjectReference")}, + {PTP_RC_MTP_Invalid_Dataset, 0, N_("Invalid Dataset")}, + {PTP_RC_MTP_Specification_By_Group_Unsupported, 0, N_("Specification By Group Unsupported")}, + {PTP_RC_MTP_Specification_By_Depth_Unsupported, 0, N_("Specification By Depth Unsupported")}, + {PTP_RC_MTP_Object_Too_Large, 0, N_("Object Too Large")}, + {PTP_RC_MTP_ObjectProp_Not_Supported, 0, N_("ObjectProp Not Supported")}, + {PTP_RC_MTP_Invalid_Media_Session_ID, 0, N_("Invalid Media Session ID")}, + {PTP_RC_MTP_Media_Session_Limit_Reached, 0, N_("Media Session Limit Reached")}, + {PTP_RC_MTP_No_More_Data, 0, N_("No More Data")}, + {PTP_RC_MTP_Invalid_WFC_Syntax, 0, N_("Invalid WFC Syntax")}, + {PTP_RC_MTP_WFC_Version_Not_Supported, 0, N_("WFC Version Not Supported")}, {PTP_ERROR_NODEVICE, 0, N_("PTP No Device")}, {PTP_ERROR_TIMEOUT, 0, N_("PTP Timeout")}, -- cgit v1.2.1