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

Buffer code simplification.

Browse source
This commit is contained in:
Thulinma 2013-11-01 14:21:06 +01:00
parent 4e6567cf24
commit 81fec034d3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/buffer/buffer_user.cpp
View file

@ -107,13 +107,14 @@ namespace Buffer {
if (doSend(Stream::get()->getStream()->outPacket(myRing->b).c_str(), Stream::get()->getStream()->outPacket(myRing->b).length())){ if (doSend(Stream::get()->getStream()->outPacket(myRing->b).c_str(), Stream::get()->getStream()->outPacket(myRing->b).length())){
//switch to next buffer //switch to next buffer
currsend = 0; currsend = 0;
if (Stream::get()->getStream()->isNewest(myRing->b, allowedTracks)){ DTSC::livePos newPos = Stream::get()->getStream()->getNext(myRing->b, allowedTracks);
if (myRing->b == newPos){
//no next buffer? go in waiting mode. //no next buffer? go in waiting mode.
myRing->waiting = true; myRing->waiting = true;
Stream::get()->dropReadLock(); Stream::get()->dropReadLock();
return false; return false;
} }
myRing->b = Stream::get()->getStream()->getNext(myRing->b, allowedTracks); myRing->b = newPos;
if ((Stream::get()->getStream()->getPacket(myRing->b).isMember("keyframe") && (myRing->playCount > 0)) || (playUntil && playUntil <= Stream::get()->getStream()->getPacket(myRing->b)["time"].asInt())){ if ((Stream::get()->getStream()->getPacket(myRing->b).isMember("keyframe") && (myRing->playCount > 0)) || (playUntil && playUntil <= Stream::get()->getStream()->getPacket(myRing->b)["time"].asInt())){
myRing->playCount--; myRing->playCount--;
if (myRing->playCount < 1 || playUntil <= Stream::get()->getStream()->getPacket(myRing->b)["time"].asInt()){ if (myRing->playCount < 1 || playUntil <= Stream::get()->getStream()->getPacket(myRing->b)["time"].asInt()){