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

Fixed startTime() bug in Output

Browse source
This commit is contained in:
Thulinma 2016-11-15 11:58:27 +01:00
parent 8d83a203be
commit 3a0beea1fc
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/output/output.cpp
View file

@ -484,32 +484,42 @@ namespace Mist{
} }
///Return the start time of the selected tracks. ///Return the start time of the selected tracks.
///Returns the start time of earliest track if nothing is selected.
///Returns zero if no tracks exist.
uint64_t Output::startTime(){ uint64_t Output::startTime(){
if (!myMeta.tracks.size()){return 0;}
uint64_t start = 0xFFFFFFFFFFFFFFFFull; uint64_t start = 0xFFFFFFFFFFFFFFFFull;
if (selectedTracks.size()){ if (selectedTracks.size()){
for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){ for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
if (myMeta.tracks.count(*it)){ if (myMeta.tracks.count(*it)){
if (start < myMeta.tracks[*it].firstms){ if (start > myMeta.tracks[*it].firstms){start = myMeta.tracks[*it].firstms;}
start = myMeta.tracks[*it].firstms;
}
} }
} }
}else{
for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
if (start > it->second.firstms){start = it->second.firstms;}
}
} }
return start; return start;
} }
///Return the end time of the selected tracks, or 0 if unknown or live. ///Return the end time of the selected tracks, or 0 if unknown or live.
///Returns the end time of latest track if nothing is selected.
///Returns zero if no tracks exist.
uint64_t Output::endTime(){ uint64_t Output::endTime(){
if (myMeta.live){return 0;} if (myMeta.live){return 0;}
if (!myMeta.tracks.size()){return 0;}
uint64_t end = 0; uint64_t end = 0;
if (selectedTracks.size()){ if (selectedTracks.size()){
for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){ for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
if (myMeta.tracks.count(*it)){ if (myMeta.tracks.count(*it)){
if (end < myMeta.tracks[*it].lastms){ if (end < myMeta.tracks[*it].lastms){end = myMeta.tracks[*it].lastms;}
end = myMeta.tracks[*it].lastms;
}
} }
} }
}else{
for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
if (end < it->second.lastms){end = it->second.lastms;}
}
} }
return end; return end;
} }