diff options
author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-17 11:44:08 +0100 |
---|---|---|
committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-17 11:44:08 +0100 |
commit | 35681d4e1d171117c9d4c2c4fd7d474b5871f81f (patch) | |
tree | 9abb180d6e35a961e7e798b08101fef59cab6c18 /src/cameras/pco.c | |
parent | 5b80e3c687fb2b47b06d9ffe6ac07bec475d812a (diff) | |
download | uca-35681d4e1d171117c9d4c2c4fd7d474b5871f81f.tar.gz uca-35681d4e1d171117c9d4c2c4fd7d474b5871f81f.tar.bz2 uca-35681d4e1d171117c9d4c2c4fd7d474b5871f81f.tar.xz uca-35681d4e1d171117c9d4c2c4fd7d474b5871f81f.zip |
Rename struct_name_t to struct_name and create typedefs
Diffstat (limited to 'src/cameras/pco.c')
-rw-r--r-- | src/cameras/pco.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/cameras/pco.c b/src/cameras/pco.c index 0c13ca6..1ca16f4 100644 --- a/src/cameras/pco.c +++ b/src/cameras/pco.c @@ -12,7 +12,7 @@ #define set_void(p, type, value) { *((type *) p) = (type) value; } -static uint32_t uca_pco_set_exposure(struct uca_camera_t *cam, uint32_t *exposure) +static uint32_t uca_pco_set_exposure(struct uca_camera *cam, uint32_t *exposure) { uint32_t e, d; if (pco_get_delay_exposure(GET_PCO(cam), &d, &e) != PCO_NOERROR) @@ -22,7 +22,7 @@ static uint32_t uca_pco_set_exposure(struct uca_camera_t *cam, uint32_t *exposur return UCA_NO_ERROR; } -static uint32_t uca_pco_set_delay(struct uca_camera_t *cam, uint32_t *delay) +static uint32_t uca_pco_set_delay(struct uca_camera *cam, uint32_t *delay) { uint32_t e, d; if (pco_get_delay_exposure(GET_PCO(cam), &d, &e) != PCO_NOERROR) @@ -32,16 +32,16 @@ static uint32_t uca_pco_set_delay(struct uca_camera_t *cam, uint32_t *delay) return UCA_NO_ERROR; } -static uint32_t uca_pco_destroy(struct uca_camera_t *cam) +static uint32_t uca_pco_destroy(struct uca_camera *cam) { pco_set_rec_state(GET_PCO(cam), 0); pco_destroy(GET_PCO(cam)); return UCA_NO_ERROR; } -static uint32_t uca_pco_set_property(struct uca_camera_t *cam, enum uca_property_ids property, void *data) +static uint32_t uca_pco_set_property(struct uca_camera *cam, enum uca_property_ids property, void *data) { - struct uca_grabber_t *grabber = cam->grabber; + struct uca_grabber *grabber = cam->grabber; switch (property) { case UCA_PROP_WIDTH: @@ -82,10 +82,10 @@ static uint32_t uca_pco_set_property(struct uca_camera_t *cam, enum uca_property } -static uint32_t uca_pco_get_property(struct uca_camera_t *cam, enum uca_property_ids property, void *data, size_t num) +static uint32_t uca_pco_get_property(struct uca_camera *cam, enum uca_property_ids property, void *data, size_t num) { struct pco_edge_t *pco = GET_PCO(cam); - struct uca_grabber_t *grabber = cam->grabber; + struct uca_grabber *grabber = cam->grabber; switch (property) { case UCA_PROP_NAME: @@ -195,7 +195,7 @@ static uint32_t uca_pco_get_property(struct uca_camera_t *cam, enum uca_property return UCA_NO_ERROR; } -uint32_t uca_pco_start_recording(struct uca_camera_t *cam) +uint32_t uca_pco_start_recording(struct uca_camera *cam) { struct pco_edge_t *pco = GET_PCO(cam); if (pco_arm_camera(pco) != PCO_NOERROR) @@ -205,14 +205,14 @@ uint32_t uca_pco_start_recording(struct uca_camera_t *cam) return cam->grabber->acquire(cam->grabber, -1); } -uint32_t uca_pco_stop_recording(struct uca_camera_t *cam) +uint32_t uca_pco_stop_recording(struct uca_camera *cam) { if (pco_set_rec_state(GET_PCO(cam), 0) != PCO_NOERROR) return UCA_ERR_PROP_GENERAL; return UCA_NO_ERROR; } -uint32_t uca_pco_grab(struct uca_camera_t *cam, char *buffer) +uint32_t uca_pco_grab(struct uca_camera *cam, char *buffer) { uint16_t *frame; uint32_t err = cam->grabber->grab(cam->grabber, (void **) &frame, &cam->current_frame); @@ -224,7 +224,7 @@ uint32_t uca_pco_grab(struct uca_camera_t *cam, char *buffer) return UCA_NO_ERROR; } -uint32_t uca_pco_init(struct uca_camera_t **cam, struct uca_grabber_t *grabber) +uint32_t uca_pco_init(struct uca_camera **cam, struct uca_grabber *grabber) { if (grabber == NULL) return UCA_ERR_CAM_NOT_FOUND; @@ -239,7 +239,7 @@ uint32_t uca_pco_init(struct uca_camera_t **cam, struct uca_grabber_t *grabber) return UCA_ERR_CAM_NOT_FOUND; } - struct uca_camera_t *uca = (struct uca_camera_t *) malloc(sizeof(struct uca_camera_t)); + struct uca_camera *uca = (struct uca_camera *) malloc(sizeof(struct uca_camera)); uca->user = pco; uca->grabber = grabber; uca->grabber->asynchronous = true; |