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

fixed bug in embed preview http port

Browse source
This commit is contained in:
Niels Groot Obbink 2012-11-26 12:17:35 +01:00
parent c9dfb014b1
commit 135e60f4eb
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lsp/functions.js
View file

@ -226,6 +226,28 @@
} }
/**
* retrieve port of the http connector
* @return the port number
*/
function getHTTPControllerPort()
{
var i,
len = (settings.settings.config.protocols ? settings.settings.config.protocols.length : 0);
for(i = 0; i < len; i++)
{
if(settings.settings.config.protocols[i].connector == 'HTTP')
{
return settings.settings.config.protocols[i].port;
}
}
return 0;
}
/** /**
* retrieves the stream status (online and total number of streams) and viewer info (total number of viewers). * retrieves the stream status (online and total number of streams) and viewer info (total number of viewers).
* @param callback function that is called when data is retrieved. Has one parameter, the retrieved data. * @param callback function that is called when data is retrieved. Has one parameter, the retrieved data.

4
lsp/main.js
View file

@ -656,7 +656,7 @@
if(isThereAHTTPConnector()) if(isThereAHTTPConnector())
{ {
var embedbase = 'http://' + parseURL(settings.server).host + ':8080/'; var embedbase = 'http://' + parseURL(settings.server).host + ':' + getHTTPControllerPort() + '/';
$('#page').append( $('<p>').attr('class', 'nocapitals').text('The info embed URL is "' + embedbase + 'info_' + streamname + '.js".') ); $('#page').append( $('<p>').attr('class', 'nocapitals').text('The info embed URL is "' + embedbase + 'info_' + streamname + '.js".') );
$('#page').append( $('<p>').attr('class', 'nocapitals').text('The embed embed URL is "' + embedbase + 'embed_' + streamname + '.js".') ); $('#page').append( $('<p>').attr('class', 'nocapitals').text('The embed embed URL is "' + embedbase + 'embed_' + streamname + '.js".') );
@ -676,7 +676,7 @@
case 'preview': case 'preview':
var embed = 'http://' + parseURL(settings.server).host + ':8080/embed_' + streamname + '.js'; var embed = 'http://' + parseURL(settings.server).host + ':' + getHTTPControllerPort() + '/embed_' + streamname + '.js';
$('#page').append( $('<div>').attr('id', 'previewcontainer') ); $('#page').append( $('<div>').attr('id', 'previewcontainer') );