From 9b3eb9ad11a9bdf119d00779608f407df41ab579 Mon Sep 17 00:00:00 2001
From: LNTakeshi <lnt_nep@outlook.jp>
Date: Fri, 23 Feb 2018 08:11:07 +0900
Subject: [PATCH] BGAProcessor: Change priority of movie files

---
 .../beatoraja/play/bga/BGAProcessor.java      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/bms/player/beatoraja/play/bga/BGAProcessor.java b/src/bms/player/beatoraja/play/bga/BGAProcessor.java
index 566a9f82a..de383f3cf 100644
--- a/src/bms/player/beatoraja/play/bga/BGAProcessor.java
+++ b/src/bms/player/beatoraja/play/bga/BGAProcessor.java
@@ -3,6 +3,7 @@
 import static bms.player.beatoraja.skin.SkinProperty.TIMER_PLAY;
 
 import java.nio.file.*;
+import java.util.Arrays;
 import java.util.logging.Logger;
 
 import bms.model.BMSModel;
@@ -59,7 +60,7 @@ protected void dispose(MovieProcessor resource) {
 
 	};
 
-	public static final String[] mov_extension = { "mpg", "mpeg", "m1v", "m2v", "m4v", "avi", "wmv", "mp4" };
+	public static final String[] mov_extension = { "mp4", "wmv", "m4v", "webm", "mpg", "mpeg", "m1v", "m2v", "avi"};
 
 	/**
 	 * BGAイメージのキャッシュ枚数
@@ -135,7 +136,23 @@ public synchronized void setModel(BMSModel model) {
 			}
 			Path f = null;
 			if (Files.exists(dpath.resolve(name))) {
+				final int index = name.lastIndexOf('.');
+				String fex = null;
+				if (index != -1) {
+					fex = name.substring(index + 1).toLowerCase();
+				}
+				if(fex != null && !(Arrays.asList(mov_extension).contains(fex))){
 				f = dpath.resolve(name);
+				}else if(fex != null){
+					name = name.substring(0, index);
+					for (String mov : mov_extension) {
+						final Path mpgfile = dpath.resolve(name + "." + mov);
+						if (Files.exists(mpgfile)) {
+							f = mpgfile;
+							break;
+						}
+					}
+				}
 			}
 			if (f == null) {
 				final int index = name.lastIndexOf('.');