From ffb9df565fa3c3d8ef4b2a101a683da0130aa855 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 23 Jul 2014 17:15:03 +0200
Subject: [PATCH] OO-1147: add mp4 to the list of movie format
---
.../java/org/olat/fileresource/types/MovieFileResource.java | 4 +++-
.../java/org/olat/fileresource/types/SoundFileResource.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/fileresource/types/MovieFileResource.java b/src/main/java/org/olat/fileresource/types/MovieFileResource.java
index 63096b31094..1b106df5189 100644
--- a/src/main/java/org/olat/fileresource/types/MovieFileResource.java
+++ b/src/main/java/org/olat/fileresource/types/MovieFileResource.java
@@ -55,6 +55,8 @@ public class MovieFileResource extends FileResource {
String f = filename.toLowerCase();
return f.endsWith(".avi") || f.endsWith(".mpeg") ||
f.endsWith(".mpg") || f.endsWith(".qt") ||
- f.endsWith(".rm") || f.endsWith(".ram");
+ f.endsWith(".rm") || f.endsWith(".ram") ||
+ f.endsWith(".mp4") || f.endsWith(".m4v") ||
+ f.endsWith(".mov");
}
}
diff --git a/src/main/java/org/olat/fileresource/types/SoundFileResource.java b/src/main/java/org/olat/fileresource/types/SoundFileResource.java
index 81ba484ae04..ed42e8a1c69 100644
--- a/src/main/java/org/olat/fileresource/types/SoundFileResource.java
+++ b/src/main/java/org/olat/fileresource/types/SoundFileResource.java
@@ -53,6 +53,8 @@ public class SoundFileResource extends FileResource {
public static boolean validate(String filename) {
String f = filename.toLowerCase();
- return f.endsWith(".mp3") || f.endsWith(".wav") || f.endsWith(".ra") || f.endsWith(".midi");
+ return f.endsWith(".mp3") || f.endsWith(".wav")
+ || f.endsWith(".ra") || f.endsWith(".midi")
+ || f.endsWith(".aac");
}
}
--
GitLab