From 27b5b705e55fd1642753ac766863fa6dd8854792 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Mon, 4 Mar 2024 21:39:39 +0100 Subject: [PATCH] hidden output type option get default --- src/kds_s2000w_handler_opts.c | 57 ++++++++++++----------------- src/kds_s2000w_option_descriptors.c | 51 +++++++------------------- src/kds_s2000w_option_descriptors.h | 2 +- 3 files changed, 38 insertions(+), 72 deletions(-) diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 9a2fd41..42707fd 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 3 +#define COUNT_CUSTOM_OPTIONS 2 extern json_object* resp_config; extern json_object* config; @@ -104,54 +104,50 @@ void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* inf _write_int_value(value_object, value); break; case 11: - value_object = json_object_object_get(config, "OutputType"); - _write_string_value(value_object, value); - break; - case 12: value_object = json_object_object_get(config, "ColorAutoBrightnessMode"); _write_string_value(value_object, value); break; - case 13: + case 12: value_object = json_object_object_get(config, "ColorBalanceMode"); _write_string_value(value_object, value); break; - case 14: + case 13: value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); _write_int_value(value_object, value); break; - case 15: + case 14: value_object = json_object_object_get(config, "ColorBalanceRed"); _write_int_value(value_object, value); break; - case 16: + case 15: value_object = json_object_object_get(config, "ColorBalanceGreen"); _write_int_value(value_object, value); break; - case 17: + case 16: value_object = json_object_object_get(config, "ColorBalanceBlue"); _write_int_value(value_object, value); break; - case 18: + case 17: value_object = json_object_object_get(config, "ForegroundBoldnessMode"); _write_string_value(value_object, value); break; - case 19: + case 18: value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness"); _write_int_value(value_object, value); break; - case 20: + case 19: value_object = json_object_object_get(config, "BackgroundSmoothingMode"); _write_string_value(value_object, value); break; - case 21: + case 20: value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness"); _write_int_value(value_object, value); break; - case 22: + case 21: value_object = json_object_object_get(config, "BinarizationContrast"); _write_int_value(value_object, value); break; - case 23: + case 22: value_object = json_object_object_get(config, "MaxDocumentLength"); _write_int_value(value_object, value); break; @@ -225,59 +221,54 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf _write_int_value_to_json(value_object, value); break; case 11: - value_object = json_object_object_get(config, "OutputType"); - _write_string_value_to_json(value_object, value); - value_object = NULL; - break; - case 12: value_object = json_object_object_get(config, "ColorAutoBrightnessMode"); _write_string_value_to_json(value_object, value); break; - case 13: + case 12: value_object = json_object_object_get(config, "ColorBalanceMode"); _write_string_value_to_json(value_object, value); break; - case 14: + case 13: value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); _write_int_value_to_json(value_object, value); break; - case 15: + case 14: value_object = json_object_object_get(config, "ColorBalanceRed"); _write_int_value_to_json(value_object, value); break; - case 16: + case 15: value_object = json_object_object_get(config, "ColorBalanceGreen"); _write_int_value_to_json(value_object, value); break; - case 17: + case 16: value_object = json_object_object_get(config, "ColorBalanceBlue"); _write_int_value_to_json(value_object, value); break; - case 18: + case 17: value_object = json_object_object_get(config, "ForegroundBoldnessMode"); _write_string_value_to_json(value_object, value); break; - case 19: + case 18: value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness"); _write_int_value_to_json(value_object, value); break; - case 20: + case 19: value_object = json_object_object_get(config, "BackgroundSmoothingMode"); _write_string_value_to_json(value_object, value); break; - case 21: + case 20: value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness"); _write_int_value_to_json(value_object, value); break; - case 22: + case 21: value_object = json_object_object_get(config, "BinarizationContrast"); _write_int_value_to_json(value_object, value); break; - case 23: + case 22: value_object = json_object_object_get(config, "MaxDocumentLength"); _write_int_value_to_json(value_object, value); break; - case 24: + case 23: 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 7fb436c..10ace4e 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -10,7 +10,6 @@ SANE_String_Const* constraint_scanside = NULL; SANE_String_Const* constraint_colormode = NULL; SANE_String_Const* constraint_colordrop = NULL; SANE_Range* constraint_color_drop_out_aggressiveness_range = NULL; -SANE_String_Const* constraint_output_type = NULL; SANE_String_Const* constraint_color_auto_brightnessmode = NULL; SANE_String_Const* constraint_color_balance_mode = NULL; SANE_Range* constraint_color_balance_aggressiveness = NULL; @@ -212,27 +211,6 @@ SANE_Option_Descriptor* _kds_s2000w_option_descriptor_color_drop_out_aggressiven return descriptor; } -SANE_Option_Descriptor* _kds_s2000w_option_descriptor_output_type() -{ - debug_printf(ALL, "kds_s2000w_option_descriptor_output_type"); - SANE_Option_Descriptor* descriptor = malloc(sizeof(SANE_Option_Descriptor)); - - descriptor->name = "outputtype"; - descriptor->title = "outputtype"; - descriptor->desc = "outputtype"; - descriptor->cap = SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT; - descriptor->constraint_type = SANE_CONSTRAINT_STRING_LIST; - constraint_output_type = malloc(sizeof(char*) * 2); - constraint_output_type[0] = "Images"; - constraint_output_type[1] = NULL; - descriptor->constraint.string_list = constraint_output_type; - descriptor->type = SANE_TYPE_STRING; - descriptor->unit = SANE_UNIT_NONE; - descriptor->size = sizeof(SANE_String) * 50; - - return descriptor; -} - SANE_Option_Descriptor* _kds_s2000w_option_descriptor_color_auto_brightness_mode() { debug_printf(ALL, "kds_s2000w_option_descriptor_color_auto_brightness_mode"); @@ -578,20 +556,19 @@ void kds_s2000w_option_descriptor_init_option_descriptors() descriptor_array[8] = _kds_s2000w_option_descriptor_skip_blank_pages(); 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(); + descriptor_array[11] = _kds_s2000w_option_descriptor_color_auto_brightness_mode(); + descriptor_array[12] = _kds_s2000w_option_descriptor_color_balance_mode(); + descriptor_array[13] = _kds_s2000w_option_descriptor_color_balancea_agressiveness(); + descriptor_array[14] = _kds_s2000w_option_descriptor_color_balance_red(); + descriptor_array[15] = _kds_s2000w_option_descriptor_color_balance_green(); + descriptor_array[16] = _kds_s2000w_option_descriptor_color_balance_blue(); + descriptor_array[17] = _kds_s2000w_option_descriptor_foreground_boldness_mode(); + descriptor_array[18] = _kds_s2000w_option_descriptor_foreground_boldness_aggressiveness(); + descriptor_array[19] = _kds_s2000w_option_descriptor_background_smoothing_mode(); + descriptor_array[20] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness(); + descriptor_array[21] = _kds_s2000w_option_descriptor_binarization_contrast(); + descriptor_array[22] = _kds_s2000w_option_descriptor_max_document_length(); + descriptor_array[23] = _kds_s2000w_option_descriptor_config_reset(); } void kds_s2000w_option_descriptor_free_option_descriptors() @@ -607,8 +584,6 @@ void kds_s2000w_option_descriptor_free_option_descriptors() constraint_colordrop = NULL; free(constraint_color_drop_out_aggressiveness_range); constraint_color_drop_out_aggressiveness_range = NULL; - free(constraint_output_type); - constraint_output_type = NULL; free(constraint_color_auto_brightnessmode); constraint_color_auto_brightnessmode = NULL; free(constraint_color_balance_mode); diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h index c057e75..0c3cf97 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 25 +#define MAX_OPTION_COUNT 24 void kds_s2000w_option_descriptor_init_option_descriptors(); void kds_s2000w_option_descriptor_free_option_descriptors(); -- 2.39.5