Monitor Popout on Event option

merge-requests/19/head
Moe 2018-08-09 08:46:04 -07:00
parent 267a880a83
commit 160ee3c21c
4 changed files with 18 additions and 6 deletions

View File

@ -469,6 +469,7 @@
"Audio": "Audio",
"Mute Audio": "Mute Audio",
"No Audio": "No Audio",
"Popout Monitor on Event": "Popout Monitor on Event",
"aac": "aac",
"ac3": "ac3",
"libmp3lame": "libmp3lame",

View File

@ -1896,6 +1896,9 @@ $.ccio.globalWebsocket=function(d,user){
},user.details.audio_delay * 1000)
}
}
if(user.details.event_mon_pop === '1' && !$.ccio.mon[d.ke+d.id+user.auth_token].popOut || $.ccio.mon[d.ke+d.id+user.auth_token].popOut.closed === true){
d.e.find('[monitor="pop"]').click()
}
}
break;
case'init_success':

View File

@ -289,7 +289,7 @@
</div>
<div class="form-group">
<label><div><span><%-lang['Stream Type']%></span></div>
<div><select class="form-control" detail="stream_type" selector="h_st" triggerChange="#add_monitor [detail=stream_vcodec]" triggerChangeIgnore="b64,mjpeg">
<div><select class="form-control" detail="stream_type" selector="h_st" triggerChange="#add_monitor [detail=stream_vcodec]" triggerChangeIgnore="b64,mjpeg,jpeg">
<option value="mp4"><%-lang['Poseidon']%></option>
<!-- <option value="pam">PAM</option>-->
<option value="b64" selected><%-lang['Base64 over Websocket']%></option>

View File

@ -116,11 +116,19 @@
</div>
</label>
</div>
<div class="form-group">
<label><div><span><%-lang['Alert Sound Delay']%></span></div>
<div><input class="form-control" detail="audio_delay" placeholder="1"></div>
</label>
</div>
<div class="form-group">
<label><div><span><%-lang['Alert Sound Delay']%></span></div>
<div><input class="form-control" detail="audio_delay" placeholder="1"></div>
</label>
</div>
<div class="form-group">
<label><div><span><%-lang['Popout Monitor on Event']%></span></div>
<div><select class="form-control" detail="event_mon_pop">
<option value="0" selected><%-lang.No%></option>
<option value="1"><%-lang.Yes%></option>
</select></div>
</label>
</div>
</div>
<% if(!details.sub){ %>
<div class="form-group-group blue">