From 57967696c26fbea9bea0592f28cfbfa006535495 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Fri, 31 Jan 2014 14:31:56 +0100
Subject: [PATCH] Fixed high debugging levels problems.

---
 src/connectors/conn_http_dynamic.cpp         |  2 +-
 src/connectors/conn_http_live.cpp            |  4 ++--
 src/connectors/conn_http_progressive_mp4.cpp |  2 +-
 src/converters/dtsc2ogg.cpp                  | 15 ---------------
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/connectors/conn_http_dynamic.cpp b/src/connectors/conn_http_dynamic.cpp
index c0675ce2..75898226 100644
--- a/src/connectors/conn_http_dynamic.cpp
+++ b/src/connectors/conn_http_dynamic.cpp
@@ -199,7 +199,7 @@ namespace Connector_HTTP {
               temp = HTTP_R.url.find("Frag") + 4;
               ReqFragment = atoi(HTTP_R.url.substr(temp).c_str());
               #if DEBUG >= 5
-              printf("Video track %d, segment %d, fragment %d\n", Quality, Segment, ReqFragment);
+              printf("Video track %d, fragment %d\n", Quality, ReqFragment);
               #endif
               if (!audioTrack){getTracks(Strm.metadata);}
               DTSC::Track & vidTrack = Strm.metadata.tracks[Quality];
diff --git a/src/connectors/conn_http_live.cpp b/src/connectors/conn_http_live.cpp
index 9372635c..48ad9b87 100644
--- a/src/connectors/conn_http_live.cpp
+++ b/src/connectors/conn_http_live.cpp
@@ -57,7 +57,7 @@ namespace Connector_HTTP {
       }
     }
 #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
     return result.str();
   }
@@ -85,7 +85,7 @@ namespace Connector_HTTP {
       result << "#EXT-X-ENDLIST\r\n";
     }
 #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
     return result.str();
   } //liveIndex
diff --git a/src/connectors/conn_http_progressive_mp4.cpp b/src/connectors/conn_http_progressive_mp4.cpp
index 7a240222..de65455d 100644
--- a/src/connectors/conn_http_progressive_mp4.cpp
+++ b/src/connectors/conn_http_progressive_mp4.cpp
@@ -476,7 +476,7 @@ namespace Connector_HTTP {
             }else if(Strm.lastType() == DTSC::AUDIO || Strm.lastType() == DTSC::VIDEO){
               #if DEBUG >= DLVL_HIGH
               if (!sortSet.empty()){
-                if (sortSet.begin()->trackID != Strm.getPacket()["trackid"].asInt() || sortSet.begin()->time != Strm.getPacket()["time"].asInt()){
+                if ((long long)sortSet.begin()->trackID != Strm.getPacket()["trackid"].asInt() || (long long)sortSet.begin()->time != Strm.getPacket()["time"].asInt()){
                   DEBUG_MSG(DLVL_HIGH, "Set[%d, %d] => Real[%d, %d]", sortSet.begin()->trackID, sortSet.begin()->time, Strm.getPacket()["trackid"].asInt(), Strm.getPacket()["time"].asInt());
                 }
                 //add keyPart to sortSet
diff --git a/src/converters/dtsc2ogg.cpp b/src/converters/dtsc2ogg.cpp
index 5040ad99..155d37fa 100644
--- a/src/converters/dtsc2ogg.cpp
+++ b/src/converters/dtsc2ogg.cpp
@@ -28,28 +28,13 @@ namespace Converters{
     //create DTSC in OGG pages
     DTSCFile.parseNext();
     std::map< long long int, std::vector<JSON::Value> > DTSCBuffer;
-    long long int currID;
     OGG::Page curOggPage;
-    
-
     while(DTSCFile.getJSON()){
-      //currID = DTSCFile.getJSON()["trackid"].asInt();
-      //if (!DTSCBuffer[currID].empty()){
       std::string tmpString;
       oggMeta.readDTSCVector(DTSCFile.getJSON(), tmpString);
       std::cout << tmpString;
-      //DTSCBuffer[currID].clear();
-      //}
-      //DTSCBuffer[currID].push_back(DTSCFile.getJSON());
-
       DTSCFile.parseNext();
     }
-    //outputting end of stream pages
-    //for (std::map< long long int, std::vector<JSON::Value> >::iterator it = DTSCBuffer.begin(); it != DTSCBuffer.end(); it++){
-      //if (!DTSCBuffer[it->first].empty() && DTSCBuffer[it->first][0]["data"].asString() != ""){
-        //std::cout << oggMeta.readDTSCVector(DTSCBuffer[it->first]);
-      //}
-    //}
     return 0;   
   }
 }