norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

support for replaygain info in TXXX tags

Browse Source
This commit is contained in:
Adrian Ulrich 2013-08-25 13:13:28 +02:00
parent 61ed652e14
commit ace08e42d6
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ch/blinkenlights/bastp/ID3v2File.java
View File

@ -81,9 +81,12 @@ public class ID3v2File extends Common {
bread += s.read(xpl); bread += s.read(xpl);
if(framename.substring(0,1).equals("T")) { if(framename.substring(0,1).equals("T")) {
String otag = framenameToOggTag(framename); String[] nmzInfo = normalizeTaginfo(framename, xpl);
if(otag.length() > 0 && !tags.containsKey(otag)) { String oggKey = nmzInfo[0];
addTagEntry(tags, otag, getDecodedString(xpl)); String decPld = nmzInfo[1];
if(oggKey.length() > 0 && !tags.containsKey(oggKey)) {
addTagEntry(tags, oggKey, decPld);
} }
} }
else if(framename.equals("RVA2")) { else if(framename.equals("RVA2")) {
@ -95,16 +98,29 @@ public class ID3v2File extends Common {
} }
/* Converts ID3v2 sillyframes to OggNames */ /* Converts ID3v2 sillyframes to OggNames */
private String framenameToOggTag(String k) { private String[] normalizeTaginfo(String k, byte[] v) {
String[] rv = new String[] {"",""};
HashMap lu = new HashMap<String, String>(); HashMap lu = new HashMap<String, String>();
lu.put("TIT2", "TITLE"); lu.put("TIT2", "TITLE");
lu.put("TALB", "ALBUM"); lu.put("TALB", "ALBUM");
lu.put("TPE1", "ARTIST"); lu.put("TPE1", "ARTIST");
if(lu.containsKey(k)) { if(lu.containsKey(k)) {
return (String)lu.get(k); /* A normal, known key: translate into Ogg-Frame name */
rv[0] = (String)lu.get(k);
rv[1] = getDecodedString(v);
} }
return ""; else if(k.equals("TXXX")) {
/* A freestyle field, ieks! */
String txData[] = getDecodedString(v).split(Character.toString('\0'), 2);
/* Check if we got replaygain info in key\0value style */
if(txData.length == 2 && txData[0].matches("^(?i)REPLAYGAIN_(ALBUM|TRACK)_GAIN$")) {
rv[0] = txData[0].toUpperCase(); /* some tagwriters use lowercase for this */
rv[1] = txData[1];
}
}
return rv;
} }
/* Converts a raw byte-stream text into a java String */ /* Converts a raw byte-stream text into a java String */