From a3bfc9cf896f469d0d1d98fad398f3cd73e87d15 Mon Sep 17 00:00:00 2001 From: Chirag Maheshwari Date: Thu, 15 Jun 2017 00:20:35 +0530 Subject: [PATCH] Updates subtitle mime type --- .../java/org/amahi/anywhere/service/VideoService.java | 4 +--- src/main/java/org/amahi/anywhere/util/Mimes.java | 8 +++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/amahi/anywhere/service/VideoService.java b/src/main/java/org/amahi/anywhere/service/VideoService.java index a94b9e171..1ab73e8c7 100644 --- a/src/main/java/org/amahi/anywhere/service/VideoService.java +++ b/src/main/java/org/amahi/anywhere/service/VideoService.java @@ -122,9 +122,7 @@ public void onFilesLoaded(ServerFilesLoadedEvent event) { List files = event.getServerFiles(); for (ServerFile file:files) { if (videoFile.getNameOnly().equals(file.getNameOnly())) { - if (Mimes.match(file.getMime()) == Mimes.Type.SUBTITLE - || file.getExtension().equals("srt") - || file.getExtension().equals("sub")) { + if (Mimes.match(file.getMime()) == Mimes.Type.SUBTITLE) { mMediaPlayer.getMedia().addSlave( new Media.Slave( Media.Slave.Type.Subtitle, 4, getSubtitleUri(file))); diff --git a/src/main/java/org/amahi/anywhere/util/Mimes.java b/src/main/java/org/amahi/anywhere/util/Mimes.java index a7aeb4b1d..ac801169b 100644 --- a/src/main/java/org/amahi/anywhere/util/Mimes.java +++ b/src/main/java/org/amahi/anywhere/util/Mimes.java @@ -73,8 +73,9 @@ public class Mimes { types.put("application/x-quicktimeplayer", Type.VIDEO); - types.put("application/x-subrip", Mimes.Type.SUBTITLE); - types.put("image/vnd.dvb.subtitle", Mimes.Type.SUBTITLE); + types.put("application/x-subrip", Mimes.Type.SUBTITLE); + types.put("image/vnd.dvb.subtitle", Mimes.Type.SUBTITLE); + types.put("application/x-subtitle", Type.SUBTITLE); } public static int match(String mime) { @@ -130,7 +131,8 @@ public static final class Type { public static final int PRESENTATION = 7; public static final int SPREADSHEET = 8; public static final int VIDEO = 9; - public static final int SUBTITLE = 10; + public static final int SUBTITLE = 10; + private Type() { }