Update.

[elisp.git] / media.el

diff --git a/media.el b/media.el
index 299ccba..c9d640d 100644 (file)
--- a/media.el
+++ b/media.el
@@ -53,7 +53,7 @@
 
 (defgroup media ()
   "Major mode to control media players"
 
 (defgroup media ()
   "Major mode to control media players"

-  :version "1.2.1")
+  :version "1.2.2")

 
 (defcustom media/player-api "media-mplayer"
   "The file to load for the abstract layer with the media player."
 
 (defcustom media/player-api "media-mplayer"
   "The file to load for the abstract layer with the media player."


@@ -103,8 +103,13 @@ title to display in the list (convenient for internet radios)."
   :type 'boolean
   :group 'media)
 
   :type 'boolean
   :group 'media)
 

+(defcustom media/continue-mode-hint "*"
+  "What to append to the MPlayer string when in repeat mode"
+  :type 'string
+  :group 'media)
+

 (defcustom media/expert nil
 (defcustom media/expert nil

-  "Should the keymap help be shown?"
+  "Should we bypass the keymap help when starting"

   :type 'boolean
   :group 'media)
 
   :type 'boolean
   :group 'media)
 


@@ -247,6 +252,10 @@ parsed from the stream.")
 ;; Finding and playing URLs ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; Finding and playing URLs ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 

+(defun media/reset-current-information ()
+    (setq media/current-information nil
+          media/current-song-in-stream nil))
+

 (defun media/format-url (url)
   (if (string-match "^file:.*/\\([^/]+\\)$" url)
       (match-string 1 url)
 (defun media/format-url (url)
   (if (string-match "^file:.*/\\([^/]+\\)$" url)
       (match-string 1 url)


@@ -258,8 +267,7 @@ parsed from the stream.")
         (time (get-text-property position 'time)))
     (if (not url) (media/remove-highlight)
       (run-hook-with-args 'media/before-play-hook url)
         (time (get-text-property position 'time)))
     (if (not url) (media/remove-highlight)
       (run-hook-with-args 'media/before-play-hook url)

-      (setq media/current-information nil
-            media/current-song-in-stream nil)
+      (media/reset-current-information)

       (media/api/play url)
       ;; We keep the information of the url and the title
       (setq media/played-information (cons url (get-text-property position 'title)))
       (media/api/play url)
       ;; We keep the information of the url and the title
       (setq media/played-information (cons url (get-text-property position 'title)))


@@ -617,9 +625,11 @@ returns nil if no id3 tags could be found."
                  (title (or (and (consp c) (cdr c)) url)))
             (if (string-match "^\\(http\\|mms\\)://" url)
                 (media/insert-url (cons url title) 0)
                  (title (or (and (consp c) (cdr c)) url)))
             (if (string-match "^\\(http\\|mms\\)://" url)
                 (media/insert-url (cons url title) 0)

-              (if (file-regular-p url) (media/insert-file url 0)
-                (if (file-directory-p url) (media/insert-dir url 0)
-                  (error "Unknown type `%s'" url))))))
+              (if (file-exists-p url)
+                  (if (file-regular-p url) (media/insert-file url 0)
+                    (if (file-directory-p url) (media/insert-dir url 0)
+                      (error "Unknown type `%s'" url))))
+              )))

         list))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
         list))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


@@ -656,8 +666,7 @@ returns nil if no id3 tags could be found."
               (push (cons url (cons title time)) (cdr (assoc playlist list)))
               )))))
 
               (push (cons url (cons title time)) (cdr (assoc playlist list)))
               )))))
 

-    (save-excursion
-      (set-buffer (find-file-noselect media/playlist-file))
+    (with-current-buffer (find-file-noselect media/playlist-file)

       (erase-buffer)
       (mapc (lambda (x)
               (insert "PLAYLIST:" (car x) "\n")
       (erase-buffer)
       (mapc (lambda (x)
               (insert "PLAYLIST:" (car x) "\n")


@@ -727,7 +736,8 @@ returns nil if no id3 tags could be found."
             (propertize "\n" 'playlist name)
             )
     (setq media/active-playlist name)
             (propertize "\n" 'playlist name)
             )
     (setq media/active-playlist name)

-    (message "Playlist `%s' created" name)))
+    ;; (message "Playlist `%s' created" name)
+    ))

 
 (defun media/playlist-position (name)
   "Returns the position where the given playlist starts."
 
 (defun media/playlist-position (name)
   "Returns the position where the given playlist starts."


@@ -827,8 +837,7 @@ returns nil if no id3 tags could be found."
 
 (defun media/stop () (interactive)
   (message "Stop")
 
 (defun media/stop () (interactive)
   (message "Stop")

-  (setq media/current-information nil
-        media/current-song-in-stream nil)
+  (media/reset-current-information)

   (media/api/stop))
 
 (defun media/queue-song-at-point ()
   (media/api/stop))
 
 (defun media/queue-song-at-point ()


@@ -878,15 +887,13 @@ the 'Queue' playlist, and plays it if no song is currently playing."
 
 (defun media/player-error ()
   (message "Player error")
 
 (defun media/player-error ()
   (message "Player error")

-  (setq media/current-information nil
-        media/current-song-in-stream nil)
+  (media/reset-current-information)

   (media/remove-highlight))
 
 (defun media/song-terminates ()
   (with-current-buffer media/buffer
     (if media/continue-mode (media/play-next t)
   (media/remove-highlight))
 
 (defun media/song-terminates ()
   (with-current-buffer media/buffer
     (if media/continue-mode (media/play-next t)

-      (setq media/current-information nil
-            media/current-song-in-stream nil)
+      (media/reset-current-information)

       (media/remove-highlight))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
       (media/remove-highlight))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


@@ -914,7 +921,7 @@ which stops when the songs ends."
    (concat
     " "
     media/player-id
    (concat
     " "
     media/player-id

-    (if media/continue-mode "*")
+    (if media/continue-mode media/continue-mode-hint)

     " "
 
     (if media/current-information
     " "
 
     (if media/current-information


@@ -939,7 +946,8 @@ which stops when the songs ends."
                (or (and (string= (car media/played-information) (nth 0 media/current-information))
                         (cdr media/played-information))
                    (replace-regexp-in-string "^.*/\\([^/]*\\)$" "\\1" (nth 0 media/current-information)))
                (or (and (string= (car media/played-information) (nth 0 media/current-information))
                         (cdr media/played-information))
                    (replace-regexp-in-string "^.*/\\([^/]*\\)$" "\\1" (nth 0 media/current-information)))

-               (if media/current-song-in-stream (concat "[" media/current-song-in-stream "] ") "")
+               ;; (if media/current-song-in-stream (concat "[" media/current-song-in-stream "] ") "")
+               (if media/current-song-in-stream (concat "| " media/current-song-in-stream " ") "")

                (nth 1 media/current-information)
                (if (= 2 (nth 2 media/current-information)) "stereo" "mono")
                (nth 3 media/current-information))
                (nth 1 media/current-information)
                (if (= 2 (nth 2 media/current-information)) "stereo" "mono")
                (nth 3 media/current-information))