From a5e116b511f233f01cf8cd59908182dee4214112 Mon Sep 17 00:00:00 2001 From: Martin Schoenmakers Date: Tue, 30 May 2006 13:04:00 +0000 Subject: allow nonzero ogginfo exit plus some reindenting When ogginfo gave a nonzero value on exit, any valid data would get tossed if there was any. This prevented emms from showing info for files that are tagged but a bit odd. Also reindented emms-info-ogginfo accordingly, which incidentally removed some tabs in favour of spaces. darcs-hash:20060530130411-97144-7a32c32535a534abdbe173f8f230194c462dbbbd.gz --- emms-info-ogginfo.el | 57 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/emms-info-ogginfo.el b/emms-info-ogginfo.el index b6f4a0e..e05db82 100644 --- a/emms-info-ogginfo.el +++ b/emms-info-ogginfo.el @@ -49,35 +49,34 @@ This is a useful element for `emms-info-functions'." (string-match "\\.[Oo][Gg][Gg]\\'" (emms-track-name track))) (with-temp-buffer - (when (zerop - (call-process emms-info-ogginfo-program-name - nil t nil (emms-track-name track))) - - ;; play time, emms-info-ogg.el [U. Jensen] - (goto-char (point-min)) - (re-search-forward "Playback length: \\([0-9]*\\)m:\\([0-9]*\\)") - (let* ((minutes (string-to-number (match-string 1))) - (seconds (string-to-number (match-string 2))) - (ptime-total (+ (* minutes 60) seconds)) - (ptime-min minutes) - (ptime-sec seconds)) - (emms-track-set track 'info-playing-time ptime-total) - (emms-track-set track 'info-playing-time-min ptime-min) - (emms-track-set track 'info-playing-time-sec ptime-sec) - (emms-track-set track 'info-file (emms-track-name track))) - - ;; all the rest of the info available - (goto-char (point-min)) - (when (re-search-forward "^.*\\.\\.\\.$" (point-max) t) - (while (zerop (forward-line 1)) - (when (looking-at "^\t\\(.*\\)=\\(.*\\)$") - (let ((a (match-string 1)) - (b (match-string 2))) - (when (and (< 0 (length a)) - (< 0 (length b))) - (emms-track-set track - (intern (downcase (concat "info-" (match-string 1)))) - (match-string 2))))))))))) + (call-process emms-info-ogginfo-program-name + nil t nil (emms-track-name track)) + + ;; play time, emms-info-ogg.el [U. Jensen] + (goto-char (point-min)) + (re-search-forward "Playback length: \\([0-9]*\\)m:\\([0-9]*\\)") + (let* ((minutes (string-to-number (match-string 1))) + (seconds (string-to-number (match-string 2))) + (ptime-total (+ (* minutes 60) seconds)) + (ptime-min minutes) + (ptime-sec seconds)) + (emms-track-set track 'info-playing-time ptime-total) + (emms-track-set track 'info-playing-time-min ptime-min) + (emms-track-set track 'info-playing-time-sec ptime-sec) + (emms-track-set track 'info-file (emms-track-name track))) + + ;; all the rest of the info available + (goto-char (point-min)) + (when (re-search-forward "^.*\\.\\.\\.$" (point-max) t) + (while (zerop (forward-line 1)) + (when (looking-at "^\t\\(.*\\)=\\(.*\\)$") + (let ((a (match-string 1)) + (b (match-string 2))) + (when (and (< 0 (length a)) + (< 0 (length b))) + (emms-track-set track + (intern (downcase (concat "info-" (match-string 1)))) + (match-string 2)))))))))) (provide 'emms-info-ogginfo) -- cgit v1.2.3