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 2019-05-13 17:16:53 +02:00
commit f05346e270
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/output/output_http_internal.cpp
View file

@ -860,6 +860,7 @@ namespace Mist {
if (H.GetHeader("Upgrade") != "websocket"){return false;} if (H.GetHeader("Upgrade") != "websocket"){return false;}
HTTP::Websocket ws(myConn, H); HTTP::Websocket ws(myConn, H);
if (!ws){return false;} if (!ws){return false;}
setBlocking(false);
//start the stream, if needed //start the stream, if needed
Util::startInput(streamName, "", true, false); Util::startInput(streamName, "", true, false);
@ -888,7 +889,11 @@ namespace Mist {
if (newState == STRMSTAT_READY){ if (newState == STRMSTAT_READY){
stats(); stats();
} }
Util::sleep(250); if (myConn.spool() && ws.readFrame()){
onWebsocketFrame();
}else{
Util::sleep(250);
}
if (newState == STRMSTAT_READY && (++metaCounter % 4) == 0){ if (newState == STRMSTAT_READY && (++metaCounter % 4) == 0){
updateMeta(); updateMeta();
} }