Skip to content

Commit 5187422

Browse files
authored
Fix: Always load hls.js library (watch.php)
Because now we switch players "on the fly"
1 parent 4043c02 commit 5187422

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

web/skins/classic/views/watch.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,12 @@
103103
}
104104
#Whether to show the controls button
105105
$hasPtzControls = false;
106-
$hasHLS = false;
107106
foreach ($monitors as $m) {
108107
if (( ZM_OPT_CONTROL && $m->Controllable() && canView('Control') && $m->Type() != 'WebSite' )) {
109108
//If there is control for at least one camera, then we display the block.
110109
$hasPtzControls = true;
111110
}
112-
if (($m->RTSP2WebEnabled() and $m->RTSP2WebType == 'HLS')) {
113-
$hasHLS = true;
114-
}
115-
if ($hasPtzControls && $hasHLS) {
111+
if ($hasPtzControls) {
116112
break;
117113
}
118114
}
@@ -534,13 +530,7 @@ class="table-sm table-borderless"
534530
</div><!-- id="content" -->
535531
</div>
536532
</div>
537-
<?php
538-
if ($hasHLS) {
539-
?>
540533
<script src="<?php echo cache_bust('js/hls-1.5.20/hls.min.js') ?>"></script>
541-
<?php
542-
}
543-
?>
544534
<?php
545535
} else {
546536
echo "There are no monitors to display\n";

0 commit comments

Comments
 (0)