From 8b3f59615002cbf9fe147a26117e71f91f09fffc Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Wed, 14 May 2025 10:43:10 +0200 Subject: [PATCH] doesnt compile --- c_mpos/src/webcam.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/c_mpos/src/webcam.c b/c_mpos/src/webcam.c index f821bfce..da7601f5 100644 --- a/c_mpos/src/webcam.c +++ b/c_mpos/src/webcam.c @@ -164,19 +164,23 @@ static mp_obj_t capture_frame(webcam_obj_t *self) { return result; } -static mp_obj_t webcam_init(mp_obj_t type_in, mp_obj_t device_obj) { +static mp_obj_t webcam_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { + mp_arg_check_num(n_args, n_kw, 0, 1, false); + const char *device = "/dev/video0"; // Default device + if (n_args == 1) { + device = mp_obj_str_get_str(args[0]); + } + webcam_obj_t *self = m_new_obj(webcam_obj_t); - self->base.type = MP_OBJ_TO_PTR(type_in); + self->base.type = type; self->fd = -1; - const char *device = mp_obj_str_get_str(device_obj); if (init_webcam(self, device) < 0) { mp_raise_OSError(MP_EIO); } return MP_OBJ_FROM_PTR(self); } -MP_DEFINE_CONST_FUN_OBJ_2(webcam_init_obj, webcam_init); static mp_obj_t webcam_deinit(mp_obj_t self_in) { webcam_obj_t *self = MP_OBJ_TO_PTR(self_in); @@ -198,19 +202,18 @@ static const mp_rom_map_elem_t webcam_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&webcam_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_capture_frame), MP_ROM_PTR(&webcam_capture_frame_obj) }, }; -MP_DEFINE_CONST_DICT(webcam_locals_dict, webcam_locals_dict_table); +static MP_DEFINE_CONST_DICT(webcam_locals_dict, webcam_locals_dict_table); static const mp_obj_type_t webcam_type = { { &mp_type_type }, .name = MP_QSTR_Webcam, + .make_new = webcam_make_new, + .locals_dict = (mp_obj_dict_t *)&webcam_locals_dict, }; static const mp_rom_map_elem_t mp_module_webcam_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_webcam) }, { MP_ROM_QSTR(MP_QSTR_Webcam), MP_ROM_PTR(&webcam_type) }, - { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&webcam_init_obj) }, - { MP_ROM_QSTR(MP_QSTR_capture_frame), MP_ROM_PTR(&webcam_capture_frame_obj) }, - { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&webcam_deinit_obj) }, }; static MP_DEFINE_CONST_DICT(mp_module_webcam_globals, mp_module_webcam_globals_table);