Reset media/current-information when the song terminates (or if there is a player...

[elisp.git] / media.el

diff --git a/media.el b/media.el
index c94491c..25b19ec 100644 (file)
--- a/media.el
+++ b/media.el
@@ -1,4 +1,4 @@
-;; -*-Emacs-Lisp-*-
+;; -*- mode: emacs-lisp -*-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; This program is free software; you can redistribute it and/or         ;;
@@ -79,17 +79,17 @@ title to display in the list (convenient for internet radios)."
   :group 'media)
 
 (defcustom media/playlist-at-top nil
-  "Should the playlists be created at the top of the media buffer ?"
+  "Should the playlists be created at the top of the media buffer?"
   :type 'bool
   :group 'media)
 
 (defcustom media/add-current-song-to-interrupted-when-killing nil
-  "Should we save the current song with time in the Interrupted playlist ?"
+  "Should we save the current song with time in the Interrupted playlist?"
   :type 'bool
   :group 'media)
 
 (defcustom media/do-not-remove-nonexisting-entries nil
-  "Should we remove the entries corresponding to a non-existing file when saving the playlists ?"
+  "Should we remove the entries corresponding to a non-existing file when saving the playlists?"
   :type 'bool
   :group 'media)
 
@@ -99,12 +99,12 @@ title to display in the list (convenient for internet radios)."
   :group 'media)
 
 (defcustom media/continue-mode nil
-  "Should the player start the next song in the buffer when the current terminates ?"
+  "Should the player start the next song in the buffer when the current terminates?"
   :type 'boolean
   :group 'media)
 
 (defcustom media/expert nil
-  "Should the keymap help be shown ?"
+  "Should the keymap help be shown?"
   :type 'boolean
   :group 'media)
 
@@ -254,6 +254,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)
+      (setq media/current-information nil)
       (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)))
@@ -804,8 +805,7 @@ returns nil if no id3 tags could be found."
                              "  "
                              (or title (media/format-url url))
                              (if time (propertize
-                                       (concat " ->" (media/duration-to-string time))
-                                       ;; (concat " [@ " (media/duration-to-string time) "]")
+                                       (concat " @" (media/duration-to-string time))
                                        'face 'media/timestamp-face
                                        ))
                              "\n"
@@ -822,6 +822,7 @@ returns nil if no id3 tags could be found."
 
 (defun media/stop () (interactive)
   (message "Stop")
+  (setq media/current-information nil)
   (media/api/stop))
 
 (defun media/queue-song-at-point ()
@@ -869,6 +870,19 @@ the 'Queue' playlist, and plays it if no song is currently playing."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(defun media/player-error ()
+  (message "Player error")
+  (setq media/current-information nil)
+  (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/remove-highlight))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (defun media/switch-continue-mode ()
   "Switches between a mode which automatically chains files and a mode
 which stops when the songs ends."
@@ -879,15 +893,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)))
@@ -944,7 +949,7 @@ which stops when the songs ends."
 
   (unless (condition-case nil
               (media/save-playlists)
-            (error (not (y-or-n-p "Can not save the playlists. Still kill the media buffer ? "))))
+            (error (not (y-or-n-p "Can not save the playlists. Still kill the media buffer? "))))
     (kill-buffer media/buffer))
   )