3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-24 20:07:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

xxx

Browse source 
git-svn-id: svn://elaine/murooma/trunk@98 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-07-16 20:25:45 +00:00
parent 0682b81270
commit d539ae5ea0
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server.cpp
View file

@ -56,9 +56,9 @@ int main () {
{
usleep((nextTick - currentTick) * 1000);
}
gettimeofday(&now, NULL);
if (abs(diff_ms(now, start)) > 200)
start = now;
else
gettimeofday(&start, NULL);
nextTick += WIRE_CHUNK_MS;
}
delete chunk;

12
stream.cpp
View file

@ -143,13 +143,13 @@ void Stream::getChunk(short* outputBuffer, double outputBufferDacTime, unsigned
{
// std::cerr << "Sleep: " << sleep << "\n";
sleep += PLAYER_CHUNK_MS;
if (sleep > 0)
if (sleep > -PLAYER_CHUNK_MS/2)
sleep = 0;
getSilentPlayerChunk(outputBuffer);
}
else
{
for (int i=0; i<(sleep / PLAYER_CHUNK_MS) + 1; ++i)
for (int i=0; i<(int)(round((float)sleep / (float)PLAYER_CHUNK_MS)) + 1; ++i)
{
// std::cerr << "Sleep: " << sleep << "\n";
getNextPlayerChunk(outputBuffer);
@ -182,12 +182,12 @@ void Stream::getChunk(short* outputBuffer, double outputBufferDacTime, unsigned
lastUpdate = now;
median = pBuffer->median();
shortMedian = pShortBuffer->median();
if (abs(age) > 700)
if (abs(age) > 100)
sleep = age;
else if (pShortBuffer->full() && (abs(shortMedian) > WIRE_CHUNK_MS))
else if (pShortBuffer->full() && (abs(shortMedian) > PLAYER_CHUNK_MS))
sleep = shortMedian;
else if (pBuffer->full() && (abs(median) >= PLAYER_CHUNK_MS))//ceil(PLAYER_CHUNK_MS / 2) + 1))//; || (median+1 < -ceil(PLAYER_CHUNK_MS / 2))))
sleep = median;
// else if (pBuffer->full() && (abs(median) >= PLAYER_CHUNK_MS))//ceil(PLAYER_CHUNK_MS / 2) + 1))//; || (median+1 < -ceil(PLAYER_CHUNK_MS / 2))))
// sleep = median;
// else if (pBuffer->full() && (median+1 < -floor(PLAYER_CHUNK_MS / 2)))
// sleep = median;
//sleep = 0;