hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output.h
This commit is contained in:
Thulinma 2017-07-28 18:39:49 +02:00
commit dc8bae8dd3
10 changed files with 80 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/input/input.cpp
View file

@ -672,7 +672,7 @@ namespace Mist {
}
bufferFinalize(track);
bufferTimer = Util::bootMS() - bufferTimer;
DEBUG_MSG(DLVL_DEVEL, "Done buffering page %d (%llu packets, %llu bytes) for track %d in %llums", keyNum, packCounter, byteCounter, track, bufferTimer);
DEBUG_MSG(DLVL_DEVEL, "Done buffering page %d (%llu packets, %llu bytes) for track %d (%s) in %llums", keyNum, packCounter, byteCounter, track, myMeta.tracks[track].codec.c_str(), bufferTimer);
pageCounter[track][keyNum] = 15;
return true;
}