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

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

Revision: 11401
          http://gphoto.svn.sourceforge.net/gphoto/?rev=11401&view=rev
Author:   marcusmeissner
Date:     2008-10-15 09:07:28 +0000 (Wed, 15 Oct 2008)

Log Message:
-----------
make a640work again, added notes.
adjusted some configuration variables after reading the a640 camera
menus

Modified Paths:
--------------
    branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c
    branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c
    branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/music-players.h

Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c	2008-10-14 21:01:29 UTC (rev 11400)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c	2008-10-15 09:07:28 UTC (rev 11401)
@@ -1110,9 +1110,9 @@
 GENERIC8TABLE(Nikon_FlashModeManualPower,flash_modemanualpower)
 
 static struct deviceproptableu8 canon_meteringmode[] = {
-	{ "center weighted(?)",	0, 0 },
-	{ N_("spot"),		1, 0 },
-	{ "integral(?)",	3, 0 },
+	{ N_("center weighted average"),	0, 0 },
+	{ N_("spot"),				1, 0 },
+	{ N_("evaluative"),			3, 0 },
 };
 GENERIC8TABLE(Canon_MeteringMode,canon_meteringmode)
 

Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c	2008-10-14 21:01:29 UTC (rev 11400)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c	2008-10-15 09:07:28 UTC (rev 11401)
@@ -774,7 +774,8 @@
 	{"Canon:PowerShot SD40 (PTP mode)",	0x04a9, 0x3137, PTPBUG_DELETE_SENDS_EVENT},
 	/* http://sourceforge.net/tracker/index.php?func=detail&aid=1565043&group_id=8874&atid=358874 */
 	{"Canon:PowerShot A710 IS (PTP mode)",  0x04a9, 0x3138, PTPBUG_DELETE_SENDS_EVENT},
-	{"Canon:PowerShot A640 (PTP mode)",     0x04a9, 0x3139, PTPBUG_DELETE_SENDS_EVENT|PTP_CAP|PTP_CAP_PREVIEW},
+	/* Thomas Roelz at SUSE, MTP proplist does not work (hangs) */
+	{"Canon:PowerShot A640 (PTP mode)",     0x04a9, 0x3139, PTPBUG_DELETE_SENDS_EVENT|PTP_CAP|PTP_CAP_PREVIEW|PTP_MTP},
 	{"Canon:PowerShot A630 (PTP mode)",     0x04a9, 0x313a, PTPBUG_DELETE_SENDS_EVENT},
 	/* Deti Fliegl.
 	 * Marcus: supports MTP proplists, but these are 2 times slower than regular

Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/music-players.h
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/music-players.h	2008-10-14 21:01:29 UTC (rev 11400)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/music-players.h	2008-10-15 09:07:28 UTC (rev 11401)
@@ -438,7 +438,7 @@
    * This is actually a camera, but it has a Microsoft device descriptor
    * and reports itself as supporting the MTP extension.
    */
-  { "Canon", 0x04a9, "PowerShot A640 (PTP/MTP mode)", 0x3139, DEVICE_FLAG_NONE },
+  { "Canon", 0x04a9, "PowerShot A640 (PTP/MTP mode)", 0x3139, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL},
 
   /*
    * Nokia


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