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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2018-08-23 15:31:39 +02:00
commit b4741abbc2
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/input/input.cpp
View file

@ -451,7 +451,7 @@ namespace Mist {
INSANE_MSG("Connected: %d users, %d total", userPage.connectedUsers, userPage.amount);
//if not shutting down, wait 1 second before looping
if (config->is_active){
Util::wait(1000);
Util::wait(INPUT_USER_INTERVAL);
}
}
if (streamStatus){streamStatus.mapped[0] = STRMSTAT_SHUTDOWN;}

2
src/io.cpp
View file

@ -518,7 +518,7 @@ namespace Mist {
isKeyframe = true;
} else {
unsigned long lastKey = pagesByTrack[tid].rbegin()->second.lastKeyTime;
if (packet.getTime() - lastKey > 5000) {
if (packet.getTime() - lastKey > AUDIO_KEY_INTERVAL) {
isKeyframe = true;
}
}