From: Bastian Dehn Date: Mon, 4 Mar 2024 20:24:52 +0000 (+0100) Subject: make auto start hidden option default on X-Git-Tag: v1.0.0^2~138^2~2 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=0627c0e8037fdf254b57744609fe98259241402c;p=sane-kds-s2000w-net.git make auto start hidden option default on --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index ee1e06b..9a2fd41 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -6,7 +6,7 @@ #include "kds_s2000w_debug.h" #define AUTOSTART_ALWAYS_ON 1 -#define COUNT_CUSTOM_OPTIONS 4 +#define COUNT_CUSTOM_OPTIONS 3 extern json_object* resp_config; extern json_object* config; @@ -96,66 +96,62 @@ void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* inf _write_int_value(value_object, value); break; case 9: - value_object = json_object_object_get(config, "AutoStart"); - _write_int_value(value_object, value); - break; - case 10: value_object = json_object_object_get(config, "ColorDropOut"); _write_string_value(value_object, value); break; - case 11: + case 10: value_object = json_object_object_get(config, "ColorDropOutAggressiveness"); _write_int_value(value_object, value); break; - case 12: + case 11: value_object = json_object_object_get(config, "OutputType"); _write_string_value(value_object, value); break; - case 13: + case 12: value_object = json_object_object_get(config, "ColorAutoBrightnessMode"); _write_string_value(value_object, value); break; - case 14: + case 13: value_object = json_object_object_get(config, "ColorBalanceMode"); _write_string_value(value_object, value); break; - case 15: + case 14: value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); _write_int_value(value_object, value); break; - case 16: + case 15: value_object = json_object_object_get(config, "ColorBalanceRed"); _write_int_value(value_object, value); break; - case 17: + case 16: value_object = json_object_object_get(config, "ColorBalanceGreen"); _write_int_value(value_object, value); break; - case 18: + case 17: value_object = json_object_object_get(config, "ColorBalanceBlue"); _write_int_value(value_object, value); break; - case 19: + case 18: value_object = json_object_object_get(config, "ForegroundBoldnessMode"); _write_string_value(value_object, value); break; - case 20: + case 19: value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness"); _write_int_value(value_object, value); break; - case 21: + case 20: value_object = json_object_object_get(config, "BackgroundSmoothingMode"); _write_string_value(value_object, value); break; - case 22: + case 21: value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness"); _write_int_value(value_object, value); break; - case 23: + case 22: value_object = json_object_object_get(config, "BinarizationContrast"); _write_int_value(value_object, value); break; - case 24: + case 23: value_object = json_object_object_get(config, "MaxDocumentLength"); _write_int_value(value_object, value); break; @@ -171,6 +167,12 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf config = json_object_object_get(resp_config, "Configuration"); json_object* value_object = NULL; + + int autostart_value = AUTOSTART_ALWAYS_ON; + value_object = json_object_object_get(config, "AutoStart"); + _write_int_value_to_json(value_object, &autostart_value); + value_object = NULL; + switch(option) { case 2: value_object = json_object_object_get(config, "ScanSource"); @@ -215,74 +217,67 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf value_object = NULL; break; case 9: - int* autostart_value = (int*) value; - *autostart_value = AUTOSTART_ALWAYS_ON; - value_object = json_object_object_get(config, "AutoStart"); - _write_int_value_to_json(value_object, autostart_value); - *info = RELOAD_OPTIONS; - break; - case 10: value_object = json_object_object_get(config, "ColorDropOut"); _write_string_value_to_json(value_object, value); break; - case 11: + case 10: value_object = json_object_object_get(config, "ColorDropOutAggressiveness"); _write_int_value_to_json(value_object, value); break; - case 12: + case 11: value_object = json_object_object_get(config, "OutputType"); _write_string_value_to_json(value_object, value); value_object = NULL; break; - case 13: + case 12: value_object = json_object_object_get(config, "ColorAutoBrightnessMode"); _write_string_value_to_json(value_object, value); break; - case 14: + case 13: value_object = json_object_object_get(config, "ColorBalanceMode"); _write_string_value_to_json(value_object, value); break; - case 15: + case 14: value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); _write_int_value_to_json(value_object, value); break; - case 16: + case 15: value_object = json_object_object_get(config, "ColorBalanceRed"); _write_int_value_to_json(value_object, value); break; - case 17: + case 16: value_object = json_object_object_get(config, "ColorBalanceGreen"); _write_int_value_to_json(value_object, value); break; - case 18: + case 17: value_object = json_object_object_get(config, "ColorBalanceBlue"); _write_int_value_to_json(value_object, value); break; - case 19: + case 18: value_object = json_object_object_get(config, "ForegroundBoldnessMode"); _write_string_value_to_json(value_object, value); break; - case 20: + case 19: value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness"); _write_int_value_to_json(value_object, value); break; - case 21: + case 20: value_object = json_object_object_get(config, "BackgroundSmoothingMode"); _write_string_value_to_json(value_object, value); break; - case 22: + case 21: value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness"); _write_int_value_to_json(value_object, value); break; - case 23: + case 22: value_object = json_object_object_get(config, "BinarizationContrast"); _write_int_value_to_json(value_object, value); break; - case 24: + case 23: value_object = json_object_object_get(config, "MaxDocumentLength"); _write_int_value_to_json(value_object, value); break; - case 25: + case 24: response* resp = kds_s2000w_client_response_init(); kds_s2000w_client_get_capabilities(resp); json_object* capabilities = json_tokener_parse(resp->data); diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index ffcbdff..7fb436c 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -162,23 +162,6 @@ SANE_Option_Descriptor* _kds_s2000w_option_descriptor_skip_blank_pages() return descriptor; } -SANE_Option_Descriptor* _kds_s2000w_option_descriptor_auto_start() -{ - debug_printf(ALL, "kds_s2000w_option_descriptor_auto_start"); - SANE_Option_Descriptor* descriptor = malloc(sizeof(SANE_Option_Descriptor)); - - descriptor->name = "autostart"; - descriptor->title = "autostart"; - descriptor->desc = "autostart"; - descriptor->cap = SANE_CAP_SOFT_DETECT; - descriptor->constraint_type = SANE_CONSTRAINT_NONE; - descriptor->type = SANE_TYPE_BOOL; - descriptor->unit = SANE_UNIT_NONE; - descriptor->size = sizeof(SANE_Bool); - - return descriptor; -} - SANE_Option_Descriptor* _kds_s2000w_option_descriptor_color_drop() { debug_printf(ALL, "kds_s2000w_option_descriptor_color_drop"); @@ -593,23 +576,22 @@ void kds_s2000w_option_descriptor_init_option_descriptors() descriptor_array[6] = _kds_s2000w_option_descriptor_depth(); descriptor_array[7] = _kds_s2000w_option_descriptor_geometry_group(); descriptor_array[8] = _kds_s2000w_option_descriptor_skip_blank_pages(); - descriptor_array[9] = _kds_s2000w_option_descriptor_auto_start(); - descriptor_array[10] = _kds_s2000w_option_descriptor_color_drop(); - descriptor_array[11] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness(); - descriptor_array[12] = _kds_s2000w_option_descriptor_output_type(); - descriptor_array[13] = _kds_s2000w_option_descriptor_color_auto_brightness_mode(); - descriptor_array[14] = _kds_s2000w_option_descriptor_color_balance_mode(); - descriptor_array[15] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); - descriptor_array[16] = _kds_s2000w_option_descriptor_color_balance_red(); - descriptor_array[17] = _kds_s2000w_option_descriptor_color_balance_green(); - descriptor_array[18] = _kds_s2000w_option_descriptor_color_balance_blue(); - descriptor_array[19] = _kds_s2000w_option_descriptor_foreground_boldness_mode(); - descriptor_array[20] = _kds_s2000w_option_descriptor_foreground_boldness_aggressiveness(); - descriptor_array[21] = _kds_s2000w_option_descriptor_background_smoothing_mode(); - descriptor_array[22] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness(); - descriptor_array[23] = _kds_s2000w_option_descriptor_binarization_contrast(); - descriptor_array[24] = _kds_s2000w_option_descriptor_max_document_length(); - descriptor_array[25] = _kds_s2000w_option_descriptor_config_reset(); + descriptor_array[9] = _kds_s2000w_option_descriptor_color_drop(); + descriptor_array[10] = _kds_s2000w_option_descriptor_color_drop_out_aggressiveness(); + descriptor_array[11] = _kds_s2000w_option_descriptor_output_type(); + descriptor_array[12] = _kds_s2000w_option_descriptor_color_auto_brightness_mode(); + descriptor_array[13] = _kds_s2000w_option_descriptor_color_balance_mode(); + descriptor_array[14] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); + descriptor_array[15] = _kds_s2000w_option_descriptor_color_balance_red(); + descriptor_array[16] = _kds_s2000w_option_descriptor_color_balance_green(); + descriptor_array[17] = _kds_s2000w_option_descriptor_color_balance_blue(); + descriptor_array[18] = _kds_s2000w_option_descriptor_foreground_boldness_mode(); + descriptor_array[19] = _kds_s2000w_option_descriptor_foreground_boldness_aggressiveness(); + descriptor_array[20] = _kds_s2000w_option_descriptor_background_smoothing_mode(); + descriptor_array[21] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness(); + descriptor_array[22] = _kds_s2000w_option_descriptor_binarization_contrast(); + descriptor_array[23] = _kds_s2000w_option_descriptor_max_document_length(); + descriptor_array[24] = _kds_s2000w_option_descriptor_config_reset(); } void kds_s2000w_option_descriptor_free_option_descriptors() diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h index 55418cd..c057e75 100644 --- a/src/kds_s2000w_option_descriptors.h +++ b/src/kds_s2000w_option_descriptors.h @@ -2,7 +2,7 @@ #define KDS_S2000W_OPTION_DESCRIPTORS_H #include -#define MAX_OPTION_COUNT 26 +#define MAX_OPTION_COUNT 25 void kds_s2000w_option_descriptor_init_option_descriptors(); void kds_s2000w_option_descriptor_free_option_descriptors();