diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera.h | 4 | ||||
| -rw-r--r-- | include/camera_private.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/camera.h b/include/camera.h index a17cd22..b5a917b 100644 --- a/include/camera.h +++ b/include/camera.h @@ -586,7 +586,7 @@ typedef void (*camera_media_packet_preview_cb)(media_packet_h pkt, void *user_da * @see camera_start_continuous_capture() * @see camera_capture_completed_cb() */ -typedef void (*camera_capturing_cb)(camera_image_data_s* image, camera_image_data_s* postview, camera_image_data_s* thumbnail, void *user_data); +typedef void (*camera_capturing_cb)(camera_image_data_s *image, camera_image_data_s *postview, camera_image_data_s *thumbnail, void *user_data); /** * @brief Called when the camera capturing completes. @@ -1069,7 +1069,7 @@ int camera_get_recommended_preview_resolution(camera_h camera, int *width, int * * @see camera_face_detected_cb() * @see camera_is_supported_face_detection() */ -int camera_start_face_detection(camera_h camera, camera_face_detected_cb callback, void * user_data); +int camera_start_face_detection(camera_h camera, camera_face_detected_cb callback, void *user_data); /** * @brief Stops face detection. diff --git a/include/camera_private.h b/include/camera_private.h index c520298..a463e15 100644 --- a/include/camera_private.h +++ b/include/camera_private.h @@ -72,11 +72,12 @@ typedef struct _camera_idle_event_s { typedef struct _camera_cli_s { intptr_t remote_handle; MMHandleType client_handle; + int display_type; intptr_t display_handle; camera_cb_info_s *cb_info; #ifdef HAVE_WAYLAND - MMCamWaylandInfo *wl_info; -#endif /* #ifdef HAVE_WAYLAND */ + MMCamWaylandInfo wl_info; +#endif /* HAVE_WAYLAND */ } camera_cli_s; typedef struct _camera_media_packet_data { @@ -90,7 +91,7 @@ typedef struct _camera_media_packet_data { int _camera_get_tbm_surface_format(int in_format, uint32_t *out_format); int _camera_get_media_packet_mimetype(int in_format, media_format_mimetype_e *mimetype); int _camera_media_packet_finalize(media_packet_h pkt, int error_code, void *user_data); -int __convert_camera_error_code(const char* func, int code); +int __convert_camera_error_code(const char *func, int code); #ifdef __cplusplus } |