Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -Naur '--exclude=*watch*' ./views/js/montage.js ./views_patched/js/montage.js
- --- ./views/js/montage.js 2018-04-15 01:28:35.364986299 -0700
- +++ ./views_patched/js/montage.js 2018-04-15 02:01:00.268530676 -0700
- @@ -69,24 +69,30 @@
- if ( newAlarm )
- {
- - if ( false && SOUND_ON_ALARM )
- + if ( SOUND_ON_ALARM )
- {
- - // Enable the alarm sound
- - $('alarmSound').removeClass( 'hidden' );
- - }
- + // Enable the alarm sound
- + if ( !canPlayPauseAudio )
- + $('alarmSound').removeClass( 'hidden' );
- + else
- + $('MediaPlayer').Play();
- + }
- if ( POPUP_ON_ALARM )
- {
- - windowToFront();
- + windowToFront();
- }
- }
- - if ( false && SOUND_ON_ALARM )
- - {
- - if ( oldAlarm )
- + if ( SOUND_ON_ALARM )
- {
- - // Disable alarm sound
- - $('alarmSound').addClass( 'hidden' );
- + if ( oldAlarm )
- + {
- + // Disable alarm sound
- + if ( !canPlayPauseAudio )
- + $('alarmSound').addClass( 'hidden' );
- + else
- + $('MediaPlayer').Stop();
- }
- - }
- + }
- }
- else
- {
- diff -Naur '--exclude=*watch*' ./views/js/montage.js.php ./views_patched/js/montage.js.php
- --- ./views/js/montage.js.php 2018-04-15 01:29:10.581874297 -0700
- +++ ./views_patched/js/montage.js.php 2018-04-15 01:33:34.088661273 -0700
- @@ -26,6 +26,8 @@
- var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
- +var canPlayPauseAudio = Browser.ie;
- +
- var monitorData = new Array();
- <?php
- foreach ( $monitors as $monitor )
- diff -Naur '--exclude=*watch*' ./views/montage.php ./views_patched/montage.php
- --- ./views/montage.php 2018-04-15 01:27:10.174190704 -0700
- +++ ./views_patched/montage.php 2018-04-15 01:33:04.766582472 -0700
- @@ -84,6 +84,7 @@
- xhtmlHeaders(__FILE__, translate('Montage') );
- ?>
- +<meta http-equiv="refresh" content="60" >
- <body>
- <div id="page">
- <div id="header">
- @@ -152,5 +153,50 @@
- </div>
- </div>
- </div>
- + </div>
- + </div>
- +
- +<?php
- +if ( ZM_WEB_SOUND_ON_ALARM )
- +{
- + $soundSrc = ZM_DIR_SOUNDS.'/'.ZM_WEB_ALARM_SOUND;
- +?>
- + <div id="alarmSound" class="hidden">
- +<?php
- + if ( ZM_WEB_USE_OBJECT_TAGS && isWindows() )
- + {
- +?>
- + <object id="MediaPlayer" width="0" height="0"
- + classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
- + codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902">
- + <param name="FileName" value="<?php echo $soundSrc ?>"/>
- + <param name="autoStart" value="0"/>
- + <param name="loop" value="1"/>
- + <param name="hidden" value="1"/>
- + <param name="showControls" value="0"/>
- + <embed src="<?php echo $soundSrc ?>"
- + autostart="true"
- + loop="true"
- + hidden="true">
- + </embed>
- + </object>
- +<?php
- + }
- + else
- + {
- +?>
- + <embed src="<?php echo $soundSrc ?>"
- + autostart="true"
- + loop="true"
- + hidden="true">
- + </embed>
- +<?php
- + }
- +?>
- + </div>
- +<?php
- +}
- +?>
- +
- </body>
- </html>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
