[elpa] externals/emms be18bd8b32 3/4: Add album artist to metaflac, tag editor, playlist sort and limit.

[ELPA Syncer]

branch: externals/emms
commit be18bd8b32cbab137faa21eabf5c05882a048e82
Author: Yoni Rabkin <yrk@gnu.org>
Commit: Yoni Rabkin <yrk@gnu.org>

    Add album artist to metaflac, tag editor, playlist sort and limit.
---
 emms-info-metaflac.el  |  1 +
 emms-playlist-limit.el |  3 +++
 emms-playlist-sort.el  | 12 +++++++-----
 emms-tag-editor.el     |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/emms-info-metaflac.el b/emms-info-metaflac.el
index f03925f4a4..e22d5e6778 100644
--- a/emms-info-metaflac.el
+++ b/emms-info-metaflac.el
@@ -58,6 +58,7 @@ external metaflac program"
   '("--no-utf8-convert"
     "--show-tag=TITLE"
     "--show-tag=ARTIST"
+    "--show-tag=ALBUMARTIST"
     "--show-tag=ALBUM"
     "--show-tag=NOTE"
     "--show-tag=YEAR"
diff --git a/emms-playlist-limit.el b/emms-playlist-limit.el
index e635f9b641..6839bc15a5 100644
--- a/emms-playlist-limit.el
+++ b/emms-playlist-limit.el
@@ -42,6 +42,7 @@
 ;;  ------------------------------------------------------------------
 
 ;; / /         emms-playlist-limit-to-all
+;; / A         emms-playlist-limit-to-info-albumartist
 ;; / a         emms-playlist-limit-to-info-artist
 ;; / b         emms-playlist-limit-to-info-album
 ;; / c         emms-playlist-limit-to-info-composer
@@ -102,6 +103,7 @@ the current playlist." attribute attribute)
         (emms-playlist-limit-do (quote ,attribute) regexp)
        (message "Limit cancelled: no regexp."))))
 
+(define-emms-playlist-limit info-albumartist)
 (define-emms-playlist-limit info-artist)
 (define-emms-playlist-limit info-composer)
 (define-emms-playlist-limit info-performer)
@@ -132,6 +134,7 @@ If this playlist is current, make the playlist we switch to 
current."
       (bury-buffer old-buf))))
 
 (define-key emms-playlist-mode-map (kbd "/ n") #'emms-playlist-limit-to-name)
+(define-key emms-playlist-mode-map (kbd "/ A") 
#'emms-playlist-limit-to-info-albumartist)
 (define-key emms-playlist-mode-map (kbd "/ a") 
#'emms-playlist-limit-to-info-artist)
 (define-key emms-playlist-mode-map (kbd "/ c") 
#'emms-playlist-limit-to-info-composer)
 (define-key emms-playlist-mode-map (kbd "/ p") 
#'emms-playlist-limit-to-info-performer)
diff --git a/emms-playlist-sort.el b/emms-playlist-sort.el
index 7b69f1af04..3d55a41f5d 100644
--- a/emms-playlist-sort.el
+++ b/emms-playlist-sort.el
@@ -56,12 +56,13 @@ With a prefix argument, decreasingly." attribute)
      (interactive)
      (emms-playlist-sort
       '(lambda (a b)
-         (funcall 
+         (funcall
           (if current-prefix-arg 'emms-string> 'emms-string<)
           (emms-track-get a (quote ,attribute))
           (emms-track-get b (quote ,attribute)))))))
 
 (define-emms-playlist-sort name)
+(define-emms-playlist-sort info-albumartist)
 (define-emms-playlist-sort info-artist)
 (define-emms-playlist-sort info-composer)
 (define-emms-playlist-sort info-performer)
@@ -98,7 +99,7 @@ With a prefix argument, decreasingly."
   (interactive)
   (emms-playlist-sort
    '(lambda (a b)
-      (funcall 
+      (funcall
        (if current-prefix-arg 'not 'identity)
        (time-less-p
         (or (emms-track-get a 'last-played) '(0 0 0))
@@ -110,7 +111,7 @@ With a prefix argument, decreasingly."
   (interactive)
   (emms-playlist-sort
    '(lambda (a b)
-      (funcall 
+      (funcall
        (if current-prefix-arg 'not 'identity)
        (< (or (emms-track-get a 'play-count) 0)
           (or (emms-track-get b 'play-count) 0))))))
@@ -121,7 +122,7 @@ With a prefix argument, decreasingly."
   (interactive)
   (emms-playlist-sort
    '(lambda (a b)
-      (funcall 
+      (funcall
        (if current-prefix-arg 'emms-string> 'emms-string<)
        (file-name-extension (emms-track-get a 'name))
        (file-name-extension (emms-track-get b 'name))))))
@@ -148,6 +149,7 @@ With a prefix argument, oldest first."
         (let ((map (make-sparse-keymap)))
           (define-key map (kbd "n") #'emms-playlist-sort-by-natural-order)
           (define-key map (kbd "a") #'emms-playlist-sort-by-info-artist)
+          (define-key map (kbd "A") #'emms-playlist-sort-by-info-albumartist)
           (define-key map (kbd "c") #'emms-playlist-sort-by-play-count)
           (define-key map (kbd "b") #'emms-playlist-sort-by-info-album)
           (define-key map (kbd "l") #'emms-playlist-sort-by-last-played)
@@ -165,7 +167,7 @@ With a prefix argument, oldest first."
           map))
 
   (define-key emms-playlist-mode-map
-    emms-playlist-sort-prefix emms-playlist-sort-map))
+              emms-playlist-sort-prefix emms-playlist-sort-map))
 
 (setq emms-playlist-sort-map (emms-playlist-sort-map-setup))
 
diff --git a/emms-tag-editor.el b/emms-tag-editor.el
index 8c50df59cf..401bca7274 100644
--- a/emms-tag-editor.el
+++ b/emms-tag-editor.el
@@ -157,7 +157,7 @@ See also `emms-tag-editor-tag-file' and 
`emms-tag-editor-tag-ogg'.")
   "Commit changes to an FLAC file according to TRACK."
   (require 'emms-info-metaflac)
   (with-temp-buffer
-    (let ((tags '("artist" "composer" "performer" "title" "album" 
"tracknumber" "discnumber" "date" "genre" "note"))
+    (let ((tags '("albumartist" "artist" "composer" "performer" "title" 
"album" "tracknumber" "discnumber" "date" "genre" "note"))
          val)
       (mapc (lambda (tag)
               (let ((info-tag (intern (concat "info-" tag))))