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-09-08 16:15:55 +02:00
commit 1d4980dca1
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/input/input.cpp
View file

@ -552,6 +552,12 @@ namespace Mist {
} }
return; return;
} }
char userPageName[NAME_BUFFER_SIZE];
snprintf(userPageName, NAME_BUFFER_SIZE, SHM_USERS, streamName.c_str());
nProxy.userClient = IPC::sharedClient(userPageName, PLAY_EX_SIZE, true);
nProxy.userClient.countAsViewer = false;
parseStreamHeader(); parseStreamHeader();
if (myMeta.tracks.size() == 0){ if (myMeta.tracks.size() == 0){
@ -566,11 +572,6 @@ namespace Mist {
return; return;
} }
char userPageName[NAME_BUFFER_SIZE];
snprintf(userPageName, NAME_BUFFER_SIZE, SHM_USERS, streamName.c_str());
nProxy.userClient = IPC::sharedClient(userPageName, PLAY_EX_SIZE, true);
nProxy.userClient.countAsViewer = false;
for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){ for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
it->second.firstms = 0; it->second.firstms = 0;
it->second.lastms = 0; it->second.lastms = 0;

2
src/output/output_http.cpp
View file

@ -42,9 +42,11 @@ namespace Mist {
} }
void HTTPOutput::onFail(){ void HTTPOutput::onFail(){
if (!webSock){
H.Clean(); //make sure no parts of old requests are left in any buffers H.Clean(); //make sure no parts of old requests are left in any buffers
H.SetBody("Stream not found. Sorry, we tried."); H.SetBody("Stream not found. Sorry, we tried.");
H.SendResponse("404", "Stream not found", myConn); H.SendResponse("404", "Stream not found", myConn);
}
Output::onFail(); Output::onFail();
} }