diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-10-18 10:56:30 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-10-18 10:56:30 +0200 |
| commit | a1ab005916ba3aa50923294c5be3da0ded16fbc0 (patch) | |
| tree | b594deeda79c753fc3e7591dac4ad2712208ab8d /src | |
| parent | de2e8e3191eae37b91f672a03e028a35c8863c9d (diff) | |
| download | uca-a1ab005916ba3aa50923294c5be3da0ded16fbc0.tar.gz uca-a1ab005916ba3aa50923294c5be3da0ded16fbc0.tar.bz2 uca-a1ab005916ba3aa50923294c5be3da0ded16fbc0.tar.xz uca-a1ab005916ba3aa50923294c5be3da0ded16fbc0.zip | |
Add download button and make dimax work
Diffstat (limited to 'src')
| -rw-r--r-- | src/uca-camera.c | 5 | ||||
| -rw-r--r-- | src/uca-camera.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/uca-camera.c b/src/uca-camera.c index 8b08359..9210a05 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -47,6 +47,7 @@ G_DEFINE_TYPE(UcaCamera, uca_camera, G_TYPE_OBJECT) * @UCA_CAMERA_ERROR_NOT_RECORDING: Camera is not recording * @UCA_CAMERA_ERROR_NO_GRAB_FUNC: No grab callback was set * @UCA_CAMERA_ERROR_NOT_IMPLEMENTED: Virtual function is not implemented + * @UCA_CAMERA_ERROR_END_OF_STREAM: Data stream has ended. */ GQuark uca_camera_error_quark() { @@ -602,6 +603,10 @@ uca_camera_trigger (UcaCamera *camera, GError **error) * * You must have called uca_camera_start_recording() before, otherwise you will * get a #UCA_CAMERA_ERROR_NOT_RECORDING error. + * + * If *data is %NULL after returning from uca_camera_grab() and error is also + * %NULL, the data stream has ended. For example, with cameras that support + * in-camera memory, all frames have been transfered. */ void uca_camera_grab (UcaCamera *camera, gpointer *data, GError **error) diff --git a/src/uca-camera.h b/src/uca-camera.h index d84b5f2..ef3bf14 100644 --- a/src/uca-camera.h +++ b/src/uca-camera.h @@ -40,7 +40,8 @@ typedef enum { UCA_CAMERA_ERROR_RECORDING, UCA_CAMERA_ERROR_NOT_RECORDING, UCA_CAMERA_ERROR_NO_GRAB_FUNC, - UCA_CAMERA_ERROR_NOT_IMPLEMENTED + UCA_CAMERA_ERROR_NOT_IMPLEMENTED, + UCA_CAMERA_ERROR_END_OF_STREAM } UcaCameraError; typedef enum { |