[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111801: Add variables for default/mi
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111801: Add variables for default/minimum animated image frame delay |
Date: |
Fri, 15 Feb 2013 19:39:12 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111801
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-02-15 19:39:12 -0800
message:
Add variables for default/minimum animated image frame delay
* lisp/image.el (image-default-frame-delay): New variable.
(image-animated-p): Use image-default-frame-delay.
(image-minimum-frame-delay): New constant.
(image-animate-timeout): Use image-minimum-frame-delay.
modified:
lisp/ChangeLog
lisp/image.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-02-16 03:29:39 +0000
+++ b/lisp/ChangeLog 2013-02-16 03:39:12 +0000
@@ -1,5 +1,10 @@
2013-02-16 Glenn Morris <address@hidden>
+ * image.el (image-default-frame-delay): New variable.
+ (image-animated-p): Use image-default-frame-delay.
+ (image-minimum-frame-delay): New constant.
+ (image-animate-timeout): Use image-minimum-frame-delay.
+
* image.el (image-nth-frame): New, split from image-animate-timeout.
(image-animate-timeout): Use image-nth-frame.
* image-mode.el (image-goto-frame, image-next-frame)
=== modified file 'lisp/image.el'
--- a/lisp/image.el 2013-02-16 03:29:39 +0000
+++ b/lisp/image.el 2013-02-16 03:39:12 +0000
@@ -609,6 +609,10 @@
(defconst image-animated-types '(gif)
"List of supported animated image types.")
+(defvar image-default-frame-delay 0.1
+ "Default interval in seconds between frames of a multi-frame image.
+Only used if the image does not specify a value.")
+
(defun image-animated-p (image)
"Return non-nil if IMAGE can be animated.
To be capable of being animated, an image must be of a type
@@ -623,7 +627,7 @@
(images (plist-get metadata 'count))
(delay (plist-get metadata 'delay)))
(when (and images (> images 1) (numberp delay))
- (if (< delay 0) (setq delay 0.1))
+ (if (< delay 0) (setq delay image-default-frame-delay))
(cons images delay))))))
;; "Destructively"?
@@ -657,6 +661,9 @@
(setq timer nil)))
timer))
+(defconst image-minimum-frame-delay 0.01
+ "Minimum interval in seconds between frames of an animated image.")
+
(defvar-local image-current-frame nil
"The frame index of the current animated image.")
@@ -684,7 +691,7 @@
LIMIT determines when to stop. If t, loop forever. If nil, stop
after displaying the last animation frame. Otherwise, stop
after LIMIT seconds have elapsed.
-The minimum delay between successive frames is 0.01s."
+The minimum delay between successive frames is `image-minimum-frame-delay'."
(image-nth-frame image n t)
(setq n (1+ n))
(let* ((time (float-time))
@@ -692,7 +699,7 @@
;; Subtract off the time we took to load the image from the
;; stated delay time.
(delay (max (+ (cdr animation) time (- (float-time)))
- 0.01))
+ image-minimum-frame-delay))
done)
(if (>= n count)
(if limit
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111801: Add variables for default/minimum animated image frame delay,
Glenn Morris <=