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

update logger

Browse source
This commit is contained in:
badaix 2017-07-24 18:59:49 +02:00
parent 2955b20e9d
commit ce55f15c02
36 changed files with 967 additions and 389 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/player/openslPlayer.cpp
View file

@ -71,7 +71,7 @@ void OpenslPlayer::playerCallback(SLAndroidSimpleBufferQueueItf bq)
{
if (bq != bqPlayerBufferQueue)
{
logE << "Wrong bq!\n";
LOG(ERROR) << "Wrong bq!\n";
return;
}
@ -81,7 +81,7 @@ void OpenslPlayer::playerCallback(SLAndroidSimpleBufferQueueItf bq)
if (lastTick != 0)
{
diff = now - lastTick;
// logE << "diff: " << diff << ", frames: " << player->frames_ / 44.1 << "\n";
// LOG(ERROR) << "diff: " << diff << ", frames: " << player->frames_ / 44.1 << "\n";
// if (diff <= 50)
// {
// usleep(1000 * (50 - diff));
@ -92,7 +92,7 @@ void OpenslPlayer::playerCallback(SLAndroidSimpleBufferQueueItf bq)
*/
// size_t d = player->frames_ / 0.48d;
// logE << "Delay: " << d << "\n";
// LOG(ERROR) << "Delay: " << d << "\n";
// SLAndroidSimpleBufferQueueState state;
// (*bq)->GetState(bq, &state);
// cout << "bqPlayerCallback count: " << state.count << ", idx: " << state.index << "\n";
@ -101,7 +101,7 @@ void OpenslPlayer::playerCallback(SLAndroidSimpleBufferQueueItf bq)
// chronos::usec delay((250 - diff) * 1000);
// while (active_ && !stream_->waitForChunk(100))
// logO << "Waiting for chunk\n";
// LOG(INFO) << "Waiting for chunk\n";
if (!active_)
return;
@ -109,7 +109,7 @@ void OpenslPlayer::playerCallback(SLAndroidSimpleBufferQueueItf bq)
chronos::usec delay(ms_ * 1000);
if (!pubStream_->getPlayerChunk(buffer[curBuffer], delay, frames_))
{
// logO << "Failed to get chunk. Playing silence.\n";
// LOG(INFO) << "Failed to get chunk. Playing silence.\n";
memset(buffer[curBuffer], 0, buff_size);
}
else
@ -196,7 +196,7 @@ void OpenslPlayer::initOpensl()
frames_ = format.rate / (1000 / ms_);// * format.channels; // 1920; // 48000 * 2 / 50 // => 50ms
buff_size = frames_ * format.frameSize /* 2 -> sample size */;
logO << "frames: " << frames_ << ", channels: " << format.channels << ", rate: " << format.rate << ", buff: " << buff_size << "\n";
LOG(INFO) << "frames: " << frames_ << ", channels: " << format.channels << ", rate: " << format.rate << ", buff: " << buff_size << "\n";
SLresult result;
// create engine
@ -347,17 +347,17 @@ void OpenslPlayer::uninitOpensl()
// if (!active_)
// return;
logO << "uninitOpensl\n";
LOG(INFO) << "uninitOpensl\n";
SLresult result;
logO << "OpenSLWrap_Shutdown - stopping playback\n";
LOG(INFO) << "OpenSLWrap_Shutdown - stopping playback\n";
if (bqPlayerPlay != NULL)
{
result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_STOPPED);
if (SL_RESULT_SUCCESS != result)
logE << "SetPlayState failed\n";
LOG(ERROR) << "SetPlayState failed\n";
}
logO << "OpenSLWrap_Shutdown - deleting player object\n";
LOG(INFO) << "OpenSLWrap_Shutdown - deleting player object\n";
if (bqPlayerObject != NULL)
{
@ -368,7 +368,7 @@ void OpenslPlayer::uninitOpensl()
bqPlayerVolume = NULL;
}
logO << "OpenSLWrap_Shutdown - deleting mix object\n";
LOG(INFO) << "OpenSLWrap_Shutdown - deleting mix object\n";
if (outputMixObject != NULL)
{
@ -376,7 +376,7 @@ void OpenslPlayer::uninitOpensl()
outputMixObject = NULL;
}
logO << "OpenSLWrap_Shutdown - deleting engine object\n";
LOG(INFO) << "OpenSLWrap_Shutdown - deleting engine object\n";
if (engineObject != NULL)
{
@ -391,7 +391,7 @@ void OpenslPlayer::uninitOpensl()
delete [] buffer[1];
buffer[1] = NULL;
logO << "OpenSLWrap_Shutdown - finished\n";
LOG(INFO) << "OpenSLWrap_Shutdown - finished\n";
active_ = false;
}