mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-17 20:21:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Blacken Zones are now correctly displayed

Browse Source
This commit is contained in:
Robin Daermann committed 2015-08-20 15:01:07 +02:00
1 parent 8f9ed96585
commit 6fc4525784
3 files changed
+19 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/zm_monitor.cpp
+6 -6
View File
@@ -691,7 +691,7 @@ void Monitor::AddZones( int p_n_zones, Zone *p_zones[] )
zones = p_zones;
}
void Monitor::AddBlackenBitmap( Zone *p_zones[] )
void Monitor::AddBlackenBitmask( Zone *p_zones[] )
{
delete[] blacken_bitmask;
blacken_bitmask = NULL;
@@ -2205,7 +2205,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
Zone **zones = 0;
int n_zones = Zone::Load( monitors[i], zones );
monitors[i]->AddZones( n_zones, zones );
monitors[i]->AddBlackenBitmap( zones );
monitors[i]->AddBlackenBitmask( zones );
Debug( 1, "Loaded monitor %d(%s), %d zones", id, name, n_zones );
}
if ( mysql_errno( &dbconn ) )
@@ -2387,7 +2387,7 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
Zone **zones = 0;
int n_zones = Zone::Load( monitors[i], zones );
monitors[i]->AddZones( n_zones, zones );
monitors[i]->AddBlackenBitmap( zones );
monitors[i]->AddBlackenBitmask( zones );
Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
}
if ( mysql_errno( &dbconn ) )
@@ -2532,7 +2532,7 @@ int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose pu
Zone **zones = 0;
int n_zones = Zone::Load( monitors[i], zones );
monitors[i]->AddZones( n_zones, zones );
monitors[i]->AddBlackenBitmap( zones );
monitors[i]->AddBlackenBitmask( zones );
Debug( 1, "Loaded monitor %d(%s), %d zones", id, name, n_zones );
}
if ( mysql_errno( &dbconn ) )
@@ -2682,7 +2682,7 @@ int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose
Zone **zones = 0;
int n_zones = Zone::Load( monitors[i], zones );
monitors[i]->AddZones( n_zones, zones );
monitors[i]->AddBlackenBitmap( zones );
monitors[i]->AddBlackenBitmask( zones );
Debug( 1, "Loaded monitor %d(%s), %d zones", id, name, n_zones );
}
if ( mysql_errno( &dbconn ) )
@@ -3010,7 +3010,7 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
Zone **zones = 0;
n_zones = Zone::Load( monitor, zones );
monitor->AddZones( n_zones, zones );
monitor->AddBlackenBitmap( zones );
monitor->AddBlackenBitmask( zones );
}
Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
}