From 81d7f69d1d753747ad5e38df79f59622a0cfb60f Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Tue, 13 Aug 2013 16:29:41 +0200
Subject: [PATCH] Changed flash URL types to include versions, removed ConnRAW
 warning messages.

---
 src/connectors/conn_http_dynamic.cpp     | 2 +-
 src/connectors/conn_http_progressive.cpp | 2 +-
 src/connectors/conn_raw.cpp              | 7 +++++++
 src/connectors/conn_rtmp.cpp             | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/connectors/conn_http_dynamic.cpp b/src/connectors/conn_http_dynamic.cpp
index bb8316b0..2dcf9f80 100644
--- a/src/connectors/conn_http_dynamic.cpp
+++ b/src/connectors/conn_http_dynamic.cpp
@@ -344,7 +344,7 @@ int main(int argc, char ** argv){
   capa["url_rel"] = "/dynamic/$/manifest.f4m";
   capa["url_prefix"] = "/dynamic/$/";
   capa["url_handler"] = "http";
-  capa["url_type"] = "flash";
+  capa["url_type"] = "flash/11";
   capa["socket"] = "http_dynamic";
   conf.addBasicConnectorOptions(capa);
   conf.parseArgs(argc, argv);
diff --git a/src/connectors/conn_http_progressive.cpp b/src/connectors/conn_http_progressive.cpp
index 1889c9af..d2805138 100644
--- a/src/connectors/conn_http_progressive.cpp
+++ b/src/connectors/conn_http_progressive.cpp
@@ -222,7 +222,7 @@ int main(int argc, char ** argv){
   capa["url_rel"] = "/$.flv";
   capa["url_match"] = "/$.flv";
   capa["url_handler"] = "http";
-  capa["url_type"] = "flash";
+  capa["url_type"] = "flash/7";
   capa["socket"] = "http_progressive";
   conf.addBasicConnectorOptions(capa);
   conf.parseArgs(argc, argv);
diff --git a/src/connectors/conn_raw.cpp b/src/connectors/conn_raw.cpp
index 8ac58590..f0926c2e 100644
--- a/src/connectors/conn_raw.cpp
+++ b/src/connectors/conn_raw.cpp
@@ -14,9 +14,16 @@
 ///then outputs the raw stream to stdout.
 int main(int argc, char ** argv){
   Util::Config conf(argv[0], PACKAGE_VERSION);
+  JSON::Value capa;
+  conf.addBasicConnectorOptions(capa);
   conf.addOption("stream_name", JSON::fromString("{\"arg_num\":1, \"help\":\"Name of the stream to write to stdout.\"}"));
   conf.parseArgs(argc, argv);
 
+  if (conf.getBool("json")){
+    std::cout << "null" << std::endl;
+    return -1;
+  }
+
   //connect to the proper stream
   Socket::Connection S = Util::Stream::getStream(conf.getString("stream_name"));
   S.setBlocking(false);
diff --git a/src/connectors/conn_rtmp.cpp b/src/connectors/conn_rtmp.cpp
index e12efa81..3fd40296 100644
--- a/src/connectors/conn_rtmp.cpp
+++ b/src/connectors/conn_rtmp.cpp
@@ -666,7 +666,7 @@ int main(int argc, char ** argv){
   capa["deps"] = "";
   capa["url_rel"] = "/play/$";
   capa["url_handler"] = "rtmp";
-  capa["url_type"] = "flash";
+  capa["url_type"] = "flash/10";
   conf.addConnectorOptions(1935, capa);
   conf.parseArgs(argc, argv);
   if (conf.getBool("json")){