From: Bastian Dehn Date: Sat, 25 Jan 2025 16:47:23 +0000 (+0100) Subject: change handler opts names X-Git-Tag: v1.0.29^2~4^2~12 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=9c220a66a3ba50361a4b4406340b2316a75d9abc;p=sane-kds-s2000w-net.git change handler opts names --- diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h index 6bdebf6..7c920e8 100644 --- a/src/kds_s2000w_handler.h +++ b/src/kds_s2000w_handler.h @@ -60,8 +60,8 @@ void kds_s2000w_net_handler_get_current_scan_status(handler* h); void kds_s2000w_handler_recreate_session(handler* h); void kds_s2000w_handler_open(const char* devicename, void** handle); void kds_s2000w_handler_close(handler* h); -void kds_s2000w_handler_get_option(handler* handle, int option, void* value, int* info); -void kds_s2000w_handler_set_option(handler* handle, int option, void* value, int* info); +void kds_s2000w_handler_opts_get_option(handler* handle, int option, void* value, int* info); +void kds_s2000w_handler_opts_set_option(handler* handle, int option, void* value, int* info); void kds_s2000w_handler_set_option_auto(int option); void kds_s2000w_handler_start_scan(handler* h); void kds_s2000w_handler_stop_scan(handler* h); diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index d26a105..f537b38 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -6,7 +6,7 @@ #define AUTOSTART_ON 1 -void _write_string_value(json_object* value_object, void* value) +void _kds_s2000w_handler_opts_write_string_value(json_object* value_object, void* value) { const char* string_value = json_object_get_string(value_object); char* char_value = (char*) value; @@ -14,25 +14,25 @@ void _write_string_value(json_object* value_object, void* value) memcpy(char_value, string_value, sizeof(char) * value_length); } -void _write_int_value(json_object* value_object, void* value) +void _kds_s2000w_handler_opts_write_int_value(json_object* value_object, void* value) { int* int_value_ptr = (int*) value; *int_value_ptr = json_object_get_int(value_object); } -void _write_string_value_to_json(json_object* value_object, void* value) +void _kds_s2000w_handler_opts_write_string_value_to_json(json_object* value_object, void* value) { char* char_value = (char*) value; json_object_set_string(value_object, char_value); } -void _write_int_value_to_json(json_object* value_object, void* value) +void _kds_s2000w_handler_opts_write_int_value_to_json(json_object* value_object, void* value) { int* int_value_ptr = (int*) value; json_object_set_int(value_object, *int_value_ptr); } -void _load_options(handler* h) +void _kds_s2000w_handler_opts_load_options(handler* h) { json_object_put(h->current_scanner_config); h->current_scanner_config = NULL; @@ -53,15 +53,15 @@ void _load_options(handler* h) resp = NULL; } -void _set_autostart_on(handler* h) +void _kds_s2000w_handler_opts_set_autostart_on(handler* h) { int auto_start_value = AUTOSTART_ON; json_object* config = json_object_object_get(h->current_scanner_config, "Configuration"); json_object* value_object = json_object_object_get(config, "AutoStart"); - _write_int_value_to_json(value_object, &auto_start_value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, &auto_start_value); } -void _set_option_to_default(handler* h) +void _kds_s2000w_handler_opts_set_option_to_default(handler* h) { response* resp = kds_s2000w_client_response_init(); kds_s2000w_client_get_capabilities(resp); @@ -79,7 +79,7 @@ void _set_option_to_default(handler* h) resp = NULL; } -void _set_options(handler* h) +void _kds_s2000w_handler_opts_set_options(handler* h) { const char* json_string = json_object_to_json_string_ext(h->current_scanner_config, JSON_C_TO_STRING_PLAIN); response* resp = kds_s2000w_client_response_init(); @@ -95,15 +95,15 @@ void _set_options(handler* h) resp = NULL; } -void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* info) +void kds_s2000w_handler_opts_get_option(handler* h, int option, void* value, int* info) { json_object* config = NULL; json_object* value_object = NULL; if (h->current_scanner_config == NULL) { - _load_options(h); - _set_autostart_on(h); - _set_options(h); + _kds_s2000w_handler_opts_load_options(h); + _kds_s2000w_handler_opts_set_autostart_on(h); + _kds_s2000w_handler_opts_set_options(h); } if (h->current_scanner_config != NULL) @@ -118,7 +118,7 @@ void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* inf break; case 2: value_object = json_object_object_get(config, "ScanSource"); - _write_string_value(value_object, value); + _kds_s2000w_handler_opts_write_string_value(value_object, value); if (strcmp(value, "Flatbed") == 0) h->current_scan_status->feeder = 0; @@ -132,85 +132,85 @@ void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* inf break; case 3: value_object = json_object_object_get(config, "ColorMode"); - _write_string_value(value_object, value); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 4: value_object = json_object_object_get(config, "DPI"); - _write_int_value(value_object, value); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 5: value_object = json_object_object_get(config, "ScanSide"); - _write_string_value(value_object, value); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 7: value_object = json_object_object_get(config, "SkipBlankPages"); - _write_int_value(value_object, value); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 8: value_object = json_object_object_get(config, "ColorDropOut"); - _write_string_value(value_object, value); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 9: value_object = json_object_object_get(config, "ColorDropOutAggressiveness"); - _write_int_value(value_object, value); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 10: value_object = json_object_object_get(config, "ColorAutoBrightnessMode"); - _write_string_value(value_object, value); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 11: value_object = json_object_object_get(config, "ColorBalanceMode"); - _write_string_value(value_object, value); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 12: value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); - _write_int_value(value_object, value); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 13: value_object = json_object_object_get(config, "ColorBalanceRed"); - _write_int_value(value_object, value); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 14: value_object = json_object_object_get(config, "ColorBalanceGreen"); - _write_int_value(value_object, value); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 15: value_object = json_object_object_get(config, "ColorBalanceBlue"); - _write_int_value(value_object, value); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 16: value_object = json_object_object_get(config, "ForegroundBoldnessMode"); - _write_string_value(value_object, value); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 17: value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness"); - _write_int_value(value_object, value); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 18: value_object = json_object_object_get(config, "BackgroundSmoothingMode"); - _write_string_value(value_object, value); + _kds_s2000w_handler_opts_write_string_value(value_object, value); break; case 19: value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness"); - _write_int_value(value_object, value); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; case 20: value_object = json_object_object_get(config, "BinarizationContrast"); - _write_int_value(value_object, value); + _kds_s2000w_handler_opts_write_int_value(value_object, value); break; default: break; } } -void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* info) +void kds_s2000w_handler_opts_set_option(handler* h, int option, void* value, int* info) { if (h->read_info->scan_started) return; if (h->current_scanner_config == NULL) { - _load_options(h); - _set_autostart_on(h); + _kds_s2000w_handler_opts_load_options(h); + _kds_s2000w_handler_opts_set_autostart_on(h); } json_object* config = json_object_object_get(h->current_scanner_config, "Configuration"); @@ -219,7 +219,7 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf switch(option) { case 2: value_object = json_object_object_get(config, "ScanSource"); - _write_string_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); if (strcmp(value, "Flatbed") == 0) h->current_scan_status->feeder = 0; @@ -233,7 +233,7 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf break; case 3: value_object = json_object_object_get(config, "ColorMode"); - _write_string_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); value_object = NULL; if (info != NULL) @@ -241,73 +241,73 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf break; case 4: value_object = json_object_object_get(config, "DPI"); - _write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 5: value_object = json_object_object_get(config, "ScanSide"); - _write_string_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); value_object = NULL; break; case 7: value_object = json_object_object_get(config, "SkipBlankPages"); - _write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); value_object = NULL; break; case 8: value_object = json_object_object_get(config, "ColorDropOut"); - _write_string_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 9: value_object = json_object_object_get(config, "ColorDropOutAggressiveness"); - _write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 10: value_object = json_object_object_get(config, "ColorAutoBrightnessMode"); - _write_string_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 11: value_object = json_object_object_get(config, "ColorBalanceMode"); - _write_string_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 12: value_object = json_object_object_get(config, "ColorBalanceAggressiveness"); - _write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 13: value_object = json_object_object_get(config, "ColorBalanceRed"); - _write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 14: value_object = json_object_object_get(config, "ColorBalanceGreen"); - _write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 15: value_object = json_object_object_get(config, "ColorBalanceBlue"); - _write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 16: value_object = json_object_object_get(config, "ForegroundBoldnessMode"); - _write_string_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 17: value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness"); - _write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 18: value_object = json_object_object_get(config, "BackgroundSmoothingMode"); - _write_string_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); break; case 19: value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness"); - _write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 20: value_object = json_object_object_get(config, "BinarizationContrast"); - _write_int_value_to_json(value_object, value); + _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value); break; case 21: - _set_option_to_default(h); - _set_autostart_on(h); + _kds_s2000w_handler_opts_set_option_to_default(h); + _kds_s2000w_handler_opts_set_autostart_on(h); if (info != NULL) *info = RELOAD_OPTIONS | RELOAD_PARAMS; @@ -317,5 +317,5 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf break; } - _set_options(h); + _kds_s2000w_handler_opts_set_options(h); } \ No newline at end of file diff --git a/src/kds_s2000w_handler_opts.h b/src/kds_s2000w_handler_opts.h index 0b41e7a..d098895 100644 --- a/src/kds_s2000w_handler_opts.h +++ b/src/kds_s2000w_handler_opts.h @@ -2,7 +2,7 @@ #define KDS_S2000W_HANDLER_OPTS_H #include "kds_s2000w_handler.h" -void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* info); -void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* info); +void kds_s2000w_handler_opts_get_option(handler* h, int option, void* value, int* info); +void kds_s2000w_handler_opts_set_option(handler* h, int option, void* value, int* info); #endif \ No newline at end of file diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index a02f945..19969b6 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -101,10 +101,10 @@ SANE_Status sane_kds_s2000w_net_control_option(SANE_Handle handle, handler* h = (handler*) handle; if (action == SANE_ACTION_GET_VALUE) - kds_s2000w_handler_get_option(h, option, value, info); + kds_s2000w_handler_opts_get_option(h, option, value, info); if (action == SANE_ACTION_SET_VALUE) - kds_s2000w_handler_set_option(h, option, value, info); + kds_s2000w_handler_opts_set_option(h, option, value, info); return SANE_STATUS_GOOD; }