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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Balder 2015-11-19 14:04:22 +01:00
commit 689129e805
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/output/output_http.cpp
View file

@ -221,6 +221,25 @@ namespace Mist {
selectedTracks.insert(JSON::Value(H.GetVar("video")).asInt()); selectedTracks.insert(JSON::Value(H.GetVar("video")).asInt());
} }
selectDefaultTracks(); selectDefaultTracks();
std::set<unsigned long> toRemove;
if (H.GetVar("video") == "0"){
for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
if (myMeta.tracks.at(*it).type=="video"){
toRemove.insert(*it);
}
}
}
if (H.GetVar("audio") == "0"){
for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
if (myMeta.tracks.at(*it).type=="audio"){
toRemove.insert(*it);
}
}
}
//remove those from selectedtracks
for (std::set<unsigned long>::iterator it = toRemove.begin(); it != toRemove.end(); it++){
selectedTracks.erase(*it);
}
onHTTP(); onHTTP();
if (!H.bufferChunks){ if (!H.bufferChunks){
H.Clean(); H.Clean();