move scan source up to position two

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index d7e78c2ec52b315ec0cb4006a4f758a2efa2480f..04978eda2702a2e1316420d5ed1d8a4b45fdce5f 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -127,98 +127,98 @@ void kds_s2000w_handler_get_option(handler* h, int option, void* value, int* inf
                        *int_value_ptr = json_object_object_length(config) + COUNT_CUSTOM_OPTIONS;
                        break;
                case 2:
+                       value_object = json_object_object_get(config, "ScanSource");
+                       _write_string_value(value_object, value);
+                       break;
+               case 3:
                        value_object = json_object_object_get(config, "DPI");
                        _write_int_value(value_object, value);
                        break;
-               case 3:
+               case 4:
                        value_object = json_object_object_get(config, "ScanSide");
                        _write_string_value(value_object, value);
                        break;
-               case 4:
+               case 5:
                        int depth = h->current_metadata->depth;
                        int* int_value = (int*) value;
                        *int_value = depth;
                        break;
-               case 6:
+               case 7:
                        value_object = json_object_object_get(config, "ColorMode");
                        _write_string_value(value_object, value);
                        break;
-               case 7:
+               case 8:
                        value_object = json_object_object_get(config, "SkipBlankPages");
                        _write_int_value(value_object, value);
                        break;
-               case 8:
+               case 9:
                        value_object = json_object_object_get(config, "AutoStart");
                        _write_int_value(value_object, value);
                        break;
-               case 9:
+               case 10:
                        value_object = json_object_object_get(config, "ColorDropOut");
                        _write_string_value(value_object, value);
                        break;
-               case 10:
+               case 11:
                        value_object = json_object_object_get(config, "ColorDropOutAggressiveness");
                        _write_int_value(value_object, value);
                        break;
-               case 11:
+               case 12:
                        value_object = json_object_object_get(config, "OutputType");
                        _write_string_value(value_object, value);
                        break;
-               case 12:
+               case 13:
                        value_object = json_object_object_get(config, "ColorAutoBrightnessMode");
                        _write_string_value(value_object, value);
                        break;
-               case 13:
+               case 14:
                        value_object = json_object_object_get(config, "ColorBalanceMode");
                        _write_string_value(value_object, value);
                        break;
-               case 14:
+               case 15:
                        value_object = json_object_object_get(config, "ColorBalanceAggressiveness");
                        _write_int_value(value_object, value);
                        break;
-               case 15:
+               case 16:
                        value_object = json_object_object_get(config, "ColorBalanceRed");
                        _write_int_value(value_object, value);
                        break;
-               case 16:
+               case 17:
                        value_object = json_object_object_get(config, "ColorBalanceGreen");
                        _write_int_value(value_object, value);
                        break;
-               case 17:
+               case 18:
                        value_object = json_object_object_get(config, "ColorBalanceBlue");
                        _write_int_value(value_object, value);
                        break;
-               case 18:
+               case 19:
                        value_object = json_object_object_get(config, "ForegroundBoldnessMode");
                        _write_string_value(value_object, value);
                        break;
-               case 19:
+               case 20:
                        value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness");
                        _write_int_value(value_object, value);
                        break;
-               case 20:
+               case 21:
                        value_object = json_object_object_get(config, "BackgroundSmoothingMode");
                        _write_string_value(value_object, value);
                        break;
-               case 21:
+               case 22:
                        value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness");
                        _write_int_value(value_object, value);
                        break;
-               case 22:
+               case 23:
                        value_object = json_object_object_get(config, "BinarizationMode");
                        _write_string_value(value_object, value);
                        break;
-               case 23:
+               case 24:
                        value_object = json_object_object_get(config, "BinarizationContrast");
                        _write_int_value(value_object, value);
                        break;
-               case 24:
+               case 25:
                        value_object = json_object_object_get(config, "MaxDocumentLength");
                        _write_int_value(value_object, value);
                        break;
-               case 25:
-                       value_object = json_object_object_get(config, "ScanSource");
-                       _write_string_value(value_object, value);
-                       break;
                case 27:
                        memcpy(value, &gamma_table[0][0], sizeof(int) * 256);
                        break;
@@ -245,20 +245,24 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf
        json_object* value_object = NULL;
        switch(option) {
                case 2:
+                       value_object = json_object_object_get(config, "ScanSource");
+                       _write_string_value_to_json(value_object, value);
+                       break;
+               case 3:
                        value_object = json_object_object_get(config, "DPI");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 3:
+               case 4:
                        value_object = json_object_object_get(config, "ScanSide");
                        _write_string_value_to_json(value_object, value);
                        value_object = NULL;
                        break;
-               case 4:
+               case 5:
                        int* int_value = (int*) value;
                        h->current_metadata->depth = *int_value;
                        *info = RELOAD_PARAMS;
                        break;
-               case 6:
+               case 7:
                        value_object = json_object_object_get(config, "ColorMode");
                        _write_string_value_to_json(value_object, value);
                        value_object = NULL;
@@ -280,7 +284,7 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf
                        *info |= RELOAD_PARAMS;
 
                        break;
-               case 7:
+               case 8:
                        value_object = json_object_object_get(config, "SkipBlankPages");
                        _write_int_value_to_json(value_object, value);
                        value_object = NULL;
@@ -289,19 +293,19 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf
                                *info = RELOAD_OPTIONS;
 
                        break;
-               case 8:
+               case 9:
                        value_object = json_object_object_get(config, "AutoStart");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 9:
+               case 10:
                        value_object = json_object_object_get(config, "ColorDropOut");
                        _write_string_value_to_json(value_object, value);
                        break;
-               case 10:
+               case 11:
                        value_object = json_object_object_get(config, "ColorDropOutAggressiveness");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 11:
+               case 12:
                        value_object = json_object_object_get(config, "OutputType");
                        _write_string_value_to_json(value_object, value);
                        value_object = NULL;
@@ -313,62 +317,58 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf
                                *info = RELOAD_OPTIONS;
 
                        break;
-               case 12:
+               case 13:
                        value_object = json_object_object_get(config, "ColorAutoBrightnessMode");
                        _write_string_value_to_json(value_object, value);
                        break;
-               case 13:
+               case 14:
                        value_object = json_object_object_get(config, "ColorBalanceMode");
                        _write_string_value_to_json(value_object, value);
                        break;
-               case 14:
+               case 15:
                        value_object = json_object_object_get(config, "ColorBalanceAggressiveness");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 15:
+               case 16:
                        value_object = json_object_object_get(config, "ColorBalanceRed");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 16:
+               case 17:
                        value_object = json_object_object_get(config, "ColorBalanceGreen");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 17:
+               case 18:
                        value_object = json_object_object_get(config, "ColorBalanceBlue");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 18:
+               case 19:
                        value_object = json_object_object_get(config, "ForegroundBoldnessMode");
                        _write_string_value_to_json(value_object, value);
                        break;
-               case 19:
+               case 20:
                        value_object = json_object_object_get(config, "ForegroundBoldnessAggressiveness");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 20:
+               case 21:
                        value_object = json_object_object_get(config, "BackgroundSmoothingMode");
                        _write_string_value_to_json(value_object, value);
                        break;
-               case 21:
+               case 22:
                        value_object = json_object_object_get(config, "BackgroundSmoothingAggressiveness");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 22:
+               case 23:
                        value_object = json_object_object_get(config, "BinarizationMode");
                        _write_string_value_to_json(value_object, value);
                        break;
-               case 23:
+               case 24:
                        value_object = json_object_object_get(config, "BinarizationContrast");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 24:
+               case 25:
                        value_object = json_object_object_get(config, "MaxDocumentLength");
                        _write_int_value_to_json(value_object, value);
                        break;
-               case 25:
-                       value_object = json_object_object_get(config, "ScanSource");
-                       _write_string_value_to_json(value_object, value);
-                       break;
                case 26:
                        response* resp = kds_s2000w_client_response_init();
                        kds_s2000w_client_get_capabilities(resp);

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 48fea44989eec8d5d04be35617e1e094921e917b..1e6375c967706020975f0ad1621e32d9316f4f2e 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -701,30 +701,30 @@ void kds_s2000w_option_descriptor_init_option_descriptors()
 
        descriptor_array[0] = _kds_s2000w_option_descriptor_num_options();
        descriptor_array[1] = _kds_s2000w_option_descriptor_standard_group();
-       descriptor_array[2] = _kds_s2000w_option_descriptor_dpi();
-       descriptor_array[3] = _kds_s2000w_option_descriptor_scanside();
-       descriptor_array[4] = _kds_s2000w_option_descriptor_depth();
-       descriptor_array[5] = _kds_s2000w_option_descriptor_geometry_group();
-       descriptor_array[6] = _kds_s2000w_option_descriptor_color_mode();
-       descriptor_array[7] = _kds_s2000w_option_descriptor_skip_blank_pages();
-       descriptor_array[8] = _kds_s2000w_option_descriptor_auto_start();
-       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_mode();
-       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_scan_source();
+       descriptor_array[2] = _kds_s2000w_option_descriptor_scan_source();
+       descriptor_array[3] = _kds_s2000w_option_descriptor_dpi();
+       descriptor_array[4] = _kds_s2000w_option_descriptor_scanside();
+       descriptor_array[5] = _kds_s2000w_option_descriptor_depth();
+       descriptor_array[6] = _kds_s2000w_option_descriptor_geometry_group();
+       descriptor_array[7] = _kds_s2000w_option_descriptor_color_mode();
+       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_mode();
+       descriptor_array[24] = _kds_s2000w_option_descriptor_binarization_contrast();
+       descriptor_array[25] = _kds_s2000w_option_descriptor_max_document_length();
        descriptor_array[26] = _kds_s2000w_option_descriptor_config_reset();
        descriptor_array[27] = _kds_s2000w_option_descriptor_gamma_vector();
        descriptor_array[28] = _kds_s2000w_option_descriptor_gamma_vector_r();