diff options
author | Bert Münnich <ber.t@posteo.de> | 2016-11-28 18:54:39 +0100 |
---|---|---|
committer | Bert Münnich <ber.t@posteo.de> | 2016-11-28 19:10:31 +0100 |
commit | c1ba841783db1d53f4da303e0db3b05b5eea958f (patch) | |
tree | 1addc98000f9d3797fcd18e540912c8f2ed20212 /image.c | |
parent | 32b29e61c1cf1fead8ccc3400d751955de7d5715 (diff) | |
parent | ec47ecb23a9914bbcd470421828620da99c693d5 (diff) | |
download | nsxiv-c1ba841783db1d53f4da303e0db3b05b5eea958f.tar.zst |
Merge dwminer/framerate
Diffstat (limited to 'image.c')
-rw-r--r-- | image.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -68,6 +68,7 @@ void img_init(img_t *img, win_t *win) img->alpha = ALPHA_LAYER; img->multi.cap = img->multi.cnt = 0; img->multi.animate = options->animate; + img->multi.framedelay = options->framerate > 0 ? 1000 / options->framerate : 0; img->multi.length = 0; img->cmod = imlib_create_color_modifier(); @@ -263,6 +264,7 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) img->multi.cap * sizeof(img_frame_t)); } img->multi.frames[img->multi.cnt].im = im; + delay = img->multi.framedelay > 0 ? img->multi.framedelay : delay; img->multi.frames[img->multi.cnt].delay = delay > 0 ? delay : DEF_GIF_DELAY; img->multi.length += img->multi.frames[img->multi.cnt].delay; img->multi.cnt++; |