RPJosh
/
wlsunset
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Precalculate animation step timings

master
Kenny Levinsen 2020-10-14 15:50:25 +02:00
parent 9922bdeeef
commit 67896358cf
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main.c
View File

@ -63,8 +63,6 @@ static int set_timer(timer_t timer, time_t deadline) {
} }
#endif #endif
static const int LONG_SLEEP = 600;
struct context { struct context {
int high_temp; int high_temp;
int low_temp; int low_temp;
@ -77,6 +75,9 @@ struct context {
time_t sunset; time_t sunset;
time_t dusk; time_t dusk;
time_t dawn_step_time;
time_t dusk_step_time;
bool new_output; bool new_output;
struct wl_list outputs; struct wl_list outputs;
timer_t timer; timer_t timer;
@ -266,11 +267,13 @@ static void set_temperature(struct wl_list *outputs, int temp, int gamma) {
} }
} }
static int anim_kelvin_step = 25;
static void recalc_stops(struct context *ctx, time_t now) { static void recalc_stops(struct context *ctx, time_t now) {
time_t day = now - (now % 86400); time_t day = now - (now % 86400);
if (ctx->dusk == 0) { if (ctx->dusk == 0) {
// First calculation // First calculation
} else if (now > ctx->dusk) { } else if (now >= ctx->dusk) {
day += 86400; day += 86400;
} else if (day < ctx->dusk) { } else if (day < ctx->dusk) {
return; return;
@ -288,6 +291,10 @@ static void recalc_stops(struct context *ctx, time_t now) {
ctx->sunset += day; ctx->sunset += day;
ctx->dusk += day; ctx->dusk += day;
int temp_diff = ctx->high_temp - ctx->low_temp;
ctx->dawn_step_time = (ctx->sunrise - ctx->dawn) * anim_kelvin_step / temp_diff;
ctx->dusk_step_time = (ctx->dusk - ctx->sunset) * anim_kelvin_step / temp_diff;
struct tm dawn, sunrise, sunset, dusk; struct tm dawn, sunrise, sunset, dusk;
localtime_r(&ctx->dawn, &dawn); localtime_r(&ctx->dawn, &dawn);
localtime_r(&ctx->sunrise, &sunrise); localtime_r(&ctx->sunrise, &sunrise);
@ -320,24 +327,19 @@ static int get_temperature(const struct context *ctx, time_t now) {
} }
} }
static int increments(int temp_diff, int duration) {
assert(temp_diff > 0);
int time = duration * 25 / temp_diff;
return time > LONG_SLEEP ? LONG_SLEEP : time;
}
static void update_timer(struct context *ctx, timer_t timer, time_t now) { static void update_timer(struct context *ctx, timer_t timer, time_t now) {
assert(now < ctx->dusk);
time_t deadline; time_t deadline;
if (now < ctx->dawn) { if (now < ctx->dawn) {
deadline = ctx->dawn; deadline = ctx->dawn;
} else if (now < ctx->sunrise) { } else if (now < ctx->sunrise) {
deadline = now + increments(ctx->high_temp - ctx->low_temp, ctx->sunrise - ctx->dawn); deadline = now + ctx->dawn_step_time;
} else if (now < ctx->sunset) { } else if (now < ctx->sunset) {
deadline = ctx->sunset; deadline = ctx->sunset;
} else if (now < ctx->dusk) { } else if (now < ctx->dusk) {
deadline = now + increments(ctx->high_temp - ctx->low_temp, ctx->dusk - ctx->sunset); deadline = now + ctx->dusk_step_time;
} else {
deadline = (ctx->dawn / 86400 + 1) * 86400;
} }
assert(deadline > now); assert(deadline > now);