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

Merge pull request #1445 from abishai/master 

unbreak build under FreeBSD 32 bit II
This commit is contained in:
Isaac Connor 2016-04-26 15:09:22 -04:00
parent fe9cb4b7ec 9aff84fbbb
commit ff3e9c85d9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_event.cpp
View File

@ -715,7 +715,7 @@ bool EventStream::loadInitialEventData( int monitor_id, time_t event_time )
return( true );
}
bool EventStream::loadInitialEventData( int init_event_id, int init_frame_id )
bool EventStream::loadInitialEventData( int init_event_id, unsigned int init_frame_id )
{
loadEventData( init_event_id );

4
src/zm_event.h
View File

@ -230,7 +230,7 @@ protected:
protected:
bool loadEventData( int event_id );
bool loadInitialEventData( int init_event_id, int init_frame_id );
bool loadInitialEventData( int init_event_id, unsigned int init_frame_id );
bool loadInitialEventData( int monitor_id, time_t event_time );
void checkEventLoaded();
@ -249,7 +249,7 @@ public:
event_data = 0;
}
void setStreamStart( int init_event_id, int init_frame_id=0 )
void setStreamStart( int init_event_id, unsigned int init_frame_id=0 )
{
loadInitialEventData( init_event_id, init_frame_id );
loadMonitor( event_data->monitor_id );

2
src/zms.cpp
View File

@ -62,7 +62,7 @@ int main( int argc, const char *argv[] )
int monitor_id = 0;
time_t event_time = 0;
int event_id = 0;
int frame_id = 1;
unsigned int frame_id = 1;
unsigned int scale = 100;
unsigned int rate = 100;
double maxfps = 10.0;