diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2012-04-14 08:00:18 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2012-04-14 08:00:18 +0000 |
| commit | 78545f95beb6292d6a39c7678da8e3c5116002ed (patch) | |
| tree | ad864b28cb2eabc1ac3b21f61105e7231e7e21c8 | |
| parent | 57ab6f6f6fce1926083d5104a84451398016a479 (diff) | |
| download | libgphoto2-78545f95beb6292d6a39c7678da8e3c5116002ed.tar.gz | |
renamed flags
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@13980 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | camlibs/ptp2/device-flags.h | 10 | ||||
| -rw-r--r-- | camlibs/ptp2/music-players.h | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/camlibs/ptp2/device-flags.h b/camlibs/ptp2/device-flags.h index b041ec687..d9cbfa204 100644 --- a/camlibs/ptp2/device-flags.h +++ b/camlibs/ptp2/device-flags.h @@ -275,9 +275,15 @@ #define DEVICE_FLAG_BROKEN_GET_OBJECT_PROPVAL 0x20000000 /** * It seems that some devices return an bad data when - * using the GetObjectInfo operation. + * using the GetObjectInfo operation. So in these cases + * we prefer to override the PTP-compatible object infos + * with the MTP property list. + * + * For example Some Samsung Galaxy S devices contain an MTP + * stack that present the ObjectInfo in 64 bit instead of + * 32 bit. */ -#define DEVICE_FLAG_BROKEN_GET_OBJECT_INFO 0x40000000 +#define DEVICE_FLAG_PROPLIST_OVERRIDES_OI 0x40000000 /** * All these bug flags need to be set on SONY NWZ Walkman diff --git a/camlibs/ptp2/music-players.h b/camlibs/ptp2/music-players.h index 7f884f237..0bda53460 100644 --- a/camlibs/ptp2/music-players.h +++ b/camlibs/ptp2/music-players.h @@ -367,7 +367,7 @@ DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL | DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_LONG_TIMEOUT | - DEVICE_FLAG_BROKEN_GET_OBJECT_INFO }, + DEVICE_FLAG_PROPLIST_OVERRIDES_OI }, // Note: ID 0x6865 is some PTP mode! Don't add it. // From: Erik Berglund <erikjber@users.sourceforge.net> // Logs indicate this needs DEVICE_FLAG_NO_ZERO_READS @@ -380,7 +380,7 @@ DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL | DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_LONG_TIMEOUT | - DEVICE_FLAG_BROKEN_GET_OBJECT_INFO }, + DEVICE_FLAG_PROPLIST_OVERRIDES_OI }, // From: John Gorkos <ab0oo@users.sourceforge.net> and // Akos Maroy <darkeye@users.sourceforge.net> { "Samsung", 0x04e8, "Vibrant SGH-T959/Captivate/Media player mode", 0x68a9, |