胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
c6133213 2 parents 1c90b190 d91a9dfa

Merge branch 'srs.1.0release' into 1.0release

内嵌 并排对比
正在显示 7 个修改的文件 包含 5 行增加 和 5 行删除
@@ -63,9 +63,9 @@ @@ -63,9 +63,9 @@
63 bandwidth.on_update_status = function(status) { 63 bandwidth.on_update_status = function(status) {
64 $("#check_status").text(status); 64 $("#check_status").text(status);
65 } 65 }
66 - bandwidth.on_srs_info = function(srs_server, srs_primary_authors, srs_id, srs_pid, srs_server_ip) { 66 + bandwidth.on_srs_info = function(srs_server, srs_primary, srs_authors, srs_id, srs_pid, srs_server_ip) {
67 $("#check_info").text( 67 $("#check_info").text(
68 - "server:" + srs_server + ", authors:" + srs_primary_authors + 68 + "server:" + srs_server + ", primary:" + srs_primary + ", authors:" + srs_authors +
69 ", srs_id:" + srs_id + ", srs_pid:" + srs_pid + ", ip:" + srs_server_ip 69 ", srs_id:" + srs_id + ", srs_pid:" + srs_pid + ", ip:" + srs_server_ip
70 ); 70 );
71 } 71 }
@@ -139,7 +139,7 @@ package @@ -139,7 +139,7 @@ package
139 customItems.push(new ContextMenuItem("Server: " + srs_server)); 139 customItems.push(new ContextMenuItem("Server: " + srs_server));
140 } 140 }
141 if (srs_primary != null) { 141 if (srs_primary != null) {
142 - customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary)); 142 + customItems.push(new ContextMenuItem("Primary: " + srs_primary));
143 } 143 }
144 if (srs_authors != null) { 144 if (srs_authors != null) {
145 customItems.push(new ContextMenuItem("Authors: " + srs_authors)); 145 customItems.push(new ContextMenuItem("Authors: " + srs_authors));
@@ -282,7 +282,7 @@ package @@ -282,7 +282,7 @@ package
282 customItems.push(new ContextMenuItem("Server: " + srs_server)); 282 customItems.push(new ContextMenuItem("Server: " + srs_server));
283 } 283 }
284 if (srs_primary != null) { 284 if (srs_primary != null) {
285 - customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary)); 285 + customItems.push(new ContextMenuItem("Primary: " + srs_primary));
286 } 286 }
287 if (srs_authors != null) { 287 if (srs_authors != null) {
288 customItems.push(new ContextMenuItem("Authors: " + srs_authors)); 288 customItems.push(new ContextMenuItem("Authors: " + srs_authors));
@@ -148,7 +148,7 @@ package @@ -148,7 +148,7 @@ package
148 customItems.push(new ContextMenuItem("Server: " + srs_server)); 148 customItems.push(new ContextMenuItem("Server: " + srs_server));
149 } 149 }
150 if (srs_primary != null) { 150 if (srs_primary != null) {
151 - customItems.push(new ContextMenuItem("PrimaryAuthors: " + srs_primary)); 151 + customItems.push(new ContextMenuItem("Primary: " + srs_primary));
152 } 152 }
153 if (srs_authors != null) { 153 if (srs_authors != null) {
154 customItems.push(new ContextMenuItem("Authors: " + srs_authors)); 154 customItems.push(new ContextMenuItem("Authors: " + srs_authors));