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 2021-04-23 12:43:29 +02:00
commit ee6f1f1390
16 changed files with 1039 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/output/output_http_internal.cpp
View file

@ -143,6 +143,7 @@ namespace Mist {
capa["optional"]["wrappers"]["allowed"].append("videojs");
capa["optional"]["wrappers"]["allowed"].append("dashjs");
capa["optional"]["wrappers"]["allowed"].append("webrtc");
capa["optional"]["wrappers"]["allowed"].append("mews");
capa["optional"]["wrappers"]["allowed"].append("flash_strobe");
capa["optional"]["wrappers"]["option"] = "--wrappers";
capa["optional"]["wrappers"]["short"] = "w";
@ -797,9 +798,12 @@ namespace Mist {
response.append((char*)webrtc_js, (size_t)webrtc_js_len);
used = true;
}
if (!used) {
WARN_MSG("Unknown player type: %s",it->asStringRef().c_str());
if (it->asStringRef() == "mews"){
#include "mews.js.h"
response.append((char*)mews_js, (size_t)mews_js_len);
used = true;
}
if (!used){WARN_MSG("Unknown player type: %s", it->asStringRef().c_str());}
}
if ((rURL.substr(0, 7) == "/embed_") && (rURL.length() > 10) && (rURL.substr(rURL.length() - 3, 3) == ".js")){