From 4e653f74db1648e90887aa3f46f6c21807f472ee Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 10 Dec 2014 21:17:40 +0000 Subject: [PATCH] actually set values via controla here again, the controlb method is done in config.c git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15266 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/ptp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c index 181ec2b09..c773e1fdb 100644 --- a/camlibs/ptp2/ptp.c +++ b/camlibs/ptp2/ptp.c @@ -3017,12 +3017,11 @@ ptp_generic_setdevicepropvalue (PTPParams* params, uint16_t propcode, params->deviceproperties[i].timestamp = 0; /* FIXME: change the cache? hmm */ - /* setting it again seems to confuse the camera, it only works by using the other method */ + /* this works for some methods, but not for all */ if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_SONY) && - ptp_operation_issupported(params, PTP_OC_SONY_SetControlDeviceB) + ptp_operation_issupported(params, PTP_OC_SONY_SetControlDeviceA) ) - /*return ptp_sony_setdevicecontrolvalueb (params, propcode, value, datatype);*/ - return PTP_RC_OK; + return ptp_sony_setdevicecontrolvaluea (params, propcode, value, datatype); return ptp_setdevicepropvalue (params, propcode, value, datatype); }