hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed slash bug in embed code

Browse source
This commit is contained in:
ThatGuy 2013-08-26 10:55:12 +02:00 • committed by Thulinma
parent f974e5fa77
commit 8d25b45eac
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/connectors/embed.js
View file

@ -58,11 +58,24 @@ function mistembed(streamname)
return support; return support;
} }
// parse a "type" string from the controller. Format:
// xxx/# (e.g. flash/3) or xxx/xxx/xxx (e.g. html5/application/ogg)
function parseType(type)
{
var split = type.split('/');
if( split.length > 2 )
{
split[1] += '/' + split[2];
}
return split;
}
// return true if a type is supported // return true if a type is supported
function hasSupport(type) function hasSupport(type)
{ {
var typemime = type.split('/'); var typemime = parseType(type);
switch(typemime[0]) switch(typemime[0])
{ {
@ -101,14 +114,14 @@ function mistembed(streamname)
videoheight /= ratio; videoheight /= ratio;
} }
var maintype = src.type.split('/'); var maintype = parseType(src.type);
switch(maintype[0]) switch(maintype[0])
{ {
case 'flash': case 'flash':
// maintype[1] is already checked (i.e. user has version > maintype[1]) // maintype[1] is already checked (i.e. user has version > maintype[1])
var flashplayer, var flashplayer,
url = encodeURIComponent(src.url) + '&controlBarMode=floating&initialBufferTime=0.5&expandedBufferTime=5&minContinuousPlaybackTime=3' + (vtype == 'live' ? "&streamType=live" : ""), url = encodeURIComponent(src.url) + '&controlBarMode=floating&initialBufferTime=0.5&expandedBufferTime=5&minContinuousPlaybackTime=3' + (vtype == 'live' ? "&streamType=live" : "");
if( parseInt(maintype[1], 10) >= 10 ) if( parseInt(maintype[1], 10) >= 10 )
{ {
@ -177,6 +190,7 @@ function mistembed(streamname)
for(i = 0; i < len; i++) for(i = 0; i < len; i++)
{ {
//console.log("trying support for type " + video.source[i].type + " (" + parseType(video.source[i].type)[0] + " - " + parseType(video.source[i].type)[1] + ")");
if( hasSupport( video.source[i].type ) ) if( hasSupport( video.source[i].type ) )
{ {
// we support this kind of video, so build it. // we support this kind of video, so build it.