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

Its really really broken

Browse source
This commit is contained in:
Erik Zandvliet 2013-07-01 13:29:08 +02:00 • committed by Thulinma
parent e730f9c61e
commit bfecf417dc
3 changed files with 72 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/buffer/buffer.cpp
View file

@ -56,7 +56,6 @@ namespace Buffer {
#if DEBUG >= 5
std::cerr << "Thread launched for user " << usr->MyStr << ", socket number " << usr->S.getSocket() << std::endl;
#endif
Stream::get()->getReadLock();
usr->myRing = thisStream->getRing();
if (thisStream->getStream()->metadata && thisStream->getHeader().size() > 0){
@ -67,12 +66,14 @@ namespace Buffer {
while (usr->S.connected()){
Util::sleep(5); //sleep 5ms
if ( !usr->myRing->playCount || !usr->Send(newSelect)){
if (usr->myRing->updated){
// if (usr->myRing->updated){
Stream::get()->getReadLock();
usr->S.SendNow(Stream::get()->getStream()->metadata.toNetPacked());
usr->S.SendNow(thisStream->getHeader());
// std::cerr << "Sending updated header: " << std::endl;
// std::cerr << Stream::get()->getStream()->metadata.toPrettyString() << std::endl;
Stream::get()->dropReadLock();
usr->myRing->updated = false;
}
// usr->myRing->updated = false;
// }
if (usr->S.spool()){
while (usr->S.Received().size()){
//delete anything that doesn't end with a newline

3
src/buffer/buffer_stream.cpp
View file

@ -63,7 +63,8 @@ namespace Buffer {
Storage["totals"]["count"] = tot_count;
Storage["totals"]["now"] = now;
Storage["buffer"] = name;
Storage["meta"] = Strm->metadata;
///\todo Fixme
// Storage["meta"] = Strm->metadata;
if (Storage["meta"].isMember("audio")){
Storage["meta"]["audio"].removeMember("init");
}