Fixed code style for recent commits.

src/buffer.cpp

@@ -228,7 +228,8 @@ namespace Buffer {
     conf.addOption("reportstats",
         JSON::fromString("{\"default\":0, \"help\":\"Report stats to a controller process.\", \"short\":\"s\", \"long\":\"reportstats\"}"));
     conf.addOption("time",
-        JSON::fromString("{\"default\":0, \"arg\": \"integer\", \"help\":\"Buffer a specied amount of time in ms.\", \"short\":\"t\", \"long\":\"time\"}"));
+        JSON::fromString(
+            "{\"default\":0, \"arg\": \"integer\", \"help\":\"Buffer a specied amount of time in ms.\", \"short\":\"t\", \"long\":\"time\"}"));
     conf.parseArgs(argc, argv);
 
     std::string name = conf.getString("stream_name");

src/conn_http_dynamic.cpp

@@ -134,12 +134,14 @@ namespace Connector_HTTP {
               "<deliveryType>streaming</deliveryType>\n"
               "<bootstrapInfo profile=\"named\" id=\"bootstrap1\">" + Base64::encode(GenerateBootstrap(MovieId, metadata, 1, 0, 0))
               + "</bootstrapInfo>\n"
-                  "<media streamId=\"1\" bootstrapInfoId=\"bootstrap1\" url=\"" + MovieId + "/\">\n"
+                  "<media streamId=\"1\" bootstrapInfoId=\"bootstrap1\" url=\"" + MovieId
+              + "/\">\n"
                   "<metadata>AgAKb25NZXRhRGF0YQgAAAAAAAl0cmFja2luZm8KAAAAAgMACXRpbWVzY2FsZQBA+GoAAAAAAAAGbGVuZ3RoAEGMcHoQAAAAAAhsYW5ndWFnZQIAA2VuZwARc2FtcGxlZGVzY3JpcHRpb24KAAAAAQMACnNhbXBsZXR5cGUCAARhdmMxAAAJAAAJAwAJdGltZXNjYWxlAEDncAAAAAAAAAZsZW5ndGgAQXtNvTAAAAAACGxhbmd1YWdlAgADZW5nABFzYW1wbGVkZXNjcmlwdGlvbgoAAAABAwAKc2FtcGxldHlwZQIABG1wNGEAAAkAAAkADWF1ZGlvY2hhbm5lbHMAQAAAAAAAAAAAD2F1ZGlvc2FtcGxlcmF0ZQBA53AAAAAAAAAOdmlkZW9mcmFtZXJhdGUAQDf/gi5SciUABmFhY2FvdABAAAAAAAAAAAAIYXZjbGV2ZWwAQD8AAAAAAAAACmF2Y3Byb2ZpbGUAQFNAAAAAAAAADGF1ZGlvY29kZWNpZAIABG1wNGEADHZpZGVvY29kZWNpZAIABGF2YzEABXdpZHRoAECQ4AAAAAAAAAZoZWlnaHQAQIMAAAAAAAAACmZyYW1lV2lkdGgAQJDgAAAAAAAAC2ZyYW1lSGVpZ2h0AECDAAAAAAAAAAxkaXNwbGF5V2lkdGgAQJDgAAAAAAAADWRpc3BsYXlIZWlnaHQAQIMAAAAAAAAADG1vb3Zwb3NpdGlvbgBBmxq2uAAAAAAIZHVyYXRpb24AQIKjqW3oyhIAAAk=</metadata>\n"
                   "</media>\n"
                   "</manifest>\n";
     }else{
-      Result = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+      Result =
+          "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
               "<manifest xmlns=\"http://ns.adobe.com/f4m/1.0\">\n"
               "<id>" + MovieId + "</id>\n"
               "<duration>0.00</duration>\n"
@@ -147,7 +149,8 @@ namespace Connector_HTTP {
               "<streamType>live</streamType>\n"
               "<deliveryType>streaming</deliveryType>\n"
               "<bootstrapInfo profile=\"named\" id=\"bootstrap1\" url=\"" + MovieId + ".bootstrap\"></bootstrapInfo>\n"
-          "<media bootstrapInfoId=\"bootstrap1\" url=\"" + MovieId + "/\">"
+              "<media bootstrapInfoId=\"bootstrap1\" url=\"" + MovieId
+              + "/\">"
                   "<metadata>AgAKb25NZXRhRGF0YQgAAAAAAA9tZXRhZGF0YWNyZWF0b3ICABBBbmV2aWEgVmlhTW90aW9uAAhoYXNBdWRpbwEBAAhoYXNWaWRlbwEBAAhkdXJhdGlvbgBBIWWYAAAAAAAPYXVkaW9zYW1wbGVyYXRlAEBIAAAAAAAAAA1hdWRpb2RhdGFyYXRlAEBgAAAAAAAAAAxhdWRpb2NvZGVjaWQCAARtcDRhAAZhYWNhb3QAQAAAAAAAAAAABXdpZHRoAECQAAAAAAAAAAZoZWlnaHQAQIIAAAAAAAAADXZpZGVvZGF0YXJhdGUAQJ9AAAAAAAAADHZpZGVvY29kZWNpZAIABEFWQzEACmF2Y3Byb2ZpbGUAQFNAAAAAAAAACGF2Y2xldmVsAEA/AAAAAAAAAAAJ</metadata>\n"
                   "</media>\n"
                   "</manifest>\n";
@@ -219,7 +222,8 @@ namespace Connector_HTTP {
             }
             ss.setBlocking(false);
             inited = true;
-            while ( !ss.spool()){}
+            while ( !ss.spool()){
+            }
             Strm.parsePacket(ss.Received());
           }
           if (HTTP_R.url.find(".bootstrap") != std::string::npos){

src/conn_http_live.cpp

@@ -159,7 +159,8 @@ namespace Connector_HTTP {
             }
             ss.setBlocking(false);
             inited = true;
-            while ( !ss.spool()){}
+            while ( !ss.spool()){
+            }
             Strm.parsePacket(ss.Received());
           }
           if (HTTP_R.url.find(".m3u") == std::string::npos){
@@ -340,8 +341,6 @@ namespace Connector_HTTP {
                 ContCounter = &AudioCounter;
               }
 
-
-
               //initial packet
               PackData.Clear();
               PackData.PID(PIDno);
@@ -367,7 +366,6 @@ namespace Connector_HTTP {
                 PacketNumber++;
               }
 
-              
             }
           }
           if (pending_manifest && !Strm.metadata.isNull()){

src/controller.cpp

@@ -154,9 +154,15 @@ int main(int argc, char ** argv){
   conf.addOption("account",
       JSON::fromString(
           "{\"long\":\"account\", \"short\":\"a\", \"arg\":\"string\" \"default\":\"\", \"help\":\"A username:password string to create a new account with.\"}"));
-  conf.addOption("uplink", JSON::fromString("{\"default\":\"\", \"arg\":\"string\", \"help\":\"MistSteward uplink host and port.\", \"short\":\"U\", \"long\":\"uplink\"}"));
+  conf.addOption("uplink",
-  conf.addOption("uplink-name", JSON::fromString("{\"default\":\"" COMPILED_USERNAME "\", \"arg\":\"string\", \"help\":\"MistSteward uplink username.\", \"short\":\"N\", \"long\":\"uplink-name\"}"));
+      JSON::fromString(
-  conf.addOption("uplink-pass", JSON::fromString("{\"default\":\"" COMPILED_PASSWORD "\", \"arg\":\"string\", \"help\":\"MistSteward uplink password.\", \"short\":\"P\", \"long\":\"uplink-pass\"}"));
+          "{\"default\":\"\", \"arg\":\"string\", \"help\":\"MistSteward uplink host and port.\", \"short\":\"U\", \"long\":\"uplink\"}"));
+  conf.addOption("uplink-name",
+      JSON::fromString(
+          "{\"default\":\"" COMPILED_USERNAME "\", \"arg\":\"string\", \"help\":\"MistSteward uplink username.\", \"short\":\"N\", \"long\":\"uplink-name\"}"));
+  conf.addOption("uplink-pass",
+      JSON::fromString(
+          "{\"default\":\"" COMPILED_PASSWORD "\", \"arg\":\"string\", \"help\":\"MistSteward uplink password.\", \"short\":\"P\", \"long\":\"uplink-pass\"}"));
   conf.parseArgs(argc, argv);
 
   std::string account = conf.getString("account");
@@ -178,7 +184,8 @@ int main(int argc, char ** argv){
     if (colon != std::string::npos && colon != 0 && colon != uplink_addr.size()){
       uplink_host = uplink_addr.substr(0, colon);
       uplink_port = atoi(uplink_addr.substr(colon + 1, std::string::npos).c_str());
-      Controller::Log("CONF", "Connection to uplink enabled on host " + uplink_host + " and port " + uplink_addr.substr(colon + 1, std::string::npos));
+      Controller::Log("CONF",
+          "Connection to uplink enabled on host " + uplink_host + " and port " + uplink_addr.substr(colon + 1, std::string::npos));
     }
   }