ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed srand call and improved error message. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2849 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2009-04-14 20:19:36 +00:00
parent 18f196dbcd
commit 4c8352153d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_monitor.cpp
View File

@ -507,7 +507,6 @@ Monitor::Monitor(
linked_monitors = 0; linked_monitors = 0;
ReloadLinkedMonitors( p_linked_monitors ); ReloadLinkedMonitors( p_linked_monitors );
} }
srand( getpid() * time( 0 ) );
} }
Monitor::~Monitor() Monitor::~Monitor()
@ -2362,9 +2361,9 @@ Monitor *Monitor::Load( int id, bool load_zones, Purpose purpose )
purpose==CAPTURE purpose==CAPTURE
); );
} }
#if HAVE_LIBAVFORMAT
else if ( protocol == "rtsp" ) else if ( protocol == "rtsp" )
{ {
#if HAVE_LIBAVFORMAT
camera = new RemoteCameraRtsp( camera = new RemoteCameraRtsp(
id, id,
method.c_str(), method.c_str(),
@ -2381,8 +2380,10 @@ Monitor *Monitor::Load( int id, bool load_zones, Purpose purpose )
colour, colour,
purpose==CAPTURE purpose==CAPTURE
); );
} #else // HAVE_LIBAVFORMAT
Fatal( "You must have ffmpeg libraries installed to use remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
#endif // HAVE_LIBAVFORMAT #endif // HAVE_LIBAVFORMAT
}
else else
{ {
Fatal( "Unexpected remote camera protocol '%s' for monitor %d", protocol.c_str(), id ); Fatal( "Unexpected remote camera protocol '%s' for monitor %d", protocol.c_str(), id );