X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=media-mplayer.el;h=fbcd87aa71e756c1083375863027790f6d1478ed;hb=6c647377c97541756bf9d9d7e350a156078ba997;hp=dd953bec15834593450b0320e09e2823e1014c3b;hpb=5c380b2ce1a11b3ac2289eddc5e907372a7c0a97;p=elisp.git

diff --git a/media-mplayer.el b/media-mplayer.el
index dd953be..fbcd87a 100644
--- a/media-mplayer.el
+++ b/media-mplayer.el
@@ -80,9 +80,14 @@ load Emacs less. Nil means no timing."
              ;; ----------------------------------------
 
              ("ICY Info:" .
-              (if (string-match "StreamTitle='\\([^']*\\)';" param)
-                  (setq media/mplayer/current-stream-song (match-string 1 param))
-                (message "ICY Info \"%s\"" param)))
+              (progn
+                (if (string-match "StreamTitle='\\([^;]*\\)';" param)
+                    (setq media/current-song-in-stream (concat (match-string 1 param) " | " (current-time-string)))
+                  (setq media/current-song-in-stream nil)
+                  (message "ICY Info \"%s\"" param))
+                (if (and media/current-song-in-stream media/current-information)
+                    (media/show-current-information)))
+              )
 
              ;; ----------------------------------------
 
@@ -180,11 +185,6 @@ load Emacs less. Nil means no timing."
       (let ((line (match-string 1 media/mplayer/buffer)))
         (when (string-match "^\\(AUDIO:\\|Exiting...\\|Starting\\|ANS_LENGTH\\|ANS_TIME_POSITION\\|Cache fill:\\|ICY Info:\\) *\\(.*\\)$" line)
           (media/mplayer/filter-subfunctions (match-string 1 line) (match-string 2 line))))
-
-      (when (and media/mplayer/current-stream-song media/current-information)
-        (message "Now in stream (%s) \"%s\""
-                 (current-time-string) media/mplayer/current-stream-song)
-        (setq media/mplayer/current-stream-song nil))
       )
     (setq media/mplayer/buffer (substring media/mplayer/buffer start)))
   )
@@ -225,7 +225,6 @@ load Emacs less. Nil means no timing."
         media/mplayer/paused nil
         media/song-duration nil
         media/song-current-time nil
-        media/mplayer/current-stream-song nil
         media/mplayer/cumulated-duration 0
         media/mplayer/last-current-time nil
         ))