summaryrefslogtreecommitdiffstats
path: root/src/uca-cam.h
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-03-23 09:36:41 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-03-23 09:36:41 +0100
commit8c48a8ad1c6153770c24ae2e8a9b0f9efedfc4af (patch)
tree5b39b777aec9dd10b61b1d117fd97c33cc397019 /src/uca-cam.h
parentbc152fef853627c971b1fc9eb3aab985af83b248 (diff)
downloaduca-8c48a8ad1c6153770c24ae2e8a9b0f9efedfc4af.tar.gz
uca-8c48a8ad1c6153770c24ae2e8a9b0f9efedfc4af.tar.bz2
uca-8c48a8ad1c6153770c24ae2e8a9b0f9efedfc4af.tar.xz
uca-8c48a8ad1c6153770c24ae2e8a9b0f9efedfc4af.zip
Some very important person at SiSo decided to have 64-bit frame numbers on 64-
bit systems and 32-bit frame numbers on 32-bit systems. This commit changes the API to the former, which means it now takes 1.44x10^10 years to have an overflow at a very slow frame rate of 1000 frames per second.
Diffstat (limited to 'src/uca-cam.h')
-rw-r--r--src/uca-cam.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/uca-cam.h b/src/uca-cam.h
index d52f390..f12bb12 100644
--- a/src/uca-cam.h
+++ b/src/uca-cam.h
@@ -156,7 +156,7 @@ typedef uint32_t (*uca_cam_stop_recording) (struct uca_camera *cam);
*
* \note The meta data parameter is not yet specified but just a place holder.
*/
-typedef void (*uca_cam_grab_callback) (uint32_t image_number, void *buffer, void *meta_data, void *user);
+typedef void (*uca_cam_grab_callback) (uint64_t image_number, void *buffer, void *meta_data, void *user);
/**
* Register callback for given frame grabber. To actually start receiving
@@ -248,7 +248,7 @@ typedef struct uca_camera {
enum uca_cam_state state; /**< camera state */
uint32_t frame_width; /**< current frame width */
uint32_t frame_height; /**< current frame height */
- uint32_t current_frame; /**< last grabbed frame number */
+ uint64_t current_frame; /**< last grabbed frame number */
uca_cam_grab_callback callback;
void *callback_user; /**< user data for callback */