added some waits for the EOS event handling.

otherwise the camera will just serve eventdata
and not do anything else.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12182 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2009-07-01 21:13:17 +00:00
parent fc0507af7c
commit 2c5bc4145c

View File

@@ -1733,6 +1733,7 @@ camera_canon_eos_capture (Camera *camera, CameraCaptureType type, CameraFilePath
if (!nrofentries) {
free (entries);
gp_context_idle (context);
usleep(100*1000); /* 100 ms */
continue;
}
for (i=0;i<nrofentries;i++) {
@@ -1763,6 +1764,7 @@ camera_canon_eos_capture (Camera *camera, CameraCaptureType type, CameraFilePath
break;
CPR (context, ptp_canon_eos_keepdeviceon (params));
gp_context_idle (context);
usleep(100*1000); /* 100 ms */
}
if (newobject == 0)
return GP_ERROR;
@@ -2223,6 +2225,7 @@ camera_wait_for_event (Camera *camera, int timeout,
if (!nrofentries) {
free (entries);
gp_context_idle (context);
usleep(100*1000); /* 100 ms */
continue;
}
for (i=0;i<nrofentries;i++) {
@@ -2310,6 +2313,7 @@ camera_wait_for_event (Camera *camera, int timeout,
}
free (entries);
gp_context_idle (context);
usleep(100*1000); /* 100 ms */
}
return GP_OK;
}