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

LSP: conversion - encoder and audio/video codec selectboxes

Browse source
This commit is contained in:
Cat 2013-09-12 18:39:50 +02:00
parent 1c37d06e16
commit de42f65593
2 changed files with 48 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lsp/functions.js
View file

@ -141,6 +141,9 @@
'capabilities': {}, 'capabilities': {},
'conversion': {'query': settings.settings.conversion.query} 'conversion': {'query': settings.settings.conversion.query}
}; };
if (!settings.settings.conversion.encoders) {
data.conversion.encoders = {};
}
console.log('sending data:',data); console.log('sending data:',data);
$.ajax( $.ajax(
{ {
@ -269,7 +272,7 @@
{ {
if((settings.settings.config.protocols[i].connector == 'HTTP.exe') || (settings.settings.config.protocols[i].connector == 'HTTP')) if((settings.settings.config.protocols[i].connector == 'HTTP.exe') || (settings.settings.config.protocols[i].connector == 'HTTP'))
{ {
if (settings.settings.config.protocols[i].port == 0) { if ((settings.settings.config.protocols[i].port == 0) || (settings.settings.config.protocols[i].port == '') || (!settings.settings.config.protocols[i].port)){
return 8080; return 8080;
} }
else { else {
@ -754,6 +757,7 @@ function buildLogsTable(){
) )
} }
conversionSelectInput($('#conv-edit-input').val()); conversionSelectInput($('#conv-edit-input').val());
}); });
} }
function conversionSelectInput(filename) { function conversionSelectInput(filename) {

52
lsp/main.js
View file

@ -183,6 +183,7 @@
break; break;
case 'overview': case 'overview':
@ -1204,6 +1205,7 @@
case 'conversion': case 'conversion':
var convs = settings.settings.conversion; var convs = settings.settings.conversion;
if (!settings.settings.conversion.encoders) { settings.settings.conversion.encoders = 'get'; }
$('#page').append( $('#page').append(
$('<p>').text('Current conversions:') $('<p>').text('Current conversions:')
@ -1337,11 +1339,28 @@
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-encoder').text('Encoder').append( $('<label>').attr('for', 'conv-edit-encoder').text('Encoder').append(
$('<select>').attr('id', 'conv-edit-encoder').width(237) $('<select>').addClass('nocapitals').attr('id', 'conv-edit-encoder').width(237).change(function(){
$('#conv-edit-video-codec').html(
$('<option>').val('').text('-Current-')
);
for (i in settings.settings.conversion.encoders[$(this).val()].video) {
$('#conv-edit-video-codec').append(
$('<option>').val(i).text(settings.settings.conversion.encoders[$(this).val()].video[i]+' ('+i+')')
);
}
$('#conv-edit-audio-codec').html(
$('<option>').val('').text('-Current-')
);
for (i in settings.settings.conversion.encoders[$(this).val()].audio) {
$('#conv-edit-audio-codec').append(
$('<option>').val(i).text(settings.settings.conversion.encoders[$(this).val()].audio[i]+' ('+i+')')
);
}
})
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-video-codec').text('Video codec').append( $('<label>').attr('for', 'conv-edit-video-codec').text('Video codec').append(
$('<select>').attr('id', 'conv-edit-video-codec').width(237) $('<select>').addClass('nocapitals').attr('id', 'conv-edit-video-codec').width(237)
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-video-fps').text('Video fps').append( $('<label>').attr('for', 'conv-edit-video-fps').text('Video fps').append(
@ -1349,15 +1368,15 @@
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-video-height').text('Video height*').append( $('<label>').attr('for', 'conv-edit-video-height').text('Video height*').append(
$('<input>').attr('type', 'text').attr('placeholder', 'height').attr('id', 'conv-edit-video-height') $('<input>').attr('type', 'text').attr('placeholder', 'default').attr('id', 'conv-edit-video-height')
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-video-width').text('Video width*').append( $('<label>').attr('for', 'conv-edit-video-width').text('Video width*').append(
$('<input>').attr('type', 'text').attr('placeholder', 'width').attr('id', 'conv-edit-video-width') $('<input>').attr('type', 'text').attr('placeholder', 'default').attr('id', 'conv-edit-video-width')
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-audio-codec').text('Audio codec').append( $('<label>').attr('for', 'conv-edit-audio-codec').text('Audio codec').append(
$('<select>').attr('id', 'conv-edit-audio-codec').width(237) $('<select>').addClass('nocapitals').attr('id', 'conv-edit-audio-codec').width(237)
) )
).append( ).append(
$('<label>').attr('for', 'conv-edit-audio-samplerate').text('Audio samplerate').append( $('<label>').attr('for', 'conv-edit-audio-samplerate').text('Audio samplerate').append(
@ -1367,14 +1386,29 @@
$('<span>').addClass('comment').text('*Fill in either the width or the height. Aspect ratio will be preserved.') $('<span>').addClass('comment').text('*Fill in either the width or the height. Aspect ratio will be preserved.')
); );
conversionDirQuery(dir);
for (var i in c.encoders) { for (var i in c.encoders) {
$('#conv-edit-encoder').append( $('#conv-edit-encoder').append(
$('<option>').value(c.encoders[i]) $('<option>').val(i).text(i)
); );
} }
//todo: allowed codecs for video/audio $('#conv-edit-video-codec').html(
$('<option>').val('').text('-Current-')
);
for (i in c.encoders[$('#conv-edit-encoder').val()].video) {
$('#conv-edit-video-codec').append(
$('<option>').val(i).text(c.encoders[$('#conv-edit-encoder').val()].video[i]+' ('+i+')')
);
}
$('#conv-edit-audio-codec').html(
$('<option>').val('').text('-Current-')
);
for (i in c.encoders[$('#conv-edit-encoder').val()].audio) {
$('#conv-edit-audio-codec').append(
$('<option>').val(i).text(c.encoders[$('#conv-edit-encoder').val()].audio[i]+' ('+i+')')
);
}
conversionDirQuery(dir);
$('#page').append( $('#page').append(
$('<button>').text('Save').click(function(){ $('<button>').text('Save').click(function(){