[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs] admin/web/build/mserver config_mpeg2ts.html, 1.18.2.7, 1.18.2.8
From: yijil () helixcommunity ! org
Date: 2013-01-30 9:07:13
[Download RAW message or body]
Update of /cvsroot/server/admin/web/build/mserver
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11552/build/mserver
Modified Files:
Tag: SERVER_15_0
config_mpeg2ts.html
Log Message:
Committed to: SERVER_15_0_RN, HEAD
Reviewed by: Xiaocheng
Synopsis:
===============
Fix HLXSRV-94 [BuyDRM]At HLS setup page, at 'Segment Encryption' should 'None' \
position before 'Buy DRM'
Branch: SERVER_15_0_RN, HEAD
Suggested Reviewers: Anyone
Description:
===============
At HLS setup page, at 'Segment Encryption' should 'None' position before 'Buy DRM The \
menu list is: None <=== This one should be first position
...
Buy DRM
...
My Fix:
Change "buydrm" to "helixbuydrm"
Files affected:
===============
server/admin/web/build/mserver/config_mpeg2ts.html
server/admin/web/build/server/config_mpeg2ts.html
server/admin/web/src/srvprxy/config_mpeg2ts.html.wasm
server_rn/common/util/pub/mpeg2ts_config_names.h
server_rn/datatype/mpeg2ts/streamhandler.cpp
Testing Performed:
===============
Integration Tests:
N/A
Performance Tests:
N/A
QA Hints
========
None.
Index: config_mpeg2ts.html
===================================================================
RCS file: /cvsroot/server/admin/web/build/mserver/config_mpeg2ts.html,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -u -d -r1.18.2.7 -r1.18.2.8
--- config_mpeg2ts.html 26 Jan 2013 10:01:06 -0000 1.18.2.7
+++ config_mpeg2ts.html 30 Jan 2013 09:06:59 -0000 1.18.2.8
@@ -343,7 +343,7 @@
{
if (controls.name == "MPEG2-TS_Output.Encryption")
{
- if (controls.value == "aes128" || controls.value == "buydrm")
+ if (controls.value == "aes128" || controls.value == "helixbuydrm")
{
theForm["MPEG2-TS_Output.KeyFileWriteLocation"].disabled = false;
theForm["MPEG2-TS_Output.KeyFileInterval"].disabled = false;
@@ -574,9 +574,9 @@
Segment Encryption
<BR>
<select CLASS="longInput" NAME="MPEG2-TS_Output.Encryption" \
ONCHANGE="EnableDisableControls(this)" SIZE="1" WIDTH="253">
- <OPTION value="buydrm">Buy DRM</OPTION>
<OPTION value="none">None</OPTION>
<OPTION value="vcas">Verimatrix DRM</OPTION>
+ <OPTION value="helixbuydrm">Buy DRM</OPTION>
<OPTION value="aes128">AES128</OPTION>
</SELECT>
_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic