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

Changed default track selection ordering for VoD files back to previous ordering, live is still reversed.

Browse source
This commit is contained in:
Thulinma 2017-11-23 14:07:46 +01:00
parent c47162bf03
commit ae8760ee08
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/output/output.cpp
View file

@ -322,11 +322,21 @@ namespace Mist{
if (!found){ if (!found){
jsonForEach((*itb), itc){ jsonForEach((*itb), itc){
if (found){break;} if (found){break;}
for (std::map<unsigned int, DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){ if (myMeta.live){
if (trit->second.codec == (*itc).asStringRef() || (*itc).asStringRef() == "*"){ for (std::map<unsigned int, DTSC::Track>::reverse_iterator trit = myMeta.tracks.rbegin(); trit != myMeta.tracks.rend(); trit++){
selectedTracks.insert(trit->first); if (trit->second.codec == (*itc).asStringRef() || (*itc).asStringRef() == "*"){
found = true; selectedTracks.insert(trit->first);
if ((*itc).asStringRef() != "*"){break;} found = true;
if ((*itc).asStringRef() != "*"){break;}
}
}
}else{
for (std::map<unsigned int, DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){
if (trit->second.codec == (*itc).asStringRef() || (*itc).asStringRef() == "*"){
selectedTracks.insert(trit->first);
found = true;
if ((*itc).asStringRef() != "*"){break;}
}
} }
} }
} }