summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/devoptions.html7
-rw-r--r--www/templates/events-modal.html4
-rw-r--r--www/templates/events.html4
3 files changed, 11 insertions, 4 deletions
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 78c5dbbb..c6a56447 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -62,6 +62,13 @@
ng-checked="{{loginData.persistMontageOrder}}"
toggle-class="toggle-calm">Persist hidden monitors</ion-toggle>
</label>
+
+
+ <label>
+ <ion-toggle ng-model="loginData.enableh264"
+ ng-checked="{{loginData.enableh264}}"
+ toggle-class="toggle-calm">Enable H.264 video branch support</ion-toggle>
+ </label>
</div>
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index f0d32d52..ee3be1b2 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -7,7 +7,7 @@
<div style="height: 100vh;">
- <div ng-if="defaultVideo==''">
+ <div ng-if="defaultVideo=='' || loginData.enableh264==false">
<ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{calcMsTimer(eFramesNum, eventDur)/1000.0}}" rn-carousel-pause-on-hover>
<li ng-repeat="slide in slides">
@@ -24,7 +24,7 @@
</div>
<!-- no default video -->
- <div ng-if="defaultVideo!=''">
+ <div ng-if="defaultVideo!='' && loginData.enableh264 == true">
<div>
<videogular vg-theme="videoObject.config.theme">
<vg-media vg-src="videoObject.config.sources" vg-native-controls="true">
diff --git a/www/templates/events.html b/www/templates/events.html
index ef6bf0d0..32fcd70a 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -121,7 +121,7 @@
<!-- this is the event scrub area -->
<div ng-if="isGroupShown(event)">
- <div ng-if="event.Event.DefaultVideo==''">
+ <div ng-if="event.Event.DefaultVideo=='' || loginData.enableh264==false">
<br/>
@@ -152,7 +152,7 @@
<!-- no DefaultVideo -->
- <div ng-if="event.Event.DefaultVideo!=''">
+ <div ng-if="event.Event.DefaultVideo!='' && loginData.enableh264 == true">
<br/>
<br/>