diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2018-12-08 20:50:36 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2018-12-08 20:50:36 +0100 |
| commit | d99cd08cc0e0dbbc72ac4b133c8483eb47d8497b (patch) | |
| tree | ed11a9325ab4e81c061318bda5c3c7ddf5e9c20c | |
| parent | a84727b97bee18ccdbc928573cb4423bc05901a1 (diff) | |
| download | libgphoto2-d99cd08cc0e0dbbc72ac4b133c8483eb47d8497b.tar.gz | |
handle also ixus style eos m cameras
| -rw-r--r-- | camlibs/ptp2/ptp-private.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/camlibs/ptp2/ptp-private.h b/camlibs/ptp2/ptp-private.h index 7275bc130..140033d5d 100644 --- a/camlibs/ptp2/ptp-private.h +++ b/camlibs/ptp2/ptp-private.h @@ -115,15 +115,17 @@ is_canon_eos_m(PTPParams *params) { if (params->deviceinfo.VendorExtensionID != PTP_VENDOR_CANON) return 0; if (!ptp_operation_issupported(params, PTP_OC_CANON_EOS_SetRemoteMode)) return 0; if (!params->deviceinfo.Model) return 0; + /* classic EOS M */ if (!strncmp(params->deviceinfo.Model, "Canon EOS M", strlen("Canon EOS M"))) return 1; - /* we encountered Powershot SX models that seem to have EOS M firmware, see https://github.com/gphoto/libgphoto2/issues/316 */ - if (!strncmp(params->deviceinfo.Model, "Canon PowerShot SX", strlen("Canon PowerShot SX"))) - return 1; - /* also the G5 X seems to have it */ - if (!strncmp(params->deviceinfo.Model, "Canon PowerShot G", strlen("Canon PowerShot G"))) - return 1; + + /* We encountered newer Powershot SX models that seem to have EOS M like firmware, see https://github.com/gphoto/libgphoto2/issues/316 */ + if ( !strncmp(params->deviceinfo.Model, "Canon PowerShot SX", strlen("Canon PowerShot SX")) || + !strncmp(params->deviceinfo.Model, "Canon PowerShot G", strlen("Canon PowerShot G")) || + !strncmp(params->deviceinfo.Model, "Canon Digital IXUS", strlen("Canon Digital IXUS")) + ) + return ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn); return 0; } |