(setq iplayer-updating-cache-process nil
iplayer-updating-cache-sentinel-info nil)
(dolist (info info)
- (let ((iplayer-command-frame (car info))
- (iplayer-command-window (cadr info))
- (iplayer-command-buffer (caddr info))
- (keys (car (cdddr info))))
+ (let ((iplayer-command-frame (nth 0 info))
+ (iplayer-command-window (nth 1 info))
+ (iplayer-command-buffer (nth 2 info))
+ (keys (nth 3 info))
+ (function (nth 4 info)))
(when (and (frame-live-p iplayer-command-frame)
(window-live-p iplayer-command-window)
(buffer-live-p iplayer-command-buffer))
(let ((old-frame (selected-frame))
(old-window (selected-window))
(old-buffer (current-buffer)))
- (let ((pre-command-hook
- (lambda ()
- (select-frame iplayer-command-frame)
- (select-window iplayer-command-window)
- (set-buffer iplayer-command-buffer)
- (setq pre-command-hook nil))))
- ;; KLUDGE: execute-kbd-macro executes a normal
- ;; command-loop, whose first action is to select the
- ;; current frame and window, which is why we contort
- ;; things to select the frame/window/buffer we actually
- ;; want in pre-command-hook. I'm actually surprised
- ;; that it works, but mine is not too much to reason
- ;; why; lots of other ways to try to achieve this didn't
- ;; in fact work.
- (execute-kbd-macro keys)
- ;; KLUDGE: and then we restore old state
- (select-window old-window)
- (select-frame old-frame)
- (set-buffer old-buffer))))))
- (message "Done updating iPlayer cache")))
+ (cond
+ ((version< emacs-version "24")
+ (let ((pre-command-hook
+ (lambda ()
+ (select-frame iplayer-command-frame)
+ (select-window iplayer-command-window)
+ (set-buffer iplayer-command-buffer)
+ (setq pre-command-hook nil))))
+ ;; KLUDGE: execute-kbd-macro executes a normal
+ ;; command-loop, whose first action is to select the
+ ;; current frame and window, which is why we contort
+ ;; things to select the frame/window/buffer we actually
+ ;; want in pre-command-hook. I'm actually surprised
+ ;; that it works, but mine is not too much to reason
+ ;; why; lots of other ways to try to achieve this didn't
+ ;; in fact work.
+ (execute-kbd-macro keys)
+ ;; KLUDGE: and then we restore old state
+ (select-window old-window)
+ (select-frame old-frame)
+ (set-buffer old-buffer)))
+ (t
+ ;; KLUDGE: we store the function name, which is fine,
+ ;; but some of our functions need to know which
+ ;; keystrokes were used to invoke them, so we need to
+ ;; pass those along, so we need to make sure that all
+ ;; iplayer-functions accept an optional argument, argh
+ ;; argh argh.
+ (with-selected-frame iplayer-command-frame
+ (with-current-buffer iplayer-command-buffer
+ (with-selected-window iplayer-command-window
+ (funcall function keys)))))))))
+ (message "Done updating iPlayer cache"))))
(defmacro define-iplayer-command (name arglist &rest body)
(let (docstring interactive)
(when (stringp (car body))
(setq docstring (car body) body (cdr body)))
- (when (and (consp (car body)) (eql (caar body) 'interactive))
+ (when (and (consp (car body)) (eql (car (car body)) 'interactive))
(setq interactive (car body) body (cdr body)))
`(defun ,name ,arglist
,@(when docstring (list docstring))
(message "Updating iPlayer cache"))
(if iplayer-updating-cache-sentinel-executing
(progn ,@body)
- (push (list (selected-frame) (selected-window) (current-buffer) (this-command-keys-vector))
+ (push (list (selected-frame) (selected-window) (current-buffer) (this-command-keys-vector) ',name)
iplayer-updating-cache-sentinel-info)))))
(defun get-iplayer-tree (&rest args)
Used in the `iplayer-preset' command.")
-(define-iplayer-command iplayer-preset (&optional prefix)
+(define-iplayer-command iplayer-preset (&optional keys)
"Switch display to a preset channel.
The presets are defined in the variable `iplayer-presets'."
- (interactive "p")
- (let ((keys (this-command-keys))
+ (interactive)
+ (let ((keys (or (and keys (concat keys)) (this-command-keys)))
(presets (mapcar (lambda (x) (cons (read-kbd-macro (car x)) (cdr x))) iplayer-presets)))
(cond
((= (length keys) 1)
;; should probably use a process filter instead to give us a
;; progress bar
(message "downloading id %s" id)
- (start-process "get-iplayer" " *get-iplayer*" "get-iplayer" "--get" (format "%s" id)))
+ (start-process "get-iplayer" " *get-iplayer*" "get-iplayer" "--modes=best" "--get" (format "%s" id)))
(message "no id at point"))))
(defun iplayer-previous ()
(use-local-map iplayer-mode-map)
(setq major-mode 'iplayer-mode mode-name "iPlayer"))
-(define-iplayer-command iplayer ()
+(define-iplayer-command iplayer (&optional keys)
"Start the emacs iPlayer interface."
(interactive)
(setq mode-line-process nil)
;;;###autoload
(autoload 'iplayer "iplayer" "Start the emacs iPlayer interface." t)
-
(provide 'iplayer)
;;; iplayer.el ends here
projects / iplayer-el.git / blobdiff