merge back from trunk

git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@12580 67ed7778-7388-44ab-90cf-0a291f65f57c

1 files changed, 17 insertions, 10 deletions

diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index 5fed2a116..2408d33c3 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -1453,13 +1453,13 @@ static struct deviceproptableu8 canon_flash[] = {
 };
 GENERIC8TABLE(Canon_FlashMode,canon_flash)
 
-static struct deviceproptableu8 nikon_flashmode[] = {
+static struct deviceproptableu8 nikon_internalflashmode[] = {
 	{ N_("iTTL"),		0, 0 },
 	{ N_("Manual"),		1, 0 },
 	{ N_("Commander"),	2, 0 },
 	{ N_("Repeating"),	3, 0 }, /* stroboskop */
 };
-GENERIC8TABLE(Nikon_FlashMode,nikon_flashmode)
+GENERIC8TABLE(Nikon_InternalFlashMode,nikon_internalflashmode)
 
 static struct deviceproptableu8 nikon_flashcommandermode[] = {
 	{ N_("TTL"),		0, 0 },
@@ -1796,15 +1796,20 @@ static struct deviceproptableu16 canon_eos_aeb[] = {
 	{ "+/- 1 1/2",		0x000c, 0 },
 	{ "+/- 1 2/3",		0x000d, 0 },
 	{ "+/- 2",		0x0010, 0 },
+	{ "+/- 2 1/3",		0x0013, 0 },
+	{ "+/- 2 1/2",		0x0014, 0 },
+	{ "+/- 2 2/3",		0x0015, 0 },
 	{ "+/- 3",		0x0018, 0 },
 };
 GENERIC16TABLE(Canon_EOS_AEB,canon_eos_aeb)
 
 static struct deviceproptableu16 canon_eos_drive_mode[] = {
-	{ N_("Single"),		0x0000, 0 },
-	{ N_("Continuous"),	0x0001, 0 },
-	{ N_("Timer 10 sec"),	0x0010, 0 },
-	{ N_("Timer 2 sec"),	0x0011, 0 },
+	{ N_("Single"),			0x0000, 0 },
+	{ N_("Continuous"),		0x0001, 0 },
+	{ N_("Continuous high speed"),	0x0004, 0 },
+	{ N_("Continuous low speed"),	0x0005, 0 },
+	{ N_("Timer 10 sec"),		0x0010, 0 },
+	{ N_("Timer 2 sec"),		0x0011, 0 },
 };
 GENERIC16TABLE(Canon_EOS_DriveMode,canon_eos_drive_mode)
 
@@ -2191,8 +2196,9 @@ static struct deviceproptableu16 capture_mode[] = {
 	{ N_("Timer"),			0x8011, PTP_VENDOR_NIKON},
 	{ N_("Mirror Up"),		0x8012, PTP_VENDOR_NIKON},
 	{ N_("Remote"),			0x8013, PTP_VENDOR_NIKON},
-	{ N_("Timer + Remote"),		0x8014, PTP_VENDOR_NIKON}, /* others nikons */
-	{ N_("Timer + Remote 2"),	0x8015, PTP_VENDOR_NIKON}, /* d90 */
+	{ N_("Quick Response Remote"),	0x8014, PTP_VENDOR_NIKON}, /* others nikons */
+	{ N_("Delayed Remote"),		0x8015, PTP_VENDOR_NIKON}, /* d90 */
+	{ N_("Quiet Release"),		0x8016, PTP_VENDOR_NIKON}, /* d5000 */
 };
 GENERIC16TABLE(CaptureMode,capture_mode)
 
@@ -4228,7 +4234,8 @@ static struct submenu capture_settings_menu[] = {
 	{ N_("Flash Compensation"), "flashcompensation", PTP_DPC_CANON_FlashCompensation, PTP_VENDOR_CANON, PTP_DTC_UINT8, _get_Canon_ExpCompensation, _put_Canon_ExpCompensation},
 	{ N_("AEB Exposure Compensation"), "aebexpcompensation", PTP_DPC_CANON_AEBExposureCompensation, PTP_VENDOR_CANON, PTP_DTC_UINT8, _get_Canon_ExpCompensation, _put_Canon_ExpCompensation},
 	{ N_("Flash Mode"), "flashmode", PTP_DPC_CANON_FlashMode, PTP_VENDOR_CANON, PTP_DTC_UINT8, _get_Canon_FlashMode, _put_Canon_FlashMode},
-	{ N_("Flash Mode"), "flashmode", PTP_DPC_NIKON_FlashMode, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_FlashMode, _put_Nikon_FlashMode},
+	{ N_("Flash Mode"), "flashmode", PTP_DPC_FlashMode, 0, PTP_DTC_UINT16, _get_FlashMode, _put_FlashMode},
+	{ N_("Nikon Flash Mode"), "nikonflashmode", PTP_DPC_NIKON_FlashMode, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_InternalFlashMode, _put_Nikon_InternalFlashMode},
 	{ N_("Flash Commander Mode"), "flashcommandermode", PTP_DPC_NIKON_FlashCommanderMode, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_FlashCommanderMode, _put_Nikon_FlashCommanderMode},
 	{ N_("Flash Commander Power"), "flashcommanderpower", PTP_DPC_NIKON_FlashModeCommanderPower, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_FlashCommanderPower, _put_Nikon_FlashCommanderPower},
 	{ N_("AF Area Illumination"), "af-area-illumination", PTP_DPC_NIKON_AFAreaIllumination, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_AFAreaIllum, _put_Nikon_AFAreaIllum},
@@ -4249,7 +4256,6 @@ static struct submenu capture_settings_menu[] = {
 	{ N_("Picture Style"), "picturestyle", PTP_DPC_CANON_EOS_PictureStyle, PTP_VENDOR_CANON, PTP_DTC_UINT8, _get_Canon_EOS_PictureStyle, _put_Canon_EOS_PictureStyle},
 	{ N_("Focus Metering Mode"), "focusmetermode", PTP_DPC_FocusMeteringMode, 0, PTP_DTC_UINT16, _get_FocusMetering, _put_FocusMetering},
 	{ N_("Exposure Metering Mode"), "exposuremetermode", PTP_DPC_ExposureMeteringMode, 0, PTP_DTC_UINT16, _get_ExposureMetering, _put_ExposureMetering},
-	{ N_("Flash Mode"), "flashmode", PTP_DPC_FlashMode, 0, PTP_DTC_UINT16, _get_FlashMode, _put_FlashMode},
 	{ N_("Aperture"), "aperture", PTP_DPC_CANON_Aperture, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_Aperture, _put_Canon_Aperture},
 	{ N_("Aperture"), "aperture", PTP_DPC_FUJI_Aperture, PTP_VENDOR_FUJI, PTP_DTC_UINT16, _get_Fuji_Aperture, _put_Fuji_Aperture},
 	{ N_("AV Open"), "avopen", PTP_DPC_CANON_AvOpen, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_Aperture, _put_Canon_Aperture},
@@ -4559,6 +4565,7 @@ camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)
 			break;
 		}
 		gp_widget_append (section, widget);
+		ptp_free_devicepropdesc(&dpd);
 	}
 	return GP_OK;
 }