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

embed JS files now also receive metadata info & LSP now displays js links in monospace

Browse source
This commit is contained in:
Niels Groot Obbink 2013-07-04 15:12:54 +02:00
parent 9b662913e5
commit 04bc5842bd
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lsp/main.js
View file

@ -1033,8 +1033,15 @@
{ {
var embedbase = 'http://' + parseURL(settings.server).host + ':' + getHTTPControllerPort() + '/'; var embedbase = 'http://' + parseURL(settings.server).host + ':' + getHTTPControllerPort() + '/';
$('#page').append( $('<p>').attr('class', 'nocapitals').text('The info embed URL is "' + embedbase + 'info_' + streamname + '.js".') ); // TODO .attr().html() doesn't work... make this work in 2 lines again
$('#page').append( $('<p>').attr('class', 'nocapitals').text('The embed embed URL is "' + embedbase + 'embed_' + streamname + '.js".') ); var iem = $('<p>').attr('class', 'nocapitals');
iem.html('The info embed URL is <code>' + embedbase + 'info_' + streamname + '.js</code>');
var eem = $('<p>').attr('class', 'nocapitals');
eem.html('The embed embed URL is <code>' + embedbase + 'embed_' + streamname + '.js</code>');
$('#page').append( iem );
$('#page').append( eem );
$('#page').append( $('<button>').text('preview').click(function() $('#page').append( $('<button>').text('preview').click(function()
{ {

8
lsp/style.css
View file

@ -452,3 +452,11 @@ td
color: black; color: black;
font: normal normal 11pt Arial, sans-serif; font: normal normal 11pt Arial, sans-serif;
} }
code
{
font-size: 0.9em;
padding: 0 0 0 5px;
color: #666;
}

4
src/connectors/conn_http.cpp
View file

@ -223,6 +223,10 @@ namespace Connector_HTTP {
if (ServConf["streams"][streamname]["meta"].isMember("live")){ if (ServConf["streams"][streamname]["meta"].isMember("live")){
json_resp["type"] = "live"; json_resp["type"] = "live";
} }
// show ALL the meta datas!
json_resp["meta"] = ServConf["streams"][streamname]["meta"];
//find out which connectors are enabled //find out which connectors are enabled
std::set<std::string> conns; std::set<std::string> conns;
for (JSON::ArrIter it = ServConf["config"]["protocols"].ArrBegin(); it != ServConf["config"]["protocols"].ArrEnd(); it++){ for (JSON::ArrIter it = ServConf["config"]["protocols"].ArrBegin(); it != ServConf["config"]["protocols"].ArrEnd(); it++){