diff --git a/client.cpp b/client.cpp index d38d0baf..d056fa9f 100644 --- a/client.cpp +++ b/client.cpp @@ -87,6 +87,7 @@ static int paStreamCallback( const void *inputBuffer, void *outputBuffer, PaStreamCallbackFlags statusFlags, void *userData ) { +//cout << "paStreamCallback: " << statusFlags << ", currentTime: " << timeInfo->currentTime << ", out: " << timeInfo->outputBufferDacTime << "\n"; Stream* stream = (Stream*)userData; short* out = (short*)outputBuffer; @@ -137,7 +138,7 @@ int initAudio() outputParameters.sampleFormat = paInt16; /* 32 bit floating point output */ outputParameters.suggestedLatency = Pa_GetDeviceInfo( outputParameters.device )->defaultHighOutputLatency; outputParameters.hostApiSpecificStreamInfo = NULL; -std::cerr << "HighLatency: " << outputParameters.suggestedLatency << "\t LowLatency: " << Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency << "\n"; + std::cerr << "HighLatency: " << outputParameters.suggestedLatency << "\t LowLatency: " << Pa_GetDeviceInfo( outputParameters.device )->defaultLowOutputLatency << "\n"; err = Pa_OpenStream( &paStream, NULL, /* no input */ diff --git a/stream.cpp b/stream.cpp index b8c48d9a..0c4e32ff 100644 --- a/stream.cpp +++ b/stream.cpp @@ -163,9 +163,9 @@ void Stream::getPlayerChunk(short* outputBuffer, double outputBufferDacTime, uns age += outputBufferDacTime*1000; // if (pCardBuffer->full()) - age += 4*cardBuffer; +// age += 4*cardBuffer; -// cout << age << "\t" << outputBufferDacTime*1000 << "\n"; + cout << age << "\t" << framesPerBuffer << "\t" << msBuffer << "\t" << ticks << "\t" << cardBuffer << "\t" << outputBufferDacTime*1000 << "\n"; if (sleep == 0) @@ -193,14 +193,18 @@ void Stream::getPlayerChunk(short* outputBuffer, double outputBufferDacTime, uns // std::cerr << "Chunk: " << age << "\t" << outputBufferDacTime*1000 << "\n"; - updateBuffers(age); + if (ticks > 2) + { +// cout << age << "\n"; + updateBuffers(age); + } time_t now = time(NULL); if (now != lastUpdate) { lastUpdate = now; - median = pBuffer->mean(); - shortMedian = pShortBuffer->mean(); - std::cerr << "Chunk: " << age << "\t" << pMiniBuffer->mean() << "\t" << shortMedian << "\t" << median << "\t" << pBuffer->size() << "\t" << cardBuffer << "\t" << outputBufferDacTime*1000 << "\n"; + median = pBuffer->median(); + shortMedian = pShortBuffer->median(); + std::cerr << "Chunk: " << age << "\t" << pMiniBuffer->mean() << "\t" << shortMedian << "\t" << median << /*"\tmean: " << pBuffer->mean() <<*/ "\t" << pBuffer->size() << "\t" << cardBuffer << "\t" << outputBufferDacTime*1000 << "\n"; } }