diff options
Diffstat (limited to 'src/common.h')
| -rw-r--r-- | src/common.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/common.h b/src/common.h index dedd259..d3cf481 100644 --- a/src/common.h +++ b/src/common.h @@ -186,12 +186,12 @@ /** - * Initialiser for `struct color_setting` + * Initialiser for `struct colour_setting` * * Sets all values to their neutral values (no effects applied) */ -#define COLOR_SETTING_NEUTRAL\ - ((struct color_setting){\ +#define COLOUR_SETTING_NEUTRAL\ + ((struct colour_setting){\ NEUTRAL_TEMPERATURE,\ NEUTRAL_BRIGHTNESS,\ {NEUTRAL_GAMMA, NEUTRAL_GAMMA, NEUTRAL_GAMMA}\ @@ -248,7 +248,7 @@ struct location { /** * Colour setting to apply */ -struct color_setting { +struct colour_setting { /** * Colour temperature, in Kelvin */ @@ -277,15 +277,15 @@ struct time_range { /* Transition scheme. The solar elevations at which the transition begins/ends, - and the association color settings. */ + and the association colour settings. */ struct transition_scheme { double high; double low; int use_time; /* When enabled, ignore elevation and use time ranges. */ struct time_range dawn; struct time_range dusk; - struct color_setting day; - struct color_setting night; + struct colour_setting day; + struct colour_setting night; }; @@ -318,7 +318,7 @@ struct options { /* Temperature to set in manual mode. */ unsigned long int temp_set; - /* Whether to fade between large skips in color temperature. */ + /* Whether to fade between large skips in colour temperature. */ int use_fade; /* Whether to preserve gamma ramps if supported by gamma method. */ int preserve_gamma; @@ -358,8 +358,8 @@ struct gamma_method { /* Restore the adjustment to the state before start was called. */ void (*restore)(GAMMA_STATE *state); - /* Set a specific color temperature. */ - int (*set_temperature)(GAMMA_STATE *state, const struct color_setting *setting, int preserve); + /* Set a specific colour temperature. */ + int (*set_temperature)(GAMMA_STATE *state, const struct colour_setting *setting, int preserve); }; @@ -418,9 +418,9 @@ extern const struct location_provider *location_providers[]; * @param size_b The number of stops in `gamma_b` * @param settings The colour settings to apply (temperature, brightness, gamma) */\ - void colorramp_fill_##SUFFIX(TYPE *gamma_r, TYPE *gamma_g, TYPE *gamma_b,\ - size_t size_r, size_t size_g, size_t size_b,\ - const struct color_setting *setting) + void colourramp_fill_##SUFFIX(TYPE *gamma_r, TYPE *gamma_g, TYPE *gamma_b,\ + size_t size_r, size_t size_g, size_t size_b,\ + const struct colour_setting *setting) LIST_RAMPS_STOP_VALUE_TYPES(X, ;); #undef X |