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

LSP: streams.streamname.channel.URL is now stored in streams.streamname.source and the buffer time option is only available when it is a livestream

Browse source
This commit is contained in:
Cat 2013-03-02 11:35:26 +01:00 • committed by Thulinma
parent 89e967e419
commit ce4c6b71d0
1 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
lsp/main.js
View file

@ -738,6 +738,11 @@
sid += 1;
settings.settings.streams[stream].sid = sid;
}
//if .source does not exist, create it
if (settings.settings.streams[stream].source == undefined)
{
settings.settings.streams[stream].source = settings.settings.streams[stream].channel.URL;
}
var cstr = settings.settings.streams[stream];
@ -745,7 +750,7 @@
$tr.append( $('<td>').text( cstr.sid ) );
$tr.append( $('<td>').text( TypeofResource( cstr.channel.URL ) ) );
$tr.append( $('<td>').text( TypeofResource( cstr.source ) ) );
$tr.append( $('<td>').append( $('<button>').text('embed').click(function()
{
@ -827,10 +832,7 @@
sdata =
{
'name': '',
'channel':
{
'URL': ''
},
'source': '',
'limits': [],
'preset':
{
@ -852,7 +854,7 @@
)
).append(
$('<label>').attr('for', 'stream-edit-source').text('source').append(
$('<input>').attr('type', 'text').attr('placeholder', 'SOURCE').attr('id', 'stream-edit-source').attr('value', sdata.channel.URL).keyup(function()
$('<input>').attr('type', 'text').attr('placeholder', 'SOURCE').attr('id', 'stream-edit-source').attr('value', sdata.source).keyup(function()
{
var text = $(this).val();
@ -861,9 +863,14 @@
$('#stream-edit-preset').val('');
$('#stream-edit-preset').hide();
$('#stream-edit-preset-label').hide();
$('#stream-edit-buffer').val('');
$('#stream-edit-buffer').hide();
$('#stream-edit-buffer-label').hide();
}else{
$('#stream-edit-preset').show();
$('#stream-edit-preset-label').show();
$('#stream-edit-buffer').show();
$('#stream-edit-buffer-label').show();
}
})
)
@ -874,18 +881,6 @@
)
);
// if the source is push or file, don't do a preset
var text = $('#stream-edit-source').val();
if(text.charAt(0) == '/' || text.substr(0, 7) == 'push://')
{
$('#stream-edit-preset').hide();
$('#stream-edit-preset-label').hide();
}else{
$('#stream-edit-preset').show();
$('#stream-edit-preset-label').show();
}
if (sdata.DVR == undefined)
{
var DVR = '';
@ -893,11 +888,28 @@
var DVR = sdata.DVR;
}
$('#editserver').append(
$('<label>').attr('id','stream-edit-buffer-label').attr('for','stream-edit-buffer').text('Buffer time [ms]').append(
$('<label>').attr('id','stream-edit-buffer-label').attr('for','stream-edit-buffer').attr('title','Only applies to live streams').text('Buffer time [ms]').append(
$('<input>').attr('type','text').attr('placeholder','2 keyframes').attr('id','stream-edit-buffer').attr('value', DVR)
)
);
// if the source is push or file, don't do a preset and dvr
var text = $('#stream-edit-source').val();
if(text.charAt(0) == '/' || text.substr(0, 7) == 'push://')
{
$('#stream-edit-preset').hide();
$('#stream-edit-preset-label').hide();
$('#stream-edit-buffer').hide();
$('#stream-edit-buffer-label').hide();
}else{
$('#stream-edit-preset').show();
$('#stream-edit-preset-label').show();
$('#stream-edit-buffer').show();
$('#stream-edit-buffer-label').show();
}
$('#editserver').append(
$('<button>').attr('class', 'floatright').click(function()
{
@ -932,7 +944,7 @@
var newname = n.val().replace(/([^a-zA-Z0-9_])/g, '').toLowerCase();
sdata.name = newname;
sdata.channel.URL = s.val();
sdata.source = s.val();
sdata.preset.cmd = p.val();
sdata.online = -1;
sdata.error = null;