external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'srs.1.0release' into 1.0release

Browse source
This commit is contained in:
winlin 2014-11-25 11:12:05 +08:00
commit c6133213cf
7 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/research/players/srs_bwt.html
View file

@ -63,9 +63,9 @@
bandwidth.on_update_status = function(status) {
$("#check_status").text(status);
}
bandwidth.on_srs_info = function(srs_server, srs_primary_authors, srs_id, srs_pid, srs_server_ip) {
bandwidth.on_srs_info = function(srs_server, srs_primary, srs_authors, srs_id, srs_pid, srs_server_ip) {
$("#check_info").text(
"server:" + srs_server + ", authors:" + srs_primary_authors +
"server:" + srs_server + ", primary:" + srs_primary + ", authors:" + srs_authors +
", srs_id:" + srs_id + ", srs_pid:" + srs_pid + ", ip:" + srs_server_ip
);
}

BIN
trunk/research/players/srs_bwt/release/srs_bwt.swf
View file

Binary file not shown.

2
trunk/research/players/srs_bwt/src/srs_bwt.as
View file

@ -139,7 +139,7 @@ package
customItems.push(new ContextMenuItem("Server: " + srs_server));
}
if (srs_primary != null) {
customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary));
customItems.push(new ContextMenuItem("Primary: " + srs_primary));
}
if (srs_authors != null) {
customItems.push(new ContextMenuItem("Authors: " + srs_authors));

BIN
trunk/research/players/srs_player/release/srs_player.swf
View file

Binary file not shown.

2
trunk/research/players/srs_player/src/srs_player.as
View file

@ -282,7 +282,7 @@ package
customItems.push(new ContextMenuItem("Server: " + srs_server));
}
if (srs_primary != null) {
customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary));
customItems.push(new ContextMenuItem("Primary: " + srs_primary));
}
if (srs_authors != null) {
customItems.push(new ContextMenuItem("Authors: " + srs_authors));

BIN
trunk/research/players/srs_publisher/release/srs_publisher.swf
View file

Binary file not shown.

2
trunk/research/players/srs_publisher/src/srs_publisher.as
View file

@ -148,7 +148,7 @@ package
customItems.push(new ContextMenuItem("Server: " + srs_server));
}
if (srs_primary != null) {
customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary));
customItems.push(new ContextMenuItem("Primary: " + srs_primary));
}
if (srs_authors != null) {
customItems.push(new ContextMenuItem("Authors: " + srs_authors));