[gphoto-cvs] SF.net SVN: gphoto:[14577] trunk/libgphoto2/camlibs/ptp2/library.c

[<mar...@us...>]

Revision: 14577
          http://sourceforge.net/p/gphoto/code/14577
Author:   marcusmeissner
Date:     2013-10-27 21:29:45 +0000 (Sun, 27 Oct 2013)
Log Message:
-----------
From: David Fries <David@Fries.net>

event handling on the P100 is even worse, do not
rely on it (switch to NIKON_BROKEN_CAP)

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/library.c

Modified: trunk/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/library.c	2013-10-16 20:06:32 UTC (rev 14576)
+++ trunk/libgphoto2/camlibs/ptp2/library.c	2013-10-27 21:29:45 UTC (rev 14577)
@@ -843,7 +843,7 @@
 	{"Nikon:Coolpix S225 (PTP mode)", 0x04b0, 0x0178, PTP_CAP|PTP_NIKON_BROKEN_CAP},
 
 	/* Ryan Nestor <ry...@mo...> */
-	{"Nikon:Coolpix P100 (PTP mode)", 0x04b0, 0x017d, PTP_CAP|PTP_NO_CAPTURE_COMPLETE},
+	{"Nikon:Coolpix P100 (PTP mode)", 0x04b0, 0x017d, PTP_CAP|PTP_NIKON_BROKEN_CAP},
 	/* Štěpán Němec <st...@gm...> */
 	{"Nikon:Coolpix P7000 (PTP mode)",0x04b0, 0x017f, PTP_CAP|PTP_NO_CAPTURE_COMPLETE},
 
@@ -2023,7 +2023,7 @@
 		if (ptp_operation_issupported(params, PTP_OC_CANON_EOS_GetViewFinderData)) {
 			PTPPropertyValue	val;
 			/* FIXME: this might cause a focusing pass and take seconds. 20 was not
-			 * enough. */
+			 * enough (would be 0.2 seconds, too short for the mirror up operation.). */
 			int 			tries = 100;
 			PTPDevicePropDesc       dpd;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.