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

Better error handling, add support for mp3/ogg-vorbis

Browse source
This commit is contained in:
Calvin Montgomery 2014-06-05 21:58:26 -07:00
parent 1d1630fb50
commit 6dde745784
6 changed files with 69 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/js/callbacks.js
View file

@ -846,7 +846,7 @@ Callbacks = {
}
if (data.type === "fi") {
if (USEROPTS.no_h264 && data.meta.codec !== "matroska/vp8") {
if (USEROPTS.no_h264 && data.meta.codec === "mov/h264") {
data.forceFlash = true;
}

15
www/js/player.js
View file

@ -1155,7 +1155,14 @@ function FilePlayer(data) {
self.init = function (data) {
self.videoId = data.id;
self.videoURL = data.url;
var video = $("<video/>")
var isAudio = data.meta.codec && data.meta.codec.match(/^mp3$|^vorbis$/);
var video;
if (isAudio) {
video = $("<audio/>");
} else {
video = $("<video/>")
}
video
.attr("src", self.videoURL)
.attr("controls", "controls")
.attr("id", "#ytapiplayer")
@ -1175,7 +1182,11 @@ function FilePlayer(data) {
};
self.load = function (data) {
self.init(data);
if (data.forceFlash) {
self.initFlash(data);
} else {
self.init(data);
}
};
self.pause = function () {

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|ogg|webm)$/)) {
if (url.match(/^https?:\/\/(.*)?\.(flv|mp4|og[gv]|webm|mp3)$/)) {
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|ogg)$/)) {
if (tmp.match(/\.(mp4|flv|webm|og[gv]|mp3)$/)) {
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."
"file extensions mp4, flv, webm, ogg, ogv, mp3."
});
throw new Error("ERROR_QUEUE_UNSUPPORTED_EXTENSION");
}