From b8eec40fbfba7fadb0e5c96148a036b58859ec0b Mon Sep 17 00:00:00 2001 From: Thulinma Date: Sat, 11 Jul 2015 01:07:06 +0200 Subject: [PATCH] Fixed documentation for realTime variable, improved output verbosity when waiting for inputs to load up pages, made timer more precise. --- src/output/output.cpp | 8 ++++---- src/output/output.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/output/output.cpp b/src/output/output.cpp index 8debe196..6640ea36 100644 --- a/src/output/output.cpp +++ b/src/output/output.cpp @@ -275,15 +275,15 @@ namespace Mist { currKeyOpen.erase(trackId); return; } - DEBUG_MSG(DLVL_HIGH, "Loading track %lu, containing key %lld", trackId, keyNum); + DEBUG_MSG(DLVL_VERYHIGH, "Loading track %lu, containing key %lld", trackId, keyNum); unsigned int timeout = 0; unsigned long pageNum = pageNumForKey(trackId, keyNum); while (pageNum == -1){ if (!timeout){ - DEBUG_MSG(DLVL_VERYHIGH, "Requesting page with key %lu:%lld", trackId, keyNum); + DEBUG_MSG(DLVL_HIGH, "Requesting page with key %lu:%lld", trackId, keyNum); } if (timeout++ > 100){ - DEBUG_MSG(DLVL_FAIL, "Timeout while waiting for requested page. Aborting."); + DEBUG_MSG(DLVL_FAIL, "Timeout while waiting for requested page %lld for track %lu. Aborting.", keyNum, trackId); curPage.erase(trackId); currKeyOpen.erase(trackId); return; @@ -294,7 +294,7 @@ namespace Mist { nxtKeyNum[trackId] = 0; } stats(); - Util::sleep(100); + Util::wait(100); pageNum = pageNumForKey(trackId, keyNum); } diff --git a/src/output/output.h b/src/output/output.h index 91e73cb1..e934213b 100644 --- a/src/output/output.h +++ b/src/output/output.h @@ -81,8 +81,8 @@ namespace Mist { //stream delaying variables unsigned int maxSkipAhead;///< Maximum ms that we will go ahead of the intended timestamps. unsigned int minSkipAhead;///< Minimum ms that we will go ahead of the intended timestamps. - unsigned int realTime;///< Playback speed times 1000 (1000 == 1.0X). Zero is infinite. - + unsigned int realTime;///< Playback speed in ms of data per second. eg: 0 is infinite, 1000 real-time, 5000 is 0.2X speed, 500 = 2X speed. + //Read/write status variables Socket::Connection & myConn;///< Connection to the client.