darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merged missed changes too for last patch

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8864 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2006-06-13 13:11:50 +00:00
parent 791f1940cf
commit dc20198880
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
camlibs/ptp2/ptp.c
View File

@@ -2427,11 +2427,35 @@ ptp_get_property_description(PTPParams* params, uint16_t dpc)
N_("Low Light")},
{0,NULL}
};
struct {
uint16_t dpc;
const char *txt;
} ptp_device_properties_MTP[] = {
{PTP_DPC_MTP_SecureTime, N_("Secure Time")},
{PTP_DPC_MTP_DeviceCertificate, N_("Device Certificate")},
{PTP_DPC_MTP_SynchronizationPartner,
N_("Synchronization Partner")},
{PTP_DPC_MTP_DeviceFriendlyName,
N_("Device Friendly Name")},
{PTP_DPC_MTP_VolumeLevel, N_("Volume Level")},
{PTP_DPC_MTP_DeviceIcon, N_("Device Icon")},
{PTP_DPC_MTP_PlaybackRate, N_("Playback Rate")},
{PTP_DPC_MTP_PlaybackObject, N_("Playback Object")},
{PTP_DPC_MTP_PlaybackContainerIndex,
N_("Playback Container Index")},
{PTP_DPC_MTP_PlaybackPosition, N_("Playback Position")},
{0,NULL}
};
for (i=0; ptp_device_properties[i].txt!=NULL; i++)
if (ptp_device_properties[i].dpc==dpc)
return (ptp_device_properties[i].txt);
if (params->deviceinfo.VendorExtensionID==PTP_VENDOR_MICROSOFT)
for (i=0; ptp_device_properties_MTP[i].txt!=NULL; i++)
if (ptp_device_properties_MTP[i].dpc==dpc)
return (ptp_device_properties_MTP[i].txt);
if (params->deviceinfo.VendorExtensionID==PTP_VENDOR_EASTMAN_KODAK)
for (i=0; ptp_device_properties_EK[i].txt!=NULL; i++)
if (ptp_device_properties_EK[i].dpc==dpc)
@@ -2662,7 +2686,6 @@ ptp_render_property_value(PTPParams* params, uint16_t dpc,
PTP_VAL_RBOOL(PTP_DPC_NIKON_BeepOff),
{0, 0, NULL}
};
if (params->deviceinfo.VendorExtensionID==PTP_VENDOR_NIKON) {
int64_t kval;