From 19389257f2b497d8edc6eb6d3ea1ca5f3a4bcbbc Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 29 Jul 2012 01:35:51 +0200 Subject: [PATCH] Add MIME type to audio codec description. --- .../demoscenemusic/utils/AudioCodecs.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/pterodactylus/demoscenemusic/utils/AudioCodecs.java b/src/main/java/net/pterodactylus/demoscenemusic/utils/AudioCodecs.java index 137d3ee..a3c90c3 100644 --- a/src/main/java/net/pterodactylus/demoscenemusic/utils/AudioCodecs.java +++ b/src/main/java/net/pterodactylus/demoscenemusic/utils/AudioCodecs.java @@ -31,13 +31,13 @@ public class AudioCodecs { public static final Map codecDescriptions = new HashMap(); static { - codecDescriptions.put("mp3", new AudioCodecDescription("MPEG 1 Layer 3", "MP3", true, false)); - codecDescriptions.put("vorbis", new AudioCodecDescription("Ogg Vorbis", "Vorbis", true, false)); - codecDescriptions.put("aac", new AudioCodecDescription("Advanced Audio Coding", "AAC", true, false)); - codecDescriptions.put("flac", new AudioCodecDescription("Free Lossless Audio Codec", "FLAC", true, true)); - codecDescriptions.put("WAV", new AudioCodecDescription("Waveform Audio", "WAV", true, true)); - codecDescriptions.put("mod", new AudioCodecDescription("Module", "MOD", false, true)); - codecDescriptions.put("ft2", new AudioCodecDescription("FastTracker II Module", "XM", false, true)); + codecDescriptions.put("mp3", new AudioCodecDescription("MPEG 1 Layer 3", "MP3", "audio/mpeg", true, false)); + codecDescriptions.put("vorbis", new AudioCodecDescription("Ogg Vorbis", "Vorbis", "audio/vorbis", true, false)); + codecDescriptions.put("aac", new AudioCodecDescription("Advanced Audio Coding", "AAC", "audio/x-aac", true, false)); + codecDescriptions.put("flac", new AudioCodecDescription("Free Lossless Audio Codec", "FLAC", "audio/ogg", true, true)); + codecDescriptions.put("WAV", new AudioCodecDescription("Waveform Audio", "WAV", "audio/vnc.wave", true, true)); + codecDescriptions.put("mod", new AudioCodecDescription("Module", "MOD", "audio/mod", false, true)); + codecDescriptions.put("ft2", new AudioCodecDescription("FastTracker II Module", "XM", "audio/xm", false, true)); } /** @@ -55,6 +55,9 @@ public class AudioCodecs { /** The short name of the codec. */ public final String shortName; + /** The MIME type. */ + public final String mimeType; + /** Whether this is a streaming codec. */ public final boolean streaming; @@ -68,6 +71,8 @@ public class AudioCodecs { * The full name of the codec * @param shortName * The short name of the codec + * @param mimeType + * The MIME type of the audio codec * @param streaming * {@code true} if the codec is a streaming audio codec, * {@code false} otherwise @@ -75,9 +80,10 @@ public class AudioCodecs { * {@code true} if the codec is a lossless audio codec, * {@code false} otherwise */ - AudioCodecDescription(String name, String shortName, boolean streaming, boolean lossless) { + AudioCodecDescription(String name, String shortName, String mimeType, boolean streaming, boolean lossless) { this.name = name; this.shortName = shortName; + this.mimeType = mimeType; this.streaming = streaming; this.lossless = lossless; } -- 2.7.4