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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/util.cpp
View file

@ -137,6 +137,14 @@ namespace Util{
return result.size() == positions.size(); return result.size() == positions.size();
} }
void stringToLower(std::string & val){
int i = 0;
while(val[i]){
val.at(i) = tolower(val.at(i));
i++;
}
}
/// 64-bits version of ftell /// 64-bits version of ftell
uint64_t ftell(FILE *stream){ uint64_t ftell(FILE *stream){
/// \TODO Windows implementation (e.g. _ftelli64 ?) /// \TODO Windows implementation (e.g. _ftelli64 ?)

2
lib/util.h
View file

@ -9,6 +9,8 @@ namespace Util{
bool createPath(const std::string &path); bool createPath(const std::string &path);
bool stringScan(const std::string &src, const std::string &pattern, bool stringScan(const std::string &src, const std::string &pattern,
std::deque<std::string> &result); std::deque<std::string> &result);
void stringToLower(std::string &val);
uint64_t ftell(FILE *stream); uint64_t ftell(FILE *stream);
uint64_t fseek(FILE *stream, uint64_t offset, int whence); uint64_t fseek(FILE *stream, uint64_t offset, int whence);

2
src/io.cpp
View file

@ -230,7 +230,7 @@ namespace Mist {
} }
} }
if (i == 1024){ 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)){ if (!nProxy.pagesByTrack.count(tid)){

20
src/output/output.cpp
View file

@ -472,11 +472,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>::reverse_iterator trit = myMeta.tracks.rbegin(); trit != myMeta.tracks.rend(); 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;}
}
} }
} }
} }