diff options
| -rw-r--r-- | src/device-flags.h | 2 | ||||
| -rw-r--r-- | src/music-players.h | 4 | ||||
| -rw-r--r-- | src/ptp.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/device-flags.h b/src/device-flags.h index 3112ba7..d9cbfa2 100644 --- a/src/device-flags.h +++ b/src/device-flags.h @@ -283,7 +283,7 @@ * 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/src/music-players.h b/src/music-players.h index 7f4e08e..137ffa7 100644 --- a/src/music-players.h +++ b/src/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, @@ -5403,7 +5403,7 @@ ptp_object_want (PTPParams *params, uint32_t handle, int want, PTPObject **retob /*Camera *camera = ((PTPData *)params->data)->camera;*/ /* If GetObjectInfo is broken, force GetPropList */ - if (params->device_flags & DEVICE_FLAG_BROKEN_GET_OBJECT_INFO) + if (params->device_flags & DEVICE_FLAG_PROPLIST_OVERRIDES_OI) want |= PTPOBJECT_MTPPROPLIST_LOADED; *retob = NULL; @@ -5469,7 +5469,7 @@ ptp_object_want (PTPParams *params, uint32_t handle, int want, PTPObject **retob ob->nrofmtpprops = nrofprops; /* Override the ObjectInfo data with data from properties */ - if (params->device_flags & DEVICE_FLAG_BROKEN_GET_OBJECT_INFO) { + if (params->device_flags & DEVICE_FLAG_PROPLIST_OVERRIDES_OI) { int i; MTPProperties *prop = ob->mtpprops; |