diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2017-01-18 13:55:56 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2017-01-18 13:55:56 +0100 |
| commit | a82612c7b3a104d7166ce407d37a66f71214d460 (patch) | |
| tree | 002fa79ce535b8342764b012b1f8139b18827148 | |
| parent | 7466356e8a3e8f1f01c3097c41ce365f0fad3169 (diff) | |
| download | libgphoto2-a82612c7b3a104d7166ce407d37a66f71214d460.tar.gz | |
fixed syntax errors in last commit
| -rw-r--r-- | camlibs/ptp2/config.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index e97650362..2ced9c2ee 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -415,7 +415,7 @@ camera_prepare_capture (Camera *camera, GPContext *context) return camera_prepare_chdk_capture(camera,context); if (ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteRelease) || - ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn) || + ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn) ) return camera_prepare_canon_eos_capture(camera,context); gp_context_error(context, _("Sorry, your Canon camera does not support Canon capture")); @@ -478,8 +478,8 @@ camera_unprepare_capture (Camera *camera, GPContext *context) if (ptp_operation_issupported(&camera->pl->params, PTP_OC_CHDK)) return camera_unprepare_chdk_capture(camera,context); - if (ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteRelease) || - ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn) || + if (ptp_operation_issupported(&camera->pl->params, PTP_OC_CANON_EOS_RemoteRelease) || + ptp_operation_issupported(&camera->pl->params, PTP_OC_CANON_EOS_RemoteReleaseOn) ) return camera_unprepare_canon_eos_capture (camera, context); @@ -6317,7 +6317,7 @@ _put_CaptureTarget(CONFIG_PUT_ARGS) { /* Also update it in the live Canon EOS camera. (Nikon and Canon Powershot just use different opcodes.) */ if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) && (ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteRelease) || - ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn) || + ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn) ) ) CR (camera_canon_eos_update_capture_target( camera, context, -1 )); @@ -7405,7 +7405,7 @@ _get_config (Camera *camera, const char *confname, CameraWidget **outwidget, Cam gp_camera_get_abilities (camera, &ab); if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) && (ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteRelease) || - ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn) || + ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn) ) ) { if (!params->eos_captureenabled) @@ -7806,7 +7806,7 @@ _set_config (Camera *camera, const char *confname, CameraWidget *window, GPConte camera->pl->checkevents = TRUE; if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) && (ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteRelease) || - ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn) || + ptp_operation_issupported(params, PTP_OC_CANON_EOS_RemoteReleaseOn) ) ) { if (!params->eos_captureenabled) |