rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Update ffmpeg loader to work with newer fluent-ffmpeg; fix playlists

Browse source
This commit is contained in:
Calvin Montgomery 2014-06-07 21:25:48 -07:00
parent 02771e6623
commit ac10f05f21
8 changed files with 72 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/js/ui.js
View file

@ -398,7 +398,7 @@ $("#mediaurl").keyup(function(ev) {
}
var url = $("#mediaurl").val().split("?")[0];
if (url.match(/^https?:\/\/(.*)?\.(flv|mp4|og[gv]|webm|mp3)$/)) {
if (url.match(/^https?:\/\/(.*)?\.(flv|mp4|og[gv]|webm|mp3|mov)$/)) {
var title = $("#addfromurl-title");
if (title.length === 0) {
title = $("<div/>")

4
www/js/util.js
View file

@ -1289,7 +1289,7 @@ function parseMediaLink(url) {
/* Raw file */
var tmp = url.split("?")[0];
if (tmp.match(/^https?:\/\//)) {
if (tmp.match(/\.(mp4|flv|webm|og[gv]|mp3)$/)) {
if (tmp.match(/\.(mp4|flv|webm|og[gv]|mp3|mov)$/)) {
return {
id: url,
type: "fi"
@ -1298,7 +1298,7 @@ function parseMediaLink(url) {
Callbacks.queueFail({
link: url,
msg: "The file you are attempting to queue does not match the supported " +
"file extensions mp4, flv, webm, ogg, ogv, mp3."
"file extensions mp4, flv, webm, ogg, ogv, mp3, mov."
});
throw new Error("ERROR_QUEUE_UNSUPPORTED_EXTENSION");
}