From 07daf86bf0b6f57aab43409d2b2a8181001ab432 Mon Sep 17 00:00:00 2001 From: SenorSmartyPants Date: Sun, 10 Mar 2019 13:19:54 -0500 Subject: [PATCH] Add m4b to m4a locations in java anywhere m4a is referenced in java code add support for m4b as well. Signed-off-by: --- .../main/java/org/airsonic/player/service/SettingsService.java | 2 +- .../airsonic/player/service/metadata/JaudiotaggerParser.java | 1 + .../src/main/java/org/airsonic/player/util/StringUtil.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java index 087220db..6c3ae48a 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java @@ -138,7 +138,7 @@ public class SettingsService { private static final String DEFAULT_IGNORED_ARTICLES = "The El La Los Las Le Les"; private static final String DEFAULT_SHORTCUTS = "New Incoming Podcast"; private static final String DEFAULT_PLAYLIST_FOLDER = Util.getDefaultPlaylistFolder(); - private static final String DEFAULT_MUSIC_FILE_TYPES = "mp3 ogg oga aac m4a flac wav wma aif aiff ape mpc shn mka opus"; + private static final String DEFAULT_MUSIC_FILE_TYPES = "mp3 ogg oga aac m4a m4b flac wav wma aif aiff ape mpc shn mka opus"; private static final String DEFAULT_VIDEO_FILE_TYPES = "flv avi mpg mpeg mp4 m4v mkv mov wmv ogv divx m2ts"; private static final String DEFAULT_COVER_ART_FILE_TYPES = "cover.jpg cover.png cover.gif folder.jpg jpg jpeg gif png"; private static final int DEFAULT_COVER_ART_CONCURRENCY = 4; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java index a469572b..2bff3066 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java @@ -297,6 +297,7 @@ public class JaudiotaggerParser extends MetaDataParser { return format.equals("mp3") || format.equals("m4a") || + format.equals("m4b") || format.equals("aac") || format.equals("ogg") || format.equals("flac") || diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java index 564c8fd5..ba2bffa3 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java @@ -64,6 +64,7 @@ public final class StringUtil { {"ogx", "application/ogg"}, {"aac", "audio/mp4"}, {"m4a", "audio/mp4"}, + {"m4b", "audio/mp4"}, {"flac", "audio/flac"}, {"wav", "audio/x-wav"}, {"wma", "audio/x-ms-wma"},