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

Make checkEventLoaded return true if a new event was loaded, false otherwise. The idea is to give more information back to whoever calls it

This commit is contained in:
Isaac Connor 2020-04-26 15:22:29 -04:00
parent e79a9d5abf
commit 3b11258fbc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_eventstream.cpp
View File

@ -543,7 +543,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
updateFrameRate((double)event_data->frame_count/event_data->duration);
} // void EventStream::processCommand(const CmdMsg *msg)
void EventStream::checkEventLoaded() {
bool EventStream::checkEventLoaded() {
static char sql[ZM_SQL_SML_BUFSIZ];
if ( curr_frame_id <= 0 ) {
@ -558,7 +558,7 @@ void EventStream::checkEventLoaded() {
// No event change required
Debug(3, "No event change required, as curr frame %d <=> event frames %d",
curr_frame_id, event_data->frame_count);
return;
return false;
}
// Event change required.
@ -586,12 +586,12 @@ void EventStream::checkEventLoaded() {
loadEventData(event_id);
Debug(2, "Current frame id = %d", curr_frame_id);
if ( replay_rate < 0 ) // rewind
curr_frame_id = event_data->frame_count;
else
curr_frame_id = 1;
Debug(2, "New frame id = %d", curr_frame_id);
return true;
} else {
Debug(2, "No next event loaded using %s. Pausing", sql);
if ( curr_frame_id <= 0 )
@ -611,6 +611,7 @@ void EventStream::checkEventLoaded() {
curr_frame_id = event_data->frame_count;
paused = true;
}
return false;
} // void EventStream::checkEventLoaded()
Image * EventStream::getImage( ) {

2
src/zm_eventstream.h
View File

@ -90,7 +90,7 @@ class EventStream : public StreamBase {
bool loadInitialEventData( uint64_t init_event_id, unsigned int init_frame_id );
bool loadInitialEventData( int monitor_id, time_t event_time );
void checkEventLoaded();
bool checkEventLoaded();
void processCommand( const CmdMsg *msg );
bool sendFrame( int delta_us );