From a6e776d939be6896c658095e76579f78fc4c2a14 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Tue, 30 Jan 2024 16:09:13 +0100 Subject: [PATCH] refactor change values set color --- src/kds_s2000w_handler.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index c4766b6..7e6f797 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -61,10 +61,13 @@ void _load_options() resp = NULL; } -int _reset_output_type(const char* current_value) +int _change_output_type_to_images() { - if (strcmp(current_value, "Color_BW") != 0) { - json_object* value_object = json_object_object_get(config, "OutputType"); + json_object* value_object = json_object_object_get(config, "ColorMode"); + const char* color_mode_value = json_object_get_string(value_object); + if (strcmp(color_mode_value, "Color_BW") != 0) { + value_object = NULL; + value_object = json_object_object_get(config, "OutputType"); const char* reset_value_ptr = "Images"; _write_string_value_to_json(value_object, (void*) reset_value_ptr); value_object = NULL; @@ -74,10 +77,11 @@ int _reset_output_type(const char* current_value) return 0; } -int _color_change_to_color_bw(const char* current_value) +int _color_change_to_color_bw() { - if (strcmp(current_value, "Color_BW") != 0) { - json_object* value_object = json_object_object_get(config, "ColorMode"); + json_object* value_object = json_object_object_get(config, "ColorMode"); + const char* color_mode_value = json_object_get_string(value_object); + if (strcmp(color_mode_value, "Color_BW") != 0) { const char* reset_value_ptr = "Color_BW"; _write_string_value_to_json(value_object, (void*) reset_value_ptr); value_object = NULL; @@ -279,7 +283,7 @@ void kds_s2000w_handler_set_option(int option, void* value, int* info) _write_string_value_to_json(value_object, value); const char* current_value = (const char*) value; - if (_reset_output_type(current_value)) + if (_change_output_type_to_images()) *info = RELOAD_OPTIONS; break; -- 2.39.5