diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2020-04-17 09:19:50 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2020-04-17 09:19:50 +0200 |
| commit | 27d8f70c58aa0a92d1cf301fd53395e0d05fdf05 (patch) | |
| tree | 981e7ae558cbfcd20a4395da9341a37c6ca38fd3 | |
| parent | b876c77a22235934cf328ca0bcca5009088e5210 (diff) | |
| download | libgphoto2-27d8f70c58aa0a92d1cf301fd53395e0d05fdf05.tar.gz | |
d3100 also does not suppoort liveview or getpropcodes, same as d3000
https://github.com/gphoto/libgphoto2/issues/140
| -rw-r--r-- | camlibs/ptp2/library.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 10cfca138..6ef5e0508 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -454,7 +454,7 @@ fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) { } if (params->deviceinfo.Model && (sscanf(params->deviceinfo.Model,"D%d", &nikond))) { - if ((nikond >= 3000) && (nikond < 3099)) { + if ((nikond >= 3000) && (nikond < 3199)) { GP_LOG_D("The D3xxx series hides commands from us ... "); /* Most commands we guessed do not work (anymore). One user searched for those, remove the ones we do not have. * https://github.com/gphoto/libgphoto2/issues/140 @@ -470,26 +470,6 @@ fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) { di->OperationsSupported_len += 6; } } - if ((nikond >= 3100) && (nikond < 3199)) { - GP_LOG_D("The D3xxx series hides commands from us ... "); - /* Most commands we guessed do not work (anymore). One user searched for those, remove the ones we do not have. - * https://github.com/gphoto/libgphoto2/issues/140 - * added liveview back ... lets see - */ - if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_GetVendorPropCodes)) { - C_MEM (di->OperationsSupported = realloc(di->OperationsSupported,sizeof(di->OperationsSupported[0])*(di->OperationsSupported_len + 6))); - di->OperationsSupported[di->OperationsSupported_len+0] = PTP_OC_NIKON_AfDrive; - di->OperationsSupported[di->OperationsSupported_len+1] = PTP_OC_NIKON_DeviceReady; - di->OperationsSupported[di->OperationsSupported_len+2] = PTP_OC_NIKON_GetPreviewImg; - di->OperationsSupported[di->OperationsSupported_len+3] = PTP_OC_NIKON_MfDrive; - di->OperationsSupported[di->OperationsSupported_len+4] = PTP_OC_NIKON_ChangeAfArea; - di->OperationsSupported[di->OperationsSupported_len+5] = PTP_OC_NIKON_AfDriveCancel; - di->OperationsSupported[di->OperationsSupported_len+6] = PTP_OC_NIKON_StartLiveView; - di->OperationsSupported[di->OperationsSupported_len+7] = PTP_OC_NIKON_EndLiveView; - di->OperationsSupported[di->OperationsSupported_len+8] = PTP_OC_NIKON_GetLiveViewImg; - di->OperationsSupported_len += 9; - } - } if ((nikond >= 3200) && (nikond < 3999)) { GP_LOG_D("The D3xxx series hides commands from us ... adding all D7100 ones"); if (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_GetVendorPropCodes)) { |