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

Various small fixes to SRT and JSON outputs

Browse source
This commit is contained in:
Thulinma 2016-07-19 10:04:56 +02:00
parent 1187b60454
commit c78e695bad
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/output/output_json.cpp
View file

@ -50,6 +50,12 @@ namespace Mist {
void OutJSON::onHTTP(){ void OutJSON::onHTTP(){
std::string method = H.method; std::string method = H.method;
jsonp = "";
if (H.GetVar("callback") != ""){jsonp = H.GetVar("callback");}
if (H.GetVar("jsonp") != ""){jsonp = H.GetVar("jsonp");}
if (H.GetVar("track") != ""){
selectedTracks.insert(JSON::Value(H.GetVar("track")).asInt());
}
H.Clean(); H.Clean();
H.setCORSHeaders(); H.setCORSHeaders();
@ -62,18 +68,17 @@ namespace Mist {
} }
first = true; first = true;
jsonp = "";
if (H.GetVar("callback") != ""){jsonp = H.GetVar("callback");}
if (H.GetVar("jsonp") != ""){jsonp = H.GetVar("jsonp");}
initialize(); initialize();
for (std::map<unsigned int,DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){ if (!selectedTracks.size()){
if (it->second.type == "meta" ){ for (std::map<unsigned int,DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
selectedTracks.insert(it->first); if (it->second.type == "meta" ){
selectedTracks.insert(it->first);
}
} }
} }
seek(0);
parseData = true; parseData = true;
wantRequest = false; wantRequest = false;
} }
} }

11
src/output/output_srt.cpp
View file

@ -57,7 +57,10 @@ namespace Mist {
void OutProgressiveSRT::onHTTP(){ void OutProgressiveSRT::onHTTP(){
std::string method = H.method; std::string method = H.method;
std::string url = H.url;
if (H.GetVar("track") != ""){
selectedTracks.insert(JSON::Value(H.GetVar("track")).asInt());
}
H.Clean(); H.Clean();
H.setCORSHeaders(); H.setCORSHeaders();
if(method == "OPTIONS" || method == "HEAD"){ if(method == "OPTIONS" || method == "HEAD"){
@ -68,12 +71,8 @@ namespace Mist {
return; return;
} }
lastNum = 0; lastNum = 0;
webVTT = (H.url.find(".webvtt") != std::string::npos);
if (H.GetVar("track") != ""){
selectedTracks.insert(JSON::Value(H.GetVar("track")).asInt());
}
parseData = true; parseData = true;
wantRequest = false; wantRequest = false;
} }
} }