aboutsummaryrefslogtreecommitdiff
path: root/multimedia/zoneminder/files/patch-src_zm_event.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/zoneminder/files/patch-src_zm_event.cpp')
-rw-r--r--multimedia/zoneminder/files/patch-src_zm_event.cpp44
1 files changed, 0 insertions, 44 deletions
diff --git a/multimedia/zoneminder/files/patch-src_zm_event.cpp b/multimedia/zoneminder/files/patch-src_zm_event.cpp
deleted file mode 100644
index 6042119e94c0..000000000000
--- a/multimedia/zoneminder/files/patch-src_zm_event.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/zm_event.cpp.orig 2010-11-11 15:22:37.000000000 +0300
-+++ src/zm_event.cpp 2011-05-05 18:24:59.141170446 +0400
-@@ -27,6 +27,7 @@
- #include <getopt.h>
- #include <arpa/inet.h>
- #include <glob.h>
-+#include <time.h>
-
- #include "zm.h"
- #include "zm_db.h"
-@@ -68,8 +69,10 @@ Event::Event( Monitor *p_monitor, struct
- }
-
- static char sql[ZM_SQL_MED_BUFSIZ];
-+ static char start_time_str[32];
-
- struct tm *stime = localtime( &start_time.tv_sec );
-+ strftime( start_time_str, sizeof(start_time_str), "%Y-%m-%d %H:%M:%S", localtime((time_t *) &start_time.tv_sec ) );
- snprintf( sql, sizeof(sql), "insert into Events ( MonitorId, Name, StartTime, Width, Height, Cause, Notes ) values ( %d, 'New Event', from_unixtime( %ld ), %d, %d, '%s', '%s' )", monitor->Id(), start_time.tv_sec, monitor->Width(), monitor->Height(), cause.c_str(), notes.c_str() );
- if ( mysql_query( &dbconn, sql ) )
- {
-@@ -161,10 +164,13 @@ Event::Event( Monitor *p_monitor, struct
-
- Event::~Event()
- {
-+ static char end_time_str[32];
-+
- if ( frames > last_db_frame )
- {
- struct DeltaTimeval delta_time;
- DELTA_TIMEVAL( delta_time, end_time, start_time, DT_PREC_2 );
-+ strftime( end_time_str, sizeof(end_time_str), "%Y-%m-%d %H:%M:%S", localtime( (time_t *) &end_time.tv_sec ) );
-
- Debug( 1, "Adding closing frame %d to DB", frames );
- static char sql[ZM_SQL_SML_BUFSIZ];
-@@ -639,7 +645,7 @@ void Event::AddFrame( Image *image, stru
- }
- }
-
--bool EventStream::loadInitialEventData( int monitor_id, time_t event_time )
-+bool EventStream::loadInitialEventData( int monitor_id, long event_time )
- {
- static char sql[ZM_SQL_SML_BUFSIZ];
-