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

Changed flash URL types to include versions, removed ConnRAW warning messages.

Browse source
This commit is contained in:
Thulinma 2013-08-13 16:29:41 +02:00
parent a254fe7195
commit 81d7f69d1d
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/connectors/conn_http_dynamic.cpp
View file

@ -344,7 +344,7 @@ int main(int argc, char ** argv){
capa["url_rel"] = "/dynamic/$/manifest.f4m"; capa["url_rel"] = "/dynamic/$/manifest.f4m";
capa["url_prefix"] = "/dynamic/$/"; capa["url_prefix"] = "/dynamic/$/";
capa["url_handler"] = "http"; capa["url_handler"] = "http";
capa["url_type"] = "flash"; capa["url_type"] = "flash/11";
capa["socket"] = "http_dynamic"; capa["socket"] = "http_dynamic";
conf.addBasicConnectorOptions(capa); conf.addBasicConnectorOptions(capa);
conf.parseArgs(argc, argv); conf.parseArgs(argc, argv);

2
src/connectors/conn_http_progressive.cpp
View file

@ -222,7 +222,7 @@ int main(int argc, char ** argv){
capa["url_rel"] = "/$.flv"; capa["url_rel"] = "/$.flv";
capa["url_match"] = "/$.flv"; capa["url_match"] = "/$.flv";
capa["url_handler"] = "http"; capa["url_handler"] = "http";
capa["url_type"] = "flash"; capa["url_type"] = "flash/7";
capa["socket"] = "http_progressive"; capa["socket"] = "http_progressive";
conf.addBasicConnectorOptions(capa); conf.addBasicConnectorOptions(capa);
conf.parseArgs(argc, argv); conf.parseArgs(argc, argv);

7
src/connectors/conn_raw.cpp
View file

@ -14,9 +14,16 @@
///then outputs the raw stream to stdout. ///then outputs the raw stream to stdout.
int main(int argc, char ** argv){ int main(int argc, char ** argv){
Util::Config conf(argv[0], PACKAGE_VERSION); 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.addOption("stream_name", JSON::fromString("{\"arg_num\":1, \"help\":\"Name of the stream to write to stdout.\"}"));
conf.parseArgs(argc, argv); conf.parseArgs(argc, argv);
if (conf.getBool("json")){
std::cout << "null" << std::endl;
return -1;
}
//connect to the proper stream //connect to the proper stream
Socket::Connection S = Util::Stream::getStream(conf.getString("stream_name")); Socket::Connection S = Util::Stream::getStream(conf.getString("stream_name"));
S.setBlocking(false); S.setBlocking(false);

2
src/connectors/conn_rtmp.cpp
View file

@ -666,7 +666,7 @@ int main(int argc, char ** argv){
capa["deps"] = ""; capa["deps"] = "";
capa["url_rel"] = "/play/$"; capa["url_rel"] = "/play/$";
capa["url_handler"] = "rtmp"; capa["url_handler"] = "rtmp";
capa["url_type"] = "flash"; capa["url_type"] = "flash/10";
conf.addConnectorOptions(1935, capa); conf.addConnectorOptions(1935, capa);
conf.parseArgs(argc, argv); conf.parseArgs(argc, argv);
if (conf.getBool("json")){ if (conf.getBool("json")){