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

Removed rather excessive debugging output.

Browse source
This commit is contained in:
Thulinma 2013-03-05 17:28:03 +01:00
parent de1b9441ef
commit 40a4059f07
4 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/buffer.cpp
View file

@ -120,7 +120,6 @@ namespace Buffer {
break; break;
} }
case 'f': { //frame-seek case 'f': { //frame-seek
fprintf(stderr, "Received a frame-seek\n");
unsigned int frameno = JSON::Value(usr->S.Received().get().substr(2)).asInt(); unsigned int frameno = JSON::Value(usr->S.Received().get().substr(2)).asInt();
usr->myRing->waiting = false; usr->myRing->waiting = false;
usr->myRing->starved = false; usr->myRing->starved = false;
@ -135,7 +134,6 @@ namespace Buffer {
break; break;
} }
case 'o': { //once-play case 'o': { //once-play
fprintf(stderr, "Received a play-once\n");
if (usr->myRing->playCount >= 0){ if (usr->myRing->playCount >= 0){
usr->myRing->playCount++; usr->myRing->playCount++;
} }

3
src/buffer_stream.cpp
View file

@ -34,7 +34,6 @@ Buffer::Stream::~Stream(){
for (usersIt = users.begin(); usersIt != users.end(); usersIt++){ for (usersIt = users.begin(); usersIt != users.end(); usersIt++){
if (( * *usersIt).S.connected()){ if (( * *usersIt).S.connected()){
( * *usersIt).S.close(); ( * *usersIt).S.close();
printf("Closing user %s\n", ( * *usersIt).MyStr.c_str());
} }
} }
moreData.notify_all(); moreData.notify_all();
@ -96,7 +95,7 @@ bool Buffer::Stream::checkWaitingIP(std::string ip){
if (ip == waiting_ip || ip == "::ffff:" + waiting_ip){ if (ip == waiting_ip || ip == "::ffff:" + waiting_ip){
return true; return true;
}else{ }else{
std::cout << ip << " != " << waiting_ip << std::endl; std::cout << ip << " != (::ffff:)" << waiting_ip << std::endl;
return false; return false;
} }
} }

2
src/buffer_user.cpp
View file

@ -71,7 +71,6 @@ bool Buffer::user::Send(){
if (Stream::get()->getStream()->getPacket(myRing->b).isMember("keyframe") && myRing->playCount > 0){ if (Stream::get()->getStream()->getPacket(myRing->b).isMember("keyframe") && myRing->playCount > 0){
myRing->playCount--; myRing->playCount--;
if ( !myRing->playCount){ if ( !myRing->playCount){
fprintf(stderr, "Sending Pausemark\n");
JSON::Value pausemark; JSON::Value pausemark;
pausemark["datatype"] = "pause_marker"; pausemark["datatype"] = "pause_marker";
pausemark["time"] = Stream::get()->getStream()->getPacket(myRing->b)["time"].asInt(); pausemark["time"] = Stream::get()->getStream()->getPacket(myRing->b)["time"].asInt();
@ -103,7 +102,6 @@ bool Buffer::user::Send(){
if (Stream::get()->getStream()->getPacket(myRing->b).isMember("keyframe") && myRing->playCount > 0){ if (Stream::get()->getStream()->getPacket(myRing->b).isMember("keyframe") && myRing->playCount > 0){
myRing->playCount--; myRing->playCount--;
if ( !myRing->playCount){ if ( !myRing->playCount){
fprintf(stderr, "Sending Pausemark\n");
JSON::Value pausemark; JSON::Value pausemark;
pausemark["datatype"] = "pause_marker"; pausemark["datatype"] = "pause_marker";
pausemark["time"] = Stream::get()->getStream()->getPacket(myRing->b)["time"].asInt(); pausemark["time"] = Stream::get()->getStream()->getPacket(myRing->b)["time"].asInt();

5
src/conn_http_live.cpp
View file

@ -74,7 +74,6 @@ namespace Connector_HTTP {
} }
Result << "#EXT-X-ENDLIST"; Result << "#EXT-X-ENDLIST";
}else{ }else{
std::cerr << metadata["frags"].toPrettyString() << std::endl;
Result << "#EXTM3U\r\n" Result << "#EXTM3U\r\n"
"#EXT-X-MEDIA-SEQUENCE:" << metadata["missed_frags"].asInt() <<"\r\n" "#EXT-X-MEDIA-SEQUENCE:" << metadata["missed_frags"].asInt() <<"\r\n"
"#EXT-X-TARGETDURATION:10\r\n"; "#EXT-X-TARGETDURATION:10\r\n";
@ -82,9 +81,9 @@ namespace Connector_HTTP {
Result << "#EXTINF:" << (*ai)["dur"].asInt() / 1000 << ", no desc\r\n" << (*ai)["num"].asInt() << "_" << (*ai)["len"].asInt() << ".ts\r\n"; Result << "#EXTINF:" << (*ai)["dur"].asInt() / 1000 << ", no desc\r\n" << (*ai)["num"].asInt() << "_" << (*ai)["len"].asInt() << ".ts\r\n";
} }
} }
//#if DEBUG >= 8 #if DEBUG >= 8
std::cerr << "Sending this index:" << std::endl << Result.str() << std::endl; std::cerr << "Sending this index:" << std::endl << Result.str() << std::endl;
//#endif #endif
return Result.str(); return Result.str();
} //BuildIndex } //BuildIndex