Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2018-10-11 15:15:40 +02:00
commit 57e40fe921
3 changed files with 8 additions and 0 deletions

View file

@ -302,6 +302,7 @@ namespace DTSC {
Track();
Track(JSON::Value & trackRef);
Track(Scan & trackRef);
void clearParts();
inline operator bool() const {
return (parts.size() && keySizes.size() && (keySizes.size() == keys.size()));

View file

@ -1351,6 +1351,10 @@ namespace DTSC {
fragments.rbegin()->setSize(fragments.rbegin()->getSize() + packDataSize);
}
void Track::clearParts(){
while (fragments.size() > 1){removeFirstKey();}
}
/// Removes the first buffered key, including any fragments it was part of
void Track::removeFirstKey(){
HIGH_MSG("Erasing key %d:%lu", trackID, keys[0].getNumber());

View file

@ -381,6 +381,9 @@ namespace Mist {
if (myMeta.live){
myMeta.update(pack);
for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++) {
it->second.clearParts();
}
}
//End of brain melt