rename focuslock to afstatus

added colorspace config

4 files changed, 8 insertions, 6 deletions

diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index 56500d68e..dd5fef3e9 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -2713,7 +2713,7 @@ _put_Fuji_Bulb(CONFIG_PUT_ARGS)
 		/* poll camera until it is ready */
 		pval.u16 = 0x0001;
 		while (pval.u16 == 0x0001) {
-			C_PTP (ptp_getdevicepropvalue (params, 0xd209, &pval, PTP_DTC_UINT16));
+			C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_FUJI_AFStatus, &pval, PTP_DTC_UINT16));
 			GP_LOG_D ("XXX Ready to shoot? %X", pval.u16);
 		}
 
@@ -3846,7 +3846,6 @@ static struct deviceproptableu16 canon_eos_colorspace[] = {
 };
 GENERIC16TABLE(Canon_EOS_ColorSpace,canon_eos_colorspace)
 
-
 static struct deviceproptableu8 nikon_evstep[] = {
 	{ "1/3",	0, 0 },
 	{ "1/2",	1, 0 },
@@ -9299,6 +9298,7 @@ static struct submenu image_settings_menu[] = {
 	{ N_("Color Model"),            "colormodel",           PTP_DPC_NIKON_ColorModel,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_ColorModel,          _put_Nikon_ColorModel },
 	{ N_("Color Space"),            "colorspace",           PTP_DPC_NIKON_ColorSpace,               PTP_VENDOR_NIKON,   PTP_DTC_UINT8,  _get_Nikon_ColorSpace,          _put_Nikon_ColorSpace },
 	{ N_("Color Space"),            "colorspace",           PTP_DPC_CANON_EOS_ColorSpace,           PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_EOS_ColorSpace,      _put_Canon_EOS_ColorSpace },
+	{ N_("Color Space"),            "colorspace",           PTP_DPC_FUJI_ColorSpace,                PTP_VENDOR_FUJI,    PTP_DTC_UINT16, _get_Canon_EOS_ColorSpace,      _put_Canon_EOS_ColorSpace }, /* uses 1 for sRGB, and 2 for AdobeRGB too, same as EOS */
 	{ N_("Video Format"),           "videoformat",          PTP_DPC_VideoFormat,                    0,                  PTP_DTC_UINT32, _get_VideoFormat,               _put_VideoFormat },
 	{ N_("Video Resolution"),       "videoresolution",      PTP_DPC_VideoResolution,                0,                  PTP_DTC_STR   , _get_STR_ENUMList,              _put_STR },
 	{ N_("Video Quality"),          "videoquality",         PTP_DPC_VideoQuality,                   0,                  PTP_DTC_UINT16, _get_INT,                       _put_INT },
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index fbef8f2d3..e85dfc629 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -4931,7 +4931,7 @@ camera_fuji_capture (Camera *camera, CameraCaptureType type, CameraFilePath *pat
 	/* poll camera until it is ready */
 	propval.u16 = 0x0001;
 	while (propval.u16 == 0x0001) {
-		C_PTP (ptp_getdevicepropvalue (params, 0xd209, &propval, PTP_DTC_UINT16));
+		C_PTP (ptp_getdevicepropvalue (params, PTP_DPC_FUJI_AFStatus, &propval, PTP_DTC_UINT16));
 		GP_LOG_D ("XXX Ready to shoot? %X", propval.u16);
 	}
 
@@ -6073,7 +6073,7 @@ camera_trigger_capture (Camera *camera, GPContext *context)
 		/* poll camera until it is ready */
 		propval.u16 = 0x0001;
 		while (propval.u16 == 0x0001) {
-			C_PTP_REP (ptp_getdevicepropvalue (params, 0xd209, &propval, PTP_DTC_UINT16));
+			C_PTP_REP (ptp_getdevicepropvalue (params, PTP_DPC_FUJI_AFStatus, &propval, PTP_DTC_UINT16));
 		}
 
 		/* shoot */
diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c
index ccc5dd325..96c06c800 100644
--- a/camlibs/ptp2/ptp.c
+++ b/camlibs/ptp2/ptp.c
@@ -6297,7 +6297,7 @@ ptp_get_property_description(PTPParams* params, uint16_t dpc)
 		{PTP_DPC_FUJI_FocusMeteringMode, "FocusMeteringMode"},
 		{PTP_DPC_FUJI_ReleaseMode, "ReleaseMode"},
 		{PTP_DPC_FUJI_FocusAreas, "FocusAreas"},
-		{PTP_DPC_FUJI_FocusLock, "FocusLock"},
+		{PTP_DPC_FUJI_AFStatus, "AFStatus"},
 		{PTP_DPC_FUJI_CurrentState, "CurrentState"},
 		{PTP_DPC_FUJI_AELock, "AELock"},
 		{PTP_DPC_FUJI_Copyright, "Copyright"},
diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h
index 07a4cdc4d..e0b03392f 100644
--- a/camlibs/ptp2/ptp.h
+++ b/camlibs/ptp2/ptp.h
@@ -2650,6 +2650,7 @@ typedef struct _PTPCanonEOSDeviceInfo {
 #define PTP_DPC_FUJI_FilmSimulation			0xD001
 #define PTP_DPC_FUJI_FilmSimulationTune			0xD002
 #define PTP_DPC_FUJI_DRangeMode				0xD007
+#define PTP_DPC_FUJI_ColorSpace				0xD00A
 #define PTP_DPC_FUJI_WhitebalanceTune1			0xD00B
 #define PTP_DPC_FUJI_WhitebalanceTune2			0xD00C
 #define PTP_DPC_FUJI_ColorTemperature			0xD017
@@ -2705,6 +2706,7 @@ typedef struct _PTPCanonEOSDeviceInfo {
 #define PTP_DPC_FUJI_FlashCommanderMode6		0xD12B
 #define PTP_DPC_FUJI_FlashCommanderMode7		0xD12C
 #define PTP_DPC_FUJI_ModelingFlash			0xD12D
+#define PTP_DPC_FUJI_BKTSelection			0xD131
 #define PTP_DPC_FUJI_AEAFLockButton			0xD132
 #define PTP_DPC_FUJI_CenterButton			0xD133
 #define PTP_DPC_FUJI_MultiSelectorButton		0xD134
@@ -2774,7 +2776,7 @@ typedef struct _PTPCanonEOSDeviceInfo {
  * 0x300 				SDK_ShootS2
  * 0x8000 migh be autowhitebalance
  */
-#define PTP_DPC_FUJI_FocusLock				0xD209 /* AF Status */
+#define PTP_DPC_FUJI_AFStatus				0xD209
 #define PTP_DPC_FUJI_DeviceName				0xD20B
 #define PTP_DPC_FUJI_MediaRecord			0xD20C /* from capmediarecord */
 #define PTP_DPC_FUJI_FreeSDRAMImages			0xD20E /* free images in SDRAM */