diff --git a/lib/config.cpp b/lib/config.cpp index 30801d13..272e77e3 100644 --- a/lib/config.cpp +++ b/lib/config.cpp @@ -206,9 +206,6 @@ bool Util::Config::parseArgs(int & argc, char ** & argv) { #ifdef WITH_THREADNAMES std::cout << "- Flag: With threadnames. Debuggers will show sensible human-readable thread names." << std::endl; #endif - #ifdef BIGMETA - std::cout << "- Flag: Big metadata. Enabled longer live stream durations. Breaks compatibility with DTSH files generated by versions without this flag." << std::endl; - #endif /*LTS-START*/ #ifndef UPDATER std::cout << "- Flag: Updater disabled. Server will not call back home and attempt to search for updates at regular intervals." << std::endl; @@ -220,11 +217,13 @@ bool Util::Config::parseArgs(int & argc, char ** & argv) { std::cout << "- Flag: Kill on exit. All binaries will forcibly shut down all their children on exit. This disabled rolling restart support." << std::endl; #endif #ifdef STATS_DELAY - std::cout << "- Setting: Stats delay " << STATS_DELAY << ". Statistics of viewer counts are delayed by " << STATS_DELAY << " seconds as opposed to the default of 15 seconds. "; - if (STATS_DELAY > 15){ - std::cout << "This makes them more accurate." << std::endl; - }else{ - std::cout << "This makes them less accurate." << std::endl; + if (STATS_DELAY != 15){ + std::cout << "- Setting: Stats delay " << STATS_DELAY << ". Statistics of viewer counts are delayed by " << STATS_DELAY << " seconds as opposed to the default of 15 seconds. "; + if (STATS_DELAY > 15){ + std::cout << "This makes them more accurate." << std::endl; + }else{ + std::cout << "This makes them less accurate." << std::endl; + } } #endif /*LTS-END*/ diff --git a/lsp/minified.js b/lsp/minified.js index 313bf22c..ea6f1d2f 100644 --- a/lsp/minified.js +++ b/lsp/minified.js @@ -102,7 +102,7 @@ mist.data.streams[c]);delete i.meta;delete i.error;i.online=2;i.name=L;i.ischild "/"+a.browse.files[f])&&(x[d+"+"+a.browse.files[f]]=true);aa++;R==aa&&mist.send(function(){for(var a in mist.data.active_streams){var c=mist.data.active_streams[a].split("+");c.length>1&&c[0]in mist.data.streams&&(x[mist.data.active_streams[a]]=true)}x=Object.keys(x);x=x.concat(Object.keys(mist.data.streams));Q(b,x,ba)},{active_streams:true})},{browse:mist.data.streams[r].source},{stream:r}),R++;0==R&&mist.send(function(){var a=[],c;for(c in mist.data.active_streams){var d=mist.data.active_streams[c].split("+"); d.length>1&&d[0]in mist.data.streams&&(a[mist.data.active_streams[c]]=true)}mist.data.streams&&(a=a.concat(Object.keys(mist.data.streams)));a.sort();Q(b,a)},{active_streams:!0})}else Q(b,Object.keys(mist.data.streams));break;case "Edit":if("undefined"==typeof mist.data.capabilities){mist.send(function(){UI.navto(a,b)},{capabilities:!0});c.append("Loading..");break}j=!1;""!=b&&(j=!0);if(j){var s=b,m=mist.data.streams[s];c.find("h2").append(' "'+s+'"')}else c.html($("

").text("New Stream")),m={}; s=[];for(f in mist.data.capabilities.inputs)s.push(mist.data.capabilities.inputs[f].source_match);var K=$("
"),ca=function(a){if(!mist.data.streams)mist.data.streams={};mist.data.streams[m.name]=m;b!=m.name&&delete mist.data.streams[b];var c={};if(mist.data.LTS){c.addstream={};c.addstream[m.name]=m;if(b!=m.name)c.deletestream=[b]}else c.streams=mist.data.streams;if(m.stop_sessions&&b!=""){c.stop_sessions=b;delete m.stop_sessions}mist.send(function(){delete mist.data.streams[m.name].online;delete mist.data.streams[m.name].error; -UI.navto(a,a=="Preview"?m.name:"")},c)},da=$("