From 7587c51cecc1b7b649db641cc9498621a7410321 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Thu, 25 Jan 2024 19:30:16 +0100 Subject: [PATCH] fix load first option --- src/kds_s2000w_handler.c | 13 +++---------- src/kds_s2000w_net.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 65eeac7..1fa7482 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -87,26 +87,19 @@ current_state* kds_s2000w_handler_current_state() void kds_s2000w_handler_get_option(int option, void* value) { - if (option != 0) - return; - if (option == 0) _get_all_options(); if (_all_options == NULL) return; - json_object* config = NULL; switch(option) { case 1: - config = json_object_object_get(_all_options, "Configuration"); - json_object* dpi = json_object_object_get(config, "DPI"); - array_list* dpi_list = json_object_get_array(dpi); - int** value_list = (int**) value; - memcpy(value_list, dpi_list->array, dpi_list->size); + int* int_value = (int*) value; + *int_value = 300; break; default: - config = json_object_object_get(_all_options, "Configuration"); + json_object* config = json_object_object_get(_all_options, "Configuration"); int* num_options = (int*) value; *num_options = 0; *num_options = json_object_object_length(config); diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index 2f5a9c2..0ce5327 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -74,6 +74,17 @@ const SANE_Option_Descriptor* _sane_kds_s2000w_net_get_option_descriptor( { current_state* state = kds_s2000w_handler_current_state(); switch (option) { + case 1: + optionDescripor->name = "resolution"; + optionDescripor->title = "resolution"; + optionDescripor->desc = "resolution"; + optionDescripor->type = SANE_TYPE_INT; + optionDescripor->unit = SANE_UNIT_DPI; + optionDescripor->size = sizeof(SANE_Int); + optionDescripor->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT; + optionDescripor->constraint_type = SANE_CONSTRAINT_NONE; + optionDescripor->constraint.string_list = NULL; + break; case 0: optionDescripor->name = ""; optionDescripor->title = ""; -- 2.39.5