Update.

[elisp.git] / media.el

diff --git a/media.el b/media.el
index c193b45..c2dd4e7 100644 (file)
--- a/media.el
+++ b/media.el
@@ -53,7 +53,7 @@
 
 (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."
@@ -112,6 +112,10 @@ title to display in the list (convenient for internet radios)."
   "Contains the name of the current file playing, the frequency in Hz
 and the bitrate. Should be nil if no information is available.")
 
+(defvar media/current-song-in-stream nil
+  "Contains the title of the current song playing, as it may be
+parsed from the stream.")
+
 (defvar media/buffer nil
   "The main buffer for the media player mode.")
 
@@ -243,6 +247,10 @@ and the bitrate. Should be nil if no information is available.")
 ;; 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)
@@ -254,6 +262,7 @@ and the bitrate. Should be nil if no information is available.")
         (time (get-text-property position 'time)))
     (if (not url) (media/remove-highlight)
       (run-hook-with-args 'media/before-play-hook url)
+      (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)))
@@ -821,6 +830,7 @@ returns nil if no id3 tags could be found."
 
 (defun media/stop () (interactive)
   (message "Stop")
+  (media/reset-current-information)
   (media/api/stop))
 
 (defun media/queue-song-at-point ()
@@ -868,6 +878,19 @@ the 'Queue' playlist, and plays it if no song is currently playing."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(defun media/player-error ()
+  (message "Player error")
+  (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/reset-current-information)
+      (media/remove-highlight))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (defun media/switch-continue-mode ()
   "Switches between a mode which automatically chains files and a mode
 which stops when the songs ends."
@@ -878,15 +901,6 @@ which stops when the songs ends."
     (message "Continue mode switched off."))
   )
 
-(defun media/player-error ()
-  (message "Player error")
-  (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/duration-to-string (duration)
   (let ((sec (mod duration 60))
         (min (/ duration 60)))
@@ -921,10 +935,12 @@ which stops when the songs ends."
   "Print a message with informations about the song currently playing"
   (interactive)
   (if media/current-information
-      (message "Now playing %s (%dHz, %s, %dkbit/s)"
+      (message "Now playing %s %s(%dHz, %s, %dkbit/s)"
                (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 " ") "")
                (nth 1 media/current-information)
                (if (= 2 (nth 2 media/current-information)) "stereo" "mono")
                (nth 3 media/current-information))