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

fix merge from master, make it compile

This commit is contained in:
Isaac Connor 2020-07-21 18:48:45 -04:00
parent 869860bb26
commit d23dc42981
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_event.cpp
View File

@ -670,7 +670,7 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
// The idea is to write out 1/sec // The idea is to write out 1/sec
frame_data.push(new Frame(id, frames, frame_type, timestamp, delta_time, score)); frame_data.push(new Frame(id, frames, frame_type, timestamp, delta_time, score));
if ( write_to_db || (frame_data.size() > (int)monitor->get_fps()) ) { if ( write_to_db || (frame_data.size() > (int)monitor->get_capture_fps()) ) {
Debug(1, "Adding %d frames to DB", frame_data.size()); Debug(1, "Adding %d frames to DB", frame_data.size());
WriteDbFrames(); WriteDbFrames();
last_db_frame = frames; last_db_frame = frames;

4
src/zm_monitor.h
View File

@ -556,8 +556,8 @@ public:
#if HAVE_LIBAVCODEC #if HAVE_LIBAVCODEC
//void StreamMpeg( const char *format, int scale=100, int maxfps=10, int bitrate=100000 ); //void StreamMpeg( const char *format, int scale=100, int maxfps=10, int bitrate=100000 );
#endif // HAVE_LIBAVCODEC #endif // HAVE_LIBAVCODEC
double get_fps( ) const { double get_capture_fps( ) const {
return fps; return capture_fps;
} }
}; };

2
src/zmc.cpp
View File

@ -235,6 +235,8 @@ int main(int argc, char *argv[]) {
int result = 0; int result = 0;
int prime_capture_log_count = 0;
while ( !zm_terminate ) { while ( !zm_terminate ) {
result = 0; result = 0;
static char sql[ZM_SQL_SML_BUFSIZ]; static char sql[ZM_SQL_SML_BUFSIZ];