X-Git-Url: http://christophe.rhodes.io/gitweb/?p=iplayer-el.git;a=blobdiff_plain;f=iplayer.el;h=a27450b6da1250ab823320641887dceb5dcd15ab;hp=1b02d16b6beed2e6a17f63a95977b1c55a7a9ac7;hb=95b13c36c85b1276b4d2eb198497f2249e6de8f4;hpb=fdc7d7e30e72d78e91285f0a1b0cfe3d2032daf8

diff --git a/iplayer.el b/iplayer.el
index 1b02d16..a27450b 100644
--- a/iplayer.el
+++ b/iplayer.el
@@ -36,51 +36,56 @@
     (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)))
-            (function (cadr (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.
-              (if (version< emacs-version "24")
-                  (execute-kbd-macro keys)
-                ;; 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.
-                (funcall function 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))
@@ -185,7 +190,7 @@ The presets are defined in the variable `iplayer-presets'."
           ;; 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 ()