X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=elisp.git;a=blobdiff_plain;f=media-mplayer.el;h=cdff4a0d3b734402692ccb7c787b5009f3ee4cbd;hp=a6cd0e903f60ad9c58b29f83fe087eb8ec6717f8;hb=6a44bdf65c8691602f917c8d5b4d8d751efa83d7;hpb=07db79d3356b94d9c1c6f69561fcbc2d89f4aa17

diff --git a/media-mplayer.el b/media-mplayer.el
index a6cd0e9..cdff4a0 100644
--- a/media-mplayer.el
+++ b/media-mplayer.el
@@ -80,8 +80,8 @@ load Emacs less. Nil means no timing."
              ;; ----------------------------------------
 
              ("ICY Info:" .
-              (if (string-match "StreamTitle='\\([^']*\\)';" param)
-                  (message "Now in stream (%s) \"%s\"" (current-time-string) (match-string 1 param))
+              (if (string-match "StreamTitle='\\([^;]*\\)';" param)
+                  (setq media/mplayer/current-stream-song (match-string 1 param))
                 (message "ICY Info \"%s\"" param)))
 
              ;; ----------------------------------------
@@ -179,7 +179,13 @@ load Emacs less. Nil means no timing."
       (setq start (1+ (match-end 1)))
       (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)))))
+          (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)))
   )
 
@@ -219,6 +225,7 @@ 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
         ))