summaryrefslogtreecommitdiffstats
path: root/src/uca-cam.h
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-02-28 16:44:41 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-02-28 16:44:41 +0100
commit9d4f8e270d27556f277a14c567d516b3c090a027 (patch)
treea923ce72f46322ef492948fa9f39d5f1ace0f030 /src/uca-cam.h
parent7296b7a6f4368e8cad39169340770c78166b95cd (diff)
downloaduca-9d4f8e270d27556f277a14c567d516b3c090a027.tar.gz
uca-9d4f8e270d27556f277a14c567d516b3c090a027.tar.bz2
uca-9d4f8e270d27556f277a14c567d516b3c090a027.tar.xz
uca-9d4f8e270d27556f277a14c567d516b3c090a027.zip
Move buffer allocation to frame grabber
Diffstat (limited to 'src/uca-cam.h')
-rw-r--r--src/uca-cam.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/uca-cam.h b/src/uca-cam.h
index aacd5c3..9f0c057 100644
--- a/src/uca-cam.h
+++ b/src/uca-cam.h
@@ -12,7 +12,9 @@ enum uca_property_ids;
/*
* --- non-virtual methods ----------------------------------------------------
*/
-enum uca_cam_state uca_get_camera_state(struct uca_camera_t *cam);
+uint32_t uca_cam_alloc(struct uca_camera_t *cam, uint32_t n_buffers);
+
+enum uca_cam_state uca_cam_get_state(struct uca_camera_t *cam);
/*
@@ -45,12 +47,6 @@ typedef uint32_t (*uca_cam_set_property) (struct uca_camera_t *cam, enum uca_pro
*/
typedef uint32_t (*uca_cam_get_property) (struct uca_camera_t *cam, enum uca_property_ids property, void *data);
-/** \brief Allocate number of buffers
- *
- * The size of each buffer is width x height x bits
- */
-typedef uint32_t (*uca_cam_alloc) (struct uca_camera_t *cam, uint32_t n_buffers);
-
/**
* \brief Acquire one frame
*/
@@ -72,7 +68,6 @@ struct uca_camera_t {
uca_cam_set_property set_property;
uca_cam_get_property get_property;
uca_cam_acquire_image acquire_image;
- uca_cam_alloc alloc;
/* Private */
uca_cam_destroy destroy;