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

Added compatibility with latest library changes.

Browse source
This commit is contained in:
Thulinma 2013-10-31 14:03:29 +01:00
parent 150136c8a4
commit 9994d4a590
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/buffer/buffer_user.cpp
View file

@ -76,7 +76,7 @@ namespace Buffer {
} //cancel if not connected } //cancel if not connected
if (myRing->waiting){ if (myRing->waiting){
Stream::get()->waitForData(); Stream::get()->waitForData();
if (!Stream::get()->getStream()->isNewest(myRing->b)){ if (!Stream::get()->getStream()->isNewest(myRing->b, allowedTracks)){
myRing->waiting = false; myRing->waiting = false;
Stream::get()->getReadLock(); Stream::get()->getReadLock();
myRing->b = Stream::get()->getStream()->getNext(myRing->b, allowedTracks); myRing->b = Stream::get()->getStream()->getNext(myRing->b, allowedTracks);
@ -107,7 +107,7 @@ 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)){ if (Stream::get()->getStream()->isNewest(myRing->b, allowedTracks)){
//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();