From c8d1c2006eafc4ac40b3172870a34d2d954ce5bf Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Thu, 3 Sep 2015 19:56:27 +0200
Subject: [PATCH] Pro version equivalent of recent free version changes.

---
 src/analysers/rtp_analyser.cpp        | 2 +-
 src/analysers/rtsp_rtp_analyser.cpp   | 2 +-
 src/analysers/stats_analyser.cpp      | 2 +-
 src/controller/controller_updater.cpp | 2 +-
 src/controller/controller_uplink.cpp  | 2 +-
 src/input/mist_in_folder.cpp          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/analysers/rtp_analyser.cpp b/src/analysers/rtp_analyser.cpp
index 239a9f72..801a232b 100644
--- a/src/analysers/rtp_analyser.cpp
+++ b/src/analysers/rtp_analyser.cpp
@@ -203,7 +203,7 @@ namespace Analysers {
 
 
 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);
   return Analysers::analyseRTP();
 }
diff --git a/src/analysers/rtsp_rtp_analyser.cpp b/src/analysers/rtsp_rtp_analyser.cpp
index f8f07dd9..0f8b1767 100644
--- a/src/analysers/rtsp_rtp_analyser.cpp
+++ b/src/analysers/rtsp_rtp_analyser.cpp
@@ -190,7 +190,7 @@ namespace RtspRtp{
 
 
 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.parseArgs(argc, argv);
   return RtspRtp::analyseRtspRtp(conf.getString("url"));
diff --git a/src/analysers/stats_analyser.cpp b/src/analysers/stats_analyser.cpp
index 2ec5a75a..04ba9f87 100644
--- a/src/analysers/stats_analyser.cpp
+++ b/src/analysers/stats_analyser.cpp
@@ -11,7 +11,7 @@
 
 /// Will emulate a given amount of clients in the statistics.
 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("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.\"}"));
diff --git a/src/controller/controller_updater.cpp b/src/controller/controller_updater.cpp
index b2a46491..2d6342c1 100644
--- a/src/controller/controller_updater.cpp
+++ b/src/controller/controller_updater.cpp
@@ -92,7 +92,7 @@ namespace Controller {
     http.url = "/getsums.php?verinfo=1&rel=" RELEASE "&pass=" SHARED_SECRET "&uniqId=" + uniqId;
     http.method = "GET";
     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());
     http.Clean();
     unsigned int startTime = Util::epoch();
diff --git a/src/controller/controller_uplink.cpp b/src/controller/controller_uplink.cpp
index 2b030929..b39c9706 100644
--- a/src/controller/controller_uplink.cpp
+++ b/src/controller/controller_uplink.cpp
@@ -120,7 +120,7 @@ void Controller::uplinkConnection(void * np) {
         }
         data["config"] = Controller::Storage["config"];
         data["config"]["uniq"] = uniqId;
-        data["config"]["version"] = PACKAGE_VERSION "/" + Util::Config::libver + "/" RELEASE;
+        data["config"]["version"] = PACKAGE_VERSION;
         Controller::checkCapable(capabilities);
         data["capabilities"] = capabilities;
         data["capabilities"].removeMember("connectors");
diff --git a/src/input/mist_in_folder.cpp b/src/input/mist_in_folder.cpp
index 42e84bab..a7f73633 100644
--- a/src/input/mist_in_folder.cpp
+++ b/src/input/mist_in_folder.cpp
@@ -12,7 +12,7 @@
 #include <mist/stream.h>
 
 int main(int argc, char * argv[]) {
-  Util::Config conf(argv[0], PACKAGE_VERSION);
+  Util::Config conf(argv[0]);
   mistIn conv(&conf);
   if (conf.parseArgs(argc, argv)) {
     if (conf.getBool("json")) {