From 9826f396b020fd61abcb7a0fd16b1d074a53c429 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 4 Jul 2006 04:43:00 +0000 Subject: browser: don't need point-at-bol, code has been refactored darcs-hash:20060704044315-4e3e3-bd659adfefc1698b5c0486338d0046f0885e78c0.gz --- emms-browser.el | 49 ++----------------------------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/emms-browser.el b/emms-browser.el index 1395cc5..bfbae7d 100644 --- a/emms-browser.el +++ b/emms-browser.el @@ -409,27 +409,7 @@ compilations, etc." (emms-browser-ensure-browser-buffer) (let ((bdata (emms-browser-make-bdata-tree type 1 tracks))) - ;; this code duplication is ugly, but necessary at the moment - ;; because the top level data is stored differently - (emms-with-inhibit-read-only-t - (if (eq (emms-browser-bdata-type bdata) 'info-album) - (let ((cover (emms-browser-get-cover-from-album - bdata 'small))) - (when cover - (emms-browser-insert-cover cover)) - ;; if the album is a top-level element, display the artist - ;; name, too - (insert name - " (" - (emms-browser-get-track-field (car tracks) - 'info-artist) - ")")) - (insert name)) - (add-text-properties (line-beginning-position) (point) - (list - 'emms-browser-bdata bdata - 'face 'emms-browser-tracks-face)) - (insert "\n")))) + (emms-browser-insert-format bdata))) ;; -------------------------------------------------- ;; Building a subitem tree @@ -675,32 +655,7 @@ This will be a list of DB items." This checks DATA-ITEM's level to determine how much to indent. The line will have a property emms-browser-bdata storing subitem information." - (let* ((level (emms-browser-bdata-level data-item)) - (name (emms-browser-bdata-name data-item)) - (indent (emms-browser-make-indent-for-level level))) - (emms-with-inhibit-read-only-t - (insert - indent) - (when (eq (emms-browser-bdata-type data-item) 'info-album) - (let ((cover (emms-browser-get-cover-from-album - data-item 'small))) - (when cover - (emms-browser-insert-cover cover)))) - (insert name) - (add-text-properties (line-beginning-position) (point) - (list - 'emms-browser-bdata data-item - 'face (emms-browser-face-from-level level))) - (insert "\n")))) - -(defun emms-browser-make-indent-for-level (level) - (make-string (* 2 (1- level)) ?\ )) - -(defun emms-browser-face-from-level (level) - "Return a face appropriate for LEVEL." - (intern - (concat "emms-browser-tracks-sub-face-" - (int-to-string (1- level))))) + (emms-browser-insert-format data-item)) (defun emms-browser-find-entry-more-than-level (level) "Move point to next entry more than LEVEL and return point. -- cgit v1.2.3