always correct decoding_enable, as zms needs to know it's correct value
This commit is contained in:
parent
00f9cb791c
commit
4fee4d01e3
|
@ -474,6 +474,16 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
|
||||||
function = (Function)atoi(dbrow[col]); col++;
|
function = (Function)atoi(dbrow[col]); col++;
|
||||||
enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
|
enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
|
||||||
decoding_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
|
decoding_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
|
||||||
|
decoding_enabled = !(
|
||||||
|
( function == RECORD or function == NODECT )
|
||||||
|
and
|
||||||
|
( savejpegs == 0 )
|
||||||
|
and
|
||||||
|
( videowriter == PASSTHROUGH )
|
||||||
|
and
|
||||||
|
!decoding_enabled
|
||||||
|
);
|
||||||
|
Debug(1, "Decoding enabled: %d", decoding_enabled);
|
||||||
|
|
||||||
ReloadLinkedMonitors(dbrow[col]); col++;
|
ReloadLinkedMonitors(dbrow[col]); col++;
|
||||||
|
|
||||||
|
@ -650,18 +660,6 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
|
||||||
Error("Can't mkdir %s: %s", monitor_dir.c_str(), strerror(errno));
|
Error("Can't mkdir %s: %s", monitor_dir.c_str(), strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Do this here to save a few cycles with all the comparisons
|
|
||||||
decoding_enabled = !(
|
|
||||||
( function == RECORD or function == NODECT )
|
|
||||||
and
|
|
||||||
( savejpegs == 0 )
|
|
||||||
and
|
|
||||||
( videowriter == PASSTHROUGH )
|
|
||||||
and
|
|
||||||
!decoding_enabled
|
|
||||||
);
|
|
||||||
Debug(1, "Decoding enabled: %d", decoding_enabled);
|
|
||||||
|
|
||||||
if ( config.record_diag_images ) {
|
if ( config.record_diag_images ) {
|
||||||
if ( config.record_diag_images_fifo ) {
|
if ( config.record_diag_images_fifo ) {
|
||||||
diag_path_ref = stringtf("%s/diagpipe-r-%d.jpg", staticConfig.PATH_SOCKS.c_str(), id);
|
diag_path_ref = stringtf("%s/diagpipe-r-%d.jpg", staticConfig.PATH_SOCKS.c_str(), id);
|
||||||
|
|
Loading…
Reference in New Issue