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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output.cpp
This commit is contained in:
Thulinma 2017-11-23 14:08:32 +01:00
commit 310e7bc5f9
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/io.cpp
View file

@ -230,7 +230,7 @@ namespace Mist {
}
}
if (i == 1024){
FAIL_MSG("Could not erase page %lu for track %lu->%lu stream %s from track index!", pageNumber, tid, mapTid, streamName.c_str());
ERROR_MSG("Could not erase page %lu for track %lu->%lu stream %s from track index!", pageNumber, tid, mapTid, streamName.c_str());
}
if (!nProxy.pagesByTrack.count(tid)){

20
src/output/output.cpp
View file

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