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

Allow overriding application name with -DAPPNAME="Name here"

Browse source
This commit is contained in:
Thulinma 2019-11-28 01:58:12 +01:00
parent a8e04e1787
commit 771fad390a
21 changed files with 57 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/input/input.cpp
View file

@ -1110,8 +1110,7 @@ namespace Mist{
"</ServerKey><RequestXml>"
"<![CDATA["
"<KeyOSEncryptionInfoRequest><APIVersion>5.0.0.2</APIVersion><DRMType>smooth</"
"DRMType><EncoderVersion>"
"MistServer " RELEASE "_" PACKAGE_VERSION "</EncoderVersion><UserKey>";
"DRMType><EncoderVersion>" APPIDENT "</EncoderVersion><UserKey>";
soap << config->getString("buydrm");
soap << "</UserKey><KeyID>";
soap << formatGUID(contentID);

6
src/input/input_dtsc.cpp
View file

@ -16,8 +16,8 @@ namespace Mist{
inputDTSC::inputDTSC(Util::Config *cfg) : Input(cfg){
capa["name"] = "DTSC";
capa["desc"] = "Load DTSC files as Video on Demand sources, or dtsc:// URLs from other "
"MistServer instances for live sources. This is the optimal method to pull live "
"sources from other MistServer (or compatible) instances.";
"instances for live sources. This is the optimal method to pull live "
"sources from MistServer compatible instances.";
capa["priority"] = 9;
capa["source_match"].append("/*.dtsc");
capa["source_match"].append("dtsc://*");
@ -193,7 +193,7 @@ namespace Mist{
if (!srcConn.connected()){return false;}
JSON::Value prep;
prep["cmd"] = "play";
prep["version"] = "MistServer " PACKAGE_VERSION;
prep["version"] = APPIDENT;
prep["stream"] = streamName;
srcConn.SendNow("DTCM");
char sSize[4] ={0, 0, 0, 0};

2
src/input/input_rtsp.cpp
View file

@ -100,7 +100,7 @@ namespace Mist{
if ((username.size() || password.size()) && authRequest.size()){
sndH.auth(username, password, authRequest);
}
sndH.SetHeader("User-Agent", "MistServer " PACKAGE_VERSION);
sndH.SetHeader("User-Agent", APPIDENT);
sndH.SetHeader("CSeq", JSON::Value(cSeq).asString());
if (session.size()){sndH.SetHeader("Session", session);}
if (extraHeaders && extraHeaders->size()){