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

switched to chrono

Browse source 
git-svn-id: svn://elaine/murooma/trunk@130 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-08-03 11:33:54 +00:00
parent 06a7909b1a
commit a76b4fb953
3 changed files with 47 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

14
stream.cpp
View file

@ -1,5 +1,4 @@
#include "stream.h"
#include "timeUtils.h"
#include <iostream>
#include <string.h>
#include <unistd.h>
@ -53,10 +52,10 @@ void Stream::getSilentPlayerChunk(short* outputBuffer)
timeval Stream::getNextPlayerChunk(short* outputBuffer, int correction)
time_point_ms Stream::getNextPlayerChunk(short* outputBuffer, int correction)
{
Chunk* chunk = getNextChunk();
timeval tv = getTimeval(chunk);
time_point_ms tp = timePoint(chunk);
if (correction != 0)
{
@ -77,8 +76,8 @@ timeval Stream::getNextPlayerChunk(short* outputBuffer, int correction)
}
}
chunk->idx = idx;
if (correction != 0)
std::cerr << "Diff: " << diff_ms(getTimeval(chunk), tv) << "\t" << chunk->idx / PLAYER_CHUNK_MS_SIZE << "\n";
// if (correction != 0)
// std::cerr << "Diff: " << diff_ms(getTimeval(chunk), tv) << "\t" << chunk->idx / PLAYER_CHUNK_MS_SIZE << "\n";
}
else
{
@ -126,7 +125,7 @@ timeval Stream::getNextPlayerChunk(short* outputBuffer, int correction)
}
return tv;
return tp;
}
@ -180,8 +179,7 @@ void Stream::getChunk(short* outputBuffer, double outputBufferDacTime, unsigned
}
}
timeval tv = getNextPlayerChunk(outputBuffer, correction);
int age = getAge(tv) - bufferMs;// + outputBufferDacTime*1000;
int age = getAge(getNextPlayerChunk(outputBuffer, correction)) - bufferMs;// + outputBufferDacTime*1000;
if (outputBufferDacTime < 1)
age += outputBufferDacTime*1000;
pBuffer->add(age);