diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2020-05-21 16:38:38 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2020-05-21 16:38:38 +0200 |
| commit | 7630c58c06699689169c4225f27ff4d3d6bce383 (patch) | |
| tree | 004b2b89df3f3e39bc8b61012ff0b64450c46707 | |
| parent | e1a1f285e0756332264a6dcf85ab08921968a79e (diff) | |
| download | libgphoto2-7630c58c06699689169c4225f27ff4d3d6bce383.tar.gz | |
added c102 as new olympus objectadded event
| -rw-r--r-- | camlibs/ptp2/library.c | 1 | ||||
| -rw-r--r-- | camlibs/ptp2/ptp.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 2b6a0aaaf..f4402ac93 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -4813,6 +4813,7 @@ camera_olympus_omd_capture (Camera *camera, CameraCaptureType type, CameraFilePa while (ptp_get_one_event(params, &event)) { switch (event.Code) { case 0xc002: + case PTP_EC_OLYMPUS_ObjectAdded: /* seen in newer traces, https://github.com/gphoto/gphoto2/issues/310 */ case PTP_EC_ObjectAdded: newobject = event.Param1; goto downloadfile; diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h index 9d01603ec..7c26a286b 100644 --- a/camlibs/ptp2/ptp.h +++ b/camlibs/ptp2/ptp.h @@ -1138,6 +1138,8 @@ typedef struct _PTPIPHeader PTPIPHeader; #define PTP_EC_PANASONIC_ObjectAdded 0xC108 #define PTP_EC_PANASONIC_ObjectAddedSDRAM 0xC109 +#define PTP_EC_OLYMPUS_ObjectAdded 0xC102 +#define PTP_EC_OLYMPUS_PropChanged 0xC108 /* constants for GetObjectHandles */ #define PTP_GOH_ALL_STORAGE 0xffffffff |