diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2017-04-16 21:38:51 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2017-04-16 21:38:51 +0200 |
| commit | 8af8531df2d1d5c7aa739654a05a3606dde41e5d (patch) | |
| tree | 27b5d43561226e6fabe2e1ac854823842af89f30 | |
| parent | 28ce91dc8df2bd903648097839d63a883526faa8 (diff) | |
| download | libgphoto2-8af8531df2d1d5c7aa739654a05a3606dde41e5d.tar.gz | |
added movie aspectratio hook-in, no table yet
| -rw-r--r-- | camlibs/ptp2/config.c | 6 | ||||
| -rw-r--r-- | camlibs/ptp2/ptp-pack.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index 15bb55258..e32138a65 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -2196,6 +2196,11 @@ static struct deviceproptableu8 sony_aspectratio[] = { }; GENERIC8TABLE(Sony_AspectRatio,sony_aspectratio) +static struct deviceproptableu16 canon_eos_aspectratio[] = { + /* FIXME: fill */ +}; +GENERIC16TABLE(Canon_EOS_AspectRatio,canon_eos_aspectratio) + /* actually in 1/10s of a second, but only 3 values in use */ static struct deviceproptableu16 canon_selftimer[] = { { N_("Not used"), 0, 0 }, @@ -7235,6 +7240,7 @@ static struct submenu capture_settings_menu[] = { { N_("Exposure Program"), "expprogram2", PTP_DPC_NIKON_1_Mode, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_NIKON_1_ExposureProgram, _put_NIKON_1_ExposureProgram }, { N_("Scene Mode"), "scenemode", PTP_DPC_NIKON_SceneMode, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_NIKON_SceneMode, _put_NIKON_SceneMode }, { N_("Aspect Ratio"), "aspectratio", PTP_DPC_SONY_AspectRatio, PTP_VENDOR_SONY, PTP_DTC_UINT8, _get_Sony_AspectRatio, _put_Sony_AspectRatio }, + { N_("Aspect Ratio"), "aspectratio", PTP_DPC_CANON_EOS_MultiAspect, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_EOS_AspectRatio, _put_Canon_EOS_AspectRatio }, { 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 }, diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index ba77ed4ba..5e2e4a73d 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -2165,6 +2165,7 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, case PTP_DPC_CANON_EOS_EVFOutputDevice: case PTP_DPC_CANON_EOS_AutoPowerOff: case PTP_DPC_CANON_EOS_EVFRecordStatus: + case PTP_DPC_CANON_EOS_MultiAspect: /* actually a 32bit value, but lets try it for easyness */ dpd->DataType = PTP_DTC_UINT16; break; case PTP_DPC_CANON_EOS_PictureStyle: |