[gphoto-cvs] SF.net SVN: gphoto:[11328] branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2

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

Revision: 11328
          http://gphoto.svn.sourceforge.net/gphoto/?rev=11328&view=rev
Author:   marcusmeissner
Date:     2008-09-20 21:50:55 +0000 (Sat, 20 Sep 2008)

Log Message:
-----------
changelog, adjust to trunk

Modified Paths:
--------------
    branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog
    branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c

Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog	2008-09-20 21:48:07 UTC (rev 11327)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog	2008-09-20 21:50:55 UTC (rev 11328)
@@ -1,3 +1,9 @@
+2008-09-20  Marcus Meissner  <ma...@je...>
+
+	* library.c: Do not disable viewfinder just after one preview.
+	  Repeatedly switching on/off viewfinder mode causes refocus
+	  all the time.
+
 2008-08-28  Marcus Meissner  <ma...@je...>
 
 	* library.c: Increase timeout for mtp proplist reading (from

Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c	2008-09-20 21:48:07 UTC (rev 11327)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c	2008-09-20 21:50:55 UTC (rev 11328)
@@ -515,6 +515,8 @@
 	{"Nikon:Coolpix 5400 (PTP mode)", 0x04b0, 0x0119, 0},
 	/* Nikon Coolpix 3700: T. Ehlers, 18 Jan 2004 */
 	{"Nikon:Coolpix 3700 (PTP mode)", 0x04b0, 0x011d, 0},
+	/* https://sourceforge.net/tracker/index.php?func=detail&aid=2110825&group_id=8874&atid=108874 */
+	{"Nikon:Coolpix 8700 (PTP mode)", 0x04b0, 0x011f, 0},
 	/* Nikon Coolpix 3200 */
 	{"Nikon:Coolpix 3200 (PTP mode)", 0x04b0, 0x0121, 0},
 	/* Nikon Coolpix 2200 */
@@ -1256,8 +1258,7 @@
 		gp_file_set_name (file, "canon_preview.jpg");
 
 #if 0
-		/* Leave this out, otherwise we refocus all the time 
-		 * on newer canons */
+		/* Leave out, otherwise we refocus all the time */
 		ret = ptp_canon_viewfinderoff (params);
 		if (ret != PTP_RC_OK) {
 			gp_context_error (context, _("Canon disable viewfinder failed: %d"), ret);


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