From f269b6deb8376923f2c072a255555d1be66e1790 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@d8a302eb-03bc-478d-80e4-98257eca68ef>
Date: Thu, 21 Aug 2014 21:24:14 +0000
Subject: [PATCH] sleep

git-svn-id: svn://elaine/murooma/trunk@203 d8a302eb-03bc-478d-80e4-98257eca68ef
---
 client/stream.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/stream.cpp b/client/stream.cpp
index 6a4b8560..9178fa93 100644
--- a/client/stream.cpp
+++ b/client/stream.cpp
@@ -123,7 +123,7 @@ void Stream::resetBuffers()
 void Stream::getPlayerChunk(void* outputBuffer, double outputBufferDacTime, unsigned long framesPerBuffer)
 {
 //cout << "framesPerBuffer: " << framesPerBuffer << "\tms: " << framesPerBuffer*2 / PLAYER_CHUNK_MS_SIZE << "\t" << PLAYER_CHUNK_SIZE << "\n";
-	int msBuffer = floor(framesPerBuffer / (hz_/1000));
+//	int msBuffer = floor(framesPerBuffer / (hz_/1000));
 //cout << msBuffer << " ms, " << framesPerBuffer << "\n";
 	int ticks = 0;
 	long currentTick = getTickCount();
@@ -142,27 +142,27 @@ void Stream::getPlayerChunk(void* outputBuffer, double outputBufferDacTime, unsi
 	if (sleep != 0)
 	{
 		resetBuffers();
-		if (sleep < -20)
+		if (sleep < -10)
 		{
 			sleep = Chunk::getAge(getSilentPlayerChunk(outputBuffer, framesPerBuffer)) - bufferMs + latencyMs;
 			std::cerr << "Sleep: " << sleep << ", chunks: " << chunks.size() << "\n";
 //	std::clog << kLogNotice << "sleep: " << sleep << std::endl;
-			if (sleep > -msBuffer/2)
-				sleep = 0;
+//			if (sleep > -msBuffer/2)
+//				sleep = 0;
 			return;
 		}
-		else if (sleep > 20)
+		else if (sleep > 10)
 		{
 //			std::clog << kLogNotice << "sleep: " << sleep << std::endl;
 			while (true)
 			{
-				int age = Chunk::getAge(getNextPlayerChunk(outputBuffer, framesPerBuffer)) - bufferMs + latencyMs;
+				sleep = Chunk::getAge(getNextPlayerChunk(outputBuffer, framesPerBuffer)) - bufferMs + latencyMs;
 				usleep(100);
 //				std::clog << kLogNotice << "age: " << age << std::endl;
-				if (age < 0)
+				if (sleep < 0)
 					break;
 			}
-			sleep = 0;
+//			sleep = 0;
 			return;
 		}
 		else if (sleep < 0)