diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2014-12-27 20:22:04 -0500 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2014-12-27 20:22:11 -0500 |
| commit | ec5aa19acf1b768586688dd7c82ee0d64d314b40 (patch) | |
| tree | 767475829fda9b9856532535e06dcb3ad02a5b32 /src/redshift.c | |
| parent | redshift: Add config setting to set gamma separately for day/night (diff) | |
| download | redshift-ng-ec5aa19acf1b768586688dd7c82ee0d64d314b40.tar.gz redshift-ng-ec5aa19acf1b768586688dd7c82ee0d64d314b40.tar.bz2 redshift-ng-ec5aa19acf1b768586688dd7c82ee0d64d314b40.tar.xz | |
redshift: Simplify set_temperature by passing color_setting_t
Changes all set_temperature function in gamma adjustment methods
to take a color_setting_t pointer with the color settings.
Colorramp functions are similarly changed to take a color settings
struct.
Diffstat (limited to 'src/redshift.c')
| -rw-r--r-- | src/redshift.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/redshift.c b/src/redshift.c index a19fe5c..f8c0d30 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -1296,8 +1296,7 @@ main(int argc, char *argv[]) } /* Adjust temperature */ - r = method->set_temperature(&state, interp.temperature, - interp.brightness, interp.gamma); + r = method->set_temperature(&state, &interp); if (r < 0) { fputs(_("Temperature adjustment failed.\n"), stderr); method->free(&state); @@ -1310,8 +1309,10 @@ main(int argc, char *argv[]) if (verbose) printf(_("Color temperature: %uK\n"), temp_set); /* Adjust temperature */ - r = method->set_temperature(&state, temp_set, day.brightness, - day.gamma); + color_setting_t manual; + memcpy(&manual, &day, sizeof(color_setting_t)); + manual.temperature = temp_set; + r = method->set_temperature(&state, &manual); if (r < 0) { fputs(_("Temperature adjustment failed.\n"), stderr); method->free(&state); @@ -1323,8 +1324,8 @@ main(int argc, char *argv[]) case PROGRAM_MODE_RESET: { /* Reset screen */ - r = method->set_temperature(&state, NEUTRAL_TEMP, 1.0, - day.gamma); + color_setting_t reset = { NEUTRAL_TEMP, { 1.0, 1.0, 1.0 }, 1.0 }; + r = method->set_temperature(&state, &reset); if (r < 0) { fputs(_("Temperature adjustment failed.\n"), stderr); method->free(&state); @@ -1473,10 +1474,7 @@ main(int argc, char *argv[]) /* Adjust temperature */ if (!disabled || short_trans_delta || set_adjustments) { - r = method->set_temperature(&state, - interp.temperature, - interp.brightness, - interp.gamma); + r = method->set_temperature(&state, &interp); if (r < 0) { fputs(_("Temperature adjustment" " failed.\n"), stderr); |