From 7b638550b97cfc8af2a954b83bcb07b51918b02e Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 17 Feb 2017 22:25:27 +0100
Subject: [PATCH] sync with bastp e62865f5f7d9746cfcc93b0eefa3261a8bd68333

---
 src/ch/blinkenlights/bastp/ID3v2File.java | 1 +
 src/ch/blinkenlights/bastp/Mp4File.java   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/ch/blinkenlights/bastp/ID3v2File.java b/src/ch/blinkenlights/bastp/ID3v2File.java
index b24eb7f8..9bc0f825 100644
--- a/src/ch/blinkenlights/bastp/ID3v2File.java
+++ b/src/ch/blinkenlights/bastp/ID3v2File.java
@@ -116,6 +116,7 @@ public class ID3v2File extends Common {
 		lu.put("TIT2", "TITLE");
 		lu.put("TALB", "ALBUM");
 		lu.put("TPE1", "ARTIST");
+		lu.put("TPE2", "ALBUMARTIST");
 		lu.put("TYER", "YEAR");
 		lu.put("TRCK", "TRACKNUMBER");
 		lu.put("TCON", "GENRE");
diff --git a/src/ch/blinkenlights/bastp/Mp4File.java b/src/ch/blinkenlights/bastp/Mp4File.java
index 212633eb..f25ac58c 100644
--- a/src/ch/blinkenlights/bastp/Mp4File.java
+++ b/src/ch/blinkenlights/bastp/Mp4File.java
@@ -52,6 +52,8 @@ public class Mp4File extends Common {
 		"title",
 		"album",
 		"artist",
+		"albumartist",
+		"composer",
 		"genre",
 		"year",
 		"tracknumber",
@@ -65,6 +67,8 @@ public class Mp4File extends Common {
 		ATOM_TAGS.put("�nam", "title");
 		ATOM_TAGS.put("�alb", "album");
 		ATOM_TAGS.put("�ART", "artist");
+		ATOM_TAGS.put("aART", "albumartist");
+		ATOM_TAGS.put("�wrt", "composer");
 		ATOM_TAGS.put("�gen", "genre");
 		ATOM_TAGS.put("�day", "year");
 		ATOM_TAGS.put("trkn", "tracknumber");