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/input/input.cpp
This commit is contained in:
Thulinma 2016-07-06 16:10:31 +02:00
commit e0ed755890
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/input/input.cpp
View file

@ -516,8 +516,12 @@ namespace Mist {
while (thisPacket && thisPacket.getTime() < (unsigned long long)myMeta.tracks[track].keys[keyNum - 1].getTime()) {
getNext();
}
uint64_t lastBuffered = 0;
while (thisPacket && thisPacket.getTime() < stopTime) {
bufferNext(thisPacket);
if (thisPacket.getTime() >= lastBuffered){
bufferNext(thisPacket);
lastBuffered = thisPacket.getTime();
}
getNext();
}
bufferFinalize(track);