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

Pro version equivalent of recent free version changes.

Browse source
This commit is contained in:
Thulinma 2015-09-03 19:56:27 +02:00
parent d8051984f2
commit c8d1c2006e
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/analysers/rtp_analyser.cpp
View file

@ -203,7 +203,7 @@ namespace Analysers {
int main(int argc, char ** argv){ int main(int argc, char ** argv){
Util::Config conf = Util::Config(argv[0], PACKAGE_VERSION); Util::Config conf = Util::Config(argv[0]);
conf.parseArgs(argc, argv); conf.parseArgs(argc, argv);
return Analysers::analyseRTP(); return Analysers::analyseRTP();
} }

2
src/analysers/rtsp_rtp_analyser.cpp
View file

@ -190,7 +190,7 @@ namespace RtspRtp{
int main(int argc, char ** argv){ int main(int argc, char ** argv){
Util::Config conf = Util::Config(argv[0], PACKAGE_VERSION); Util::Config conf = Util::Config(argv[0]);
conf.addOption("url",JSON::fromString("{\"arg\":\"string\",\"short\":\"u\",\"long\":\"url\",\"help\":\"URL To get.\", \"default\":\"rtsp://localhost/s1k\"}")); conf.addOption("url",JSON::fromString("{\"arg\":\"string\",\"short\":\"u\",\"long\":\"url\",\"help\":\"URL To get.\", \"default\":\"rtsp://localhost/s1k\"}"));
conf.parseArgs(argc, argv); conf.parseArgs(argc, argv);
return RtspRtp::analyseRtspRtp(conf.getString("url")); return RtspRtp::analyseRtspRtp(conf.getString("url"));

2
src/analysers/stats_analyser.cpp
View file

@ -11,7 +11,7 @@
/// Will emulate a given amount of clients in the statistics. /// Will emulate a given amount of clients in the statistics.
int main(int argc, char ** argv){ int main(int argc, char ** argv){
Util::Config conf = Util::Config(argv[0], PACKAGE_VERSION); Util::Config conf = Util::Config(argv[0]);
conf.addOption("clients", JSON::fromString("{\"arg\":\"num\", \"short\":\"c\", \"long\":\"clients\", \"default\":1000, \"help\":\"Amount of clients to emulate.\"}")); conf.addOption("clients", JSON::fromString("{\"arg\":\"num\", \"short\":\"c\", \"long\":\"clients\", \"default\":1000, \"help\":\"Amount of clients to emulate.\"}"));
conf.addOption("stream", JSON::fromString("{\"arg\":\"string\", \"short\":\"s\", \"long\":\"stream\", \"default\":\"test\", \"help\":\"Streamname to pretend to request.\"}")); conf.addOption("stream", JSON::fromString("{\"arg\":\"string\", \"short\":\"s\", \"long\":\"stream\", \"default\":\"test\", \"help\":\"Streamname to pretend to request.\"}"));
conf.addOption("up", JSON::fromString("{\"arg\":\"string\", \"short\":\"u\", \"long\":\"up\", \"default\":131072, \"help\":\"Bytes per second upstream.\"}")); conf.addOption("up", JSON::fromString("{\"arg\":\"string\", \"short\":\"u\", \"long\":\"up\", \"default\":131072, \"help\":\"Bytes per second upstream.\"}"));

2
src/controller/controller_updater.cpp
View file

@ -92,7 +92,7 @@ namespace Controller {
http.url = "/getsums.php?verinfo=1&rel=" RELEASE "&pass=" SHARED_SECRET "&uniqId=" + uniqId; http.url = "/getsums.php?verinfo=1&rel=" RELEASE "&pass=" SHARED_SECRET "&uniqId=" + uniqId;
http.method = "GET"; http.method = "GET";
http.SetHeader("Host", "releases.mistserver.org"); http.SetHeader("Host", "releases.mistserver.org");
http.SetHeader("X-Version", PACKAGE_VERSION "/" + Util::Config::libver + "/" RELEASE); http.SetHeader("X-Version", PACKAGE_VERSION);
updrConn.SendNow(http.BuildRequest()); updrConn.SendNow(http.BuildRequest());
http.Clean(); http.Clean();
unsigned int startTime = Util::epoch(); unsigned int startTime = Util::epoch();

2
src/controller/controller_uplink.cpp
View file

@ -120,7 +120,7 @@ void Controller::uplinkConnection(void * np) {
} }
data["config"] = Controller::Storage["config"]; data["config"] = Controller::Storage["config"];
data["config"]["uniq"] = uniqId; data["config"]["uniq"] = uniqId;
data["config"]["version"] = PACKAGE_VERSION "/" + Util::Config::libver + "/" RELEASE; data["config"]["version"] = PACKAGE_VERSION;
Controller::checkCapable(capabilities); Controller::checkCapable(capabilities);
data["capabilities"] = capabilities; data["capabilities"] = capabilities;
data["capabilities"].removeMember("connectors"); data["capabilities"].removeMember("connectors");

2
src/input/mist_in_folder.cpp
View file

@ -12,7 +12,7 @@
#include <mist/stream.h> #include <mist/stream.h>
int main(int argc, char * argv[]) { int main(int argc, char * argv[]) {
Util::Config conf(argv[0], PACKAGE_VERSION); Util::Config conf(argv[0]);
mistIn conv(&conf); mistIn conv(&conf);
if (conf.parseArgs(argc, argv)) { if (conf.parseArgs(argc, argv)) {
if (conf.getBool("json")) { if (conf.getBool("json")) {