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

added simple nikon_getptpipinfo function, fixed typo

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8438 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2006-01-09 05:20:28 +00:00
parent 9214b4a635
commit d39c3fe52f
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
camlibs/ptp2/ptp.c
View File

@@ -1696,6 +1696,29 @@ ptp_nikon_device_ready (PTPParams* params)
return ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL);
}
/**
* ptp_nikon_getptpipinfo:
*
* This command gets the ptpip info data.
*
* params: PTPParams*
* unsigned char *data - data
* unsigned int size - size of returned data
*
* Return values: Some PTP_RC_* code.
*
**/
uint16_t
ptp_nikon_getptpipinfo (PTPParams* params, unsigned char **data, unsigned int *size)
{
PTPContainer ptp;
PTP_CNT_INIT(ptp);
ptp.Code=PTP_OC_NIKON_GetDevicePTPIPInfo;
ptp.Nparam=0;
return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
}
/* Non PTP protocol functions */
/* devinfo testing functions */
@@ -2246,7 +2269,7 @@ ptp_render_property_value(PTPParams* params, uint16_t dpc,
{PTP_DPC_CompressionSetting, 4, N_("RAW")},
{PTP_DPC_CompressionSetting, 5, N_("RAW + JPEG Basic")},
{PTP_DPC_WhiteBalance, 2, N_("Auto")},
{PTP_DPC_WhiteBalance, 6, N_("Incadescent")},
{PTP_DPC_WhiteBalance, 6, N_("Incandescent")},
{PTP_DPC_WhiteBalance, 5, N_("Fluorescent")},
{PTP_DPC_WhiteBalance, 4, N_("Daylight")},
{PTP_DPC_WhiteBalance, 7, N_("Flash")},

1
camlibs/ptp2/ptp.h
View File

@@ -987,6 +987,7 @@ uint16_t ptp_canon_theme_download (PTPParams* params, uint32_t themenr,
uint16_t ptp_nikon_curve_download (PTPParams* params,
unsigned char **data, unsigned int *size);
uint16_t ptp_nikon_getptpipinfo (PTPParams* params, unsigned char **data, unsigned int *size);
uint16_t ptp_nikon_setcontrolmode (PTPParams* params, uint32_t mode);
uint16_t ptp_nikon_capture (PTPParams* params, uint32_t x);
uint16_t ptp_nikon_check_event (PTPParams* params, PTPUSBEventContainer **evt, int *evtcnt);