ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/zoneminder

pull/3653/head
Isaac Connor 2023-01-12 10:19:11 -05:00
parent 2e6f465055 a8c80fde27
commit cf0bc32fd4
3 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_videostore.cpp
View File

@ -983,10 +983,10 @@ int VideoStore::writePacket(const std::shared_ptr<ZMPacket> &zm_pkt) {
} // end while
if (have_out_of_order) {
AVPacket *p = ((*rit)->packet).get();
if (rit == queue.rend()) {
Warning("Unable to re-order packet, packet dts is %" PRId64, p->dts);
Debug(1, "Unable to re-order packet, packet dts is %" PRId64, av_pkt->dts);
} else {
AVPacket *p = ((*rit)->packet).get();
Debug(1, "Found out of order packet, inserting after %" PRId64, p->dts);
}
queue.insert(rit.base(), zm_pkt);

9
web/skins/classic/views/js/monitorpreset.js
View File

@ -1,12 +1,5 @@
var form = $j('#monitorPresetForm');
function submitPreset( element ) {
form.target = opener.name;
form.view.value = 'monitor';
form.submit();
}
function configureButtons() {
const form = document.getElementById('monitorPresetForm');
form.saveBtn.disabled = (form.preset.selectedIndex==0);
}

34
web/skins/classic/views/monitorpreset.php
View File

@ -18,18 +18,11 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
//
if ( !canEdit( 'Monitors' ) )
{
$view = "error";
return;
}
$sql = "select Id,Name from MonitorPresets";
$presets = array();
$presets[0] = translate('ChoosePreset');
foreach( dbFetchAll( $sql ) as $preset )
{
$presets[$preset['Id']] = htmlentities( $preset['Name'] );
if (!canEdit('Monitors')) {
$view = 'error';
return;
}
$mid = isset($_REQUEST['mid']) ? validInt($_REQUEST['mid']) : 0;
$focusWindow = true;
@ -38,20 +31,27 @@ xhtmlHeaders(__FILE__, translate('MonitorPreset') );
<body>
<?php echo getNavBarHTML() ?>
<div id="page">
<h2><?php echo translate('MonitorPreset') ?></h2>
<h2><?php echo translate('MonitorPreset') ?></h2>
<div id="content">
<form name="contentForm" id="monitorPresetForm" method="post" action="?">
<input type="hidden" name="view" value="none"/>
<input type="hidden" name="mid" value="<?php echo validNum($_REQUEST['mid']) ?>"/>
<input type="hidden" name="view" value="monitor"/>
<input type="hidden" name="mid" value="<?php echo $mid ?>"/>
<p>
<?php echo translate('MonitorPresetIntro') ?>
</p>
<p>
<label for="preset"><?php echo translate('Preset') ?></label><?php echo buildSelect( "preset", $presets ); ?>
<label for="preset"><?php echo translate('Preset') ?></label>
<?php
$presets = array();
$presets[0] = translate('ChoosePreset');
foreach (dbFetchAll('SELECT Id,Name FROM MonitorPresets ORDER BY Name') as $preset) {
$presets[$preset['Id']] = htmlentities( $preset['Name'] );
}
echo buildSelect('preset', $presets); ?>
</p>
<div id="contentButtons">
<input type="submit" name="saveBtn" value="<?php echo translate('Save') ?>" data-on-click-this="submitPreset" disabled="disabled"/>
<input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="backWindow"/>
<button type="submit" name="saveBtn" value="preset" disabled="disabled"><?php echo translate('Save') ?></button>
<button type="button" data-on-click="backWindow"><?php echo translate('Cancel') ?></button>
</div>
</form>
</div>