From 40a4059f07a7c056493950037f358cdd5bb2f88f Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Tue, 5 Mar 2013 17:28:03 +0100
Subject: [PATCH] Removed rather excessive debugging output.

---
 src/buffer.cpp         | 2 --
 src/buffer_stream.cpp  | 3 +--
 src/buffer_user.cpp    | 2 --
 src/conn_http_live.cpp | 5 ++---
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/buffer.cpp b/src/buffer.cpp
index 4e4dd8fb..13b3fc40 100644
--- a/src/buffer.cpp
+++ b/src/buffer.cpp
@@ -120,7 +120,6 @@ namespace Buffer {
                   break;
                 }
                 case 'f': { //frame-seek
-                  fprintf(stderr, "Received a frame-seek\n");
                   unsigned int frameno = JSON::Value(usr->S.Received().get().substr(2)).asInt();
                   usr->myRing->waiting = false;
                   usr->myRing->starved = false;
@@ -135,7 +134,6 @@ namespace Buffer {
                   break;
                 }
                 case 'o': { //once-play
-                  fprintf(stderr, "Received a play-once\n");
                   if (usr->myRing->playCount >= 0){
                     usr->myRing->playCount++;
                   }
diff --git a/src/buffer_stream.cpp b/src/buffer_stream.cpp
index a4f9c1fa..ccbec971 100644
--- a/src/buffer_stream.cpp
+++ b/src/buffer_stream.cpp
@@ -34,7 +34,6 @@ Buffer::Stream::~Stream(){
   for (usersIt = users.begin(); usersIt != users.end(); usersIt++){
     if (( * *usersIt).S.connected()){
       ( * *usersIt).S.close();
-      printf("Closing user %s\n", ( * *usersIt).MyStr.c_str());
     }
   }
   moreData.notify_all();
@@ -96,7 +95,7 @@ bool Buffer::Stream::checkWaitingIP(std::string ip){
   if (ip == waiting_ip || ip == "::ffff:" + waiting_ip){
     return true;
   }else{
-    std::cout << ip << " != " << waiting_ip << std::endl;
+    std::cout << ip << " != (::ffff:)" << waiting_ip << std::endl;
     return false;
   }
 }
diff --git a/src/buffer_user.cpp b/src/buffer_user.cpp
index 1dc92e7b..5e723da8 100644
--- a/src/buffer_user.cpp
+++ b/src/buffer_user.cpp
@@ -71,7 +71,6 @@ bool Buffer::user::Send(){
       if (Stream::get()->getStream()->getPacket(myRing->b).isMember("keyframe") && myRing->playCount > 0){
         myRing->playCount--;
         if ( !myRing->playCount){
-          fprintf(stderr, "Sending Pausemark\n");
           JSON::Value pausemark;
           pausemark["datatype"] = "pause_marker";
           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){
       myRing->playCount--;
       if ( !myRing->playCount){
-        fprintf(stderr, "Sending Pausemark\n");
         JSON::Value pausemark;
         pausemark["datatype"] = "pause_marker";
         pausemark["time"] = Stream::get()->getStream()->getPacket(myRing->b)["time"].asInt();
diff --git a/src/conn_http_live.cpp b/src/conn_http_live.cpp
index ef0c3c4e..831bd4d6 100644
--- a/src/conn_http_live.cpp
+++ b/src/conn_http_live.cpp
@@ -74,7 +74,6 @@ namespace Connector_HTTP {
       }
       Result << "#EXT-X-ENDLIST";
     }else{
-      std::cerr << metadata["frags"].toPrettyString() << std::endl;
       Result << "#EXTM3U\r\n"
           "#EXT-X-MEDIA-SEQUENCE:" << metadata["missed_frags"].asInt() <<"\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";
       }
     }
-//#if DEBUG >= 8
+#if DEBUG >= 8
     std::cerr << "Sending this index:" << std::endl << Result.str() << std::endl;
-//#endif
+#endif
     return Result.str();
   } //BuildIndex