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

Removed some debug message warnings.

Browse source
This commit is contained in:
Thulinma 2014-02-10 01:00:54 +01:00
parent 683e2c6190
commit a134e7b711
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/buffer/player.cpp
View file

@ -117,7 +117,9 @@ int main(int argc, char** argv){
bool meta_sent = false; bool meta_sent = false;
int playUntil = -1; int playUntil = -1;
long long now, prevTimestamp = 0; //for timing of sending packets long long now, prevTimestamp = 0; //for timing of sending packets
#if DEBUG >= DLVL_DEVEL
long long bench = 0; //for benchmarking long long bench = 0; //for benchmarking
#endif
std::set<int> newSelect; std::set<int> newSelect;
Stats sts; Stats sts;
CYG_DEFI CYG_DEFI
@ -187,7 +189,9 @@ int main(int argc, char** argv){
if (in_out.Received().get().size() >= 2){ if (in_out.Received().get().size() >= 2){
playUntil = atoi(in_out.Received().get().substr(2).c_str()); playUntil = atoi(in_out.Received().get().substr(2).c_str());
prevTimestamp = 0; prevTimestamp = 0;
#if DEBUG >= DLVL_DEVEL
bench = Util::getMS(); bench = Util::getMS();
#endif
}else{ }else{
playUntil = 0; playUntil = 0;
} }
@ -199,7 +203,9 @@ int main(int argc, char** argv){
} }
++playing; ++playing;
in_out.setBlocking(false); in_out.setBlocking(false);
#if DEBUG >= DLVL_DEVEL
bench = Util::getMS(); bench = Util::getMS();
#endif
break; break;
} }
case 'q': { //quit-playing case 'q': { //quit-playing
@ -251,7 +257,9 @@ int main(int argc, char** argv){
playing = 0; playing = 0;
} }
if (playing == 0){ if (playing == 0){
#if DEBUG >= DLVL_DEVEL
DEBUG_MSG(DLVL_DEVEL, "Completed VoD request in MistPlayer (%d ms)", (Util::getMS() - bench)); DEBUG_MSG(DLVL_DEVEL, "Completed VoD request in MistPlayer (%d ms)", (Util::getMS() - bench));
#endif
pausemark["time"] = source.getJSON()["time"]; pausemark["time"] = source.getJSON()["time"];
pausemark.sendTo(in_out); pausemark.sendTo(in_out);
in_out.setBlocking(true); in_out.setBlocking(true);

11
src/connectors/conn_http.cpp
View file

@ -634,8 +634,11 @@ namespace Connector_HTTP {
DEBUG_MSG(DLVL_HIGH, "Received request: %s (%d) => %s (%s)", Client.getUrl().c_str(), conn.getSocket(), handler.c_str(), Client.GetVar("stream").c_str()); DEBUG_MSG(DLVL_HIGH, "Received request: %s (%d) => %s (%s)", Client.getUrl().c_str(), conn.getSocket(), handler.c_str(), Client.GetVar("stream").c_str());
#if DEBUG >= DLVL_HIGH #if DEBUG >= DLVL_HIGH
long long int startms = Util::getMS(); long long int startms = Util::getMS();
#endif
long long int midms = 0; long long int midms = 0;
#define MID_BENCH midms =
#else
#define MID_BENCH
#endif
bool closeConnection = false; bool closeConnection = false;
if (Client.GetHeader("Connection") == "close"){ if (Client.GetHeader("Connection") == "close"){
closeConnection = true; closeConnection = true;
@ -643,12 +646,12 @@ namespace Connector_HTTP {
if (handler == "none" || handler == "internal"){ if (handler == "none" || handler == "internal"){
if (handler == "internal"){ if (handler == "internal"){
midms = proxyHandleInternal(Client, conn); MID_BENCH proxyHandleInternal(Client, conn);
}else{ }else{
midms = proxyHandleUnsupported(Client, conn); MID_BENCH proxyHandleUnsupported(Client, conn);
} }
}else{ }else{
midms = proxyHandleThroughConnector(Client, conn, handler); MID_BENCH proxyHandleThroughConnector(Client, conn, handler);
} }
#if DEBUG >= DLVL_HIGH #if DEBUG >= DLVL_HIGH
long long int nowms = Util::getMS(); long long int nowms = Util::getMS();