mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-02-01 18:11:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bug 374 - Multiple monitors can now share the same video device source without penalty.

Browse Source 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2030 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan
2006-10-24 14:37:34 +00:00
parent 16e0383c54
commit ed0626492f
8 changed files with 304 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/zmc.cpp
View File

@@ -191,12 +191,10 @@ int main( int argc, char *argv[] )
sigaddset( &block_set, SIGUSR1 );
sigaddset( &block_set, SIGUSR2 );
if ( device[0] && n_monitors == 1 )
if ( monitors[0]->PrimeCapture() < 0 )
{
if ( monitors[0]->PreCapture() < 0 )
{
exit( -1 );
}
exit( -1 );
}
long *capture_delays = new long[n_monitors];
@@ -214,7 +212,6 @@ int main( int argc, char *argv[] )
struct DeltaTimeval delta_time;
while( !zm_terminate )
{
/* grab a new one */
sigprocmask( SIG_BLOCK, &block_set, 0 );
for ( int i = 0; i < n_monitors; i++ )
{
@@ -231,9 +228,7 @@ int main( int argc, char *argv[] )
else
next_delays[j] = capture_delays[j]-delta_time.delta;
if ( next_delays[j] < 0 )
{
next_delays[j] = 0;
}
}
else
{