From 94020051c4c70c939f6b62e7c51c26e3fc67f55e Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Thu, 19 May 2016 10:31:32 +0200
Subject: [PATCH] Fixed stats timing out while waiting for data, improved debug
 message verbosity some more.

---
 src/output/output.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/output/output.cpp b/src/output/output.cpp
index 322a16d6..c8b03845 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -203,7 +203,7 @@ namespace Mist {
   /// Finally, calls updateMeta()
   void Output::reconnect(){
     if (!Util::startInput(streamName)){
-      DEBUG_MSG(DLVL_FAIL, "Opening stream failed - aborting initalization");
+      FAIL_MSG("Opening stream %s failed - aborting initalization", streamName.c_str());
       onFail();
       return;
     }
@@ -233,9 +233,10 @@ namespace Mist {
       while (!isReadyForPlay()){
         Util::sleep(1000);
         if (Util::epoch() > waitUntil){
-          FAIL_MSG("Giving up waiting for playable tracks");
+          FAIL_MSG("Giving up waiting for playable tracks. Stream: %s, IP: %s", streamName.c_str(), getConnectedHost().c_str());
           break;
         }
+        stats();
         updateMeta();
       }
     }
@@ -295,16 +296,16 @@ namespace Mist {
           if (selCounter + genCounter > bestSoFarCount){
             bestSoFarCount = selCounter + genCounter;
             bestSoFar = index;
-            DEBUG_MSG(DLVL_HIGH, "Match (%u/%u): %s", selCounter, selCounter+genCounter, (*it).toString().c_str());
+            HIGH_MSG("Match (%u/%u): %s", selCounter, selCounter+genCounter, (*it).toString().c_str());
           }
         }else{
-          DEBUG_MSG(DLVL_VERYHIGH, "Not a match for currently selected tracks: %s", (*it).toString().c_str());
+          VERYHIGH_MSG("Not a match for currently selected tracks: %s", (*it).toString().c_str());
         }
       }
       index++;
     }
     
-    DEBUG_MSG(DLVL_MEDIUM, "Trying to fill: %s", capa["codecs"][bestSoFar].toString().c_str());
+    MEDIUM_MSG("Trying to fill: %s", capa["codecs"][bestSoFar].toString().c_str());
     //try to fill as many codecs simultaneously as possible
     if (capa["codecs"][bestSoFar].size() > 0){
       jsonForEach(capa["codecs"][bestSoFar], itb) {