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

Actually store video_data in the correct memory location

This commit is contained in:
Chris Wiggins 2013-09-29 12:55:42 +13:00
parent 76c8190e8b
commit 9dc19fa32b
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_monitor.cpp
View File

@ -423,7 +423,7 @@ Monitor::Monitor(
shared_data = (SharedData *)mem_ptr; shared_data = (SharedData *)mem_ptr;
trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData)); trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
video_store_data = (VideoStoreData *)((char *)shared_data + sizeof(SharedData)); video_store_data = (VideoStoreData *)((char *)trigger_data + sizeof(TriggerData));
struct timeval *shared_timestamps = (struct timeval *)((char *)video_store_data + sizeof(VideoStoreData)); struct timeval *shared_timestamps = (struct timeval *)((char *)video_store_data + sizeof(VideoStoreData));
unsigned char *shared_images = (unsigned char *)((char *)shared_timestamps + (image_buffer_count*sizeof(struct timeval))); unsigned char *shared_images = (unsigned char *)((char *)shared_timestamps + (image_buffer_count*sizeof(struct timeval)));
@ -488,12 +488,6 @@ Monitor::Monitor(
} }
} }
//TODO: Remove this if it isn't needed?
/*if(!(strcmp(video_store_data->event_directory, "nothing")==0)){
Fatal("Video store data not initialised by capture daemon yet. Exiting.");
exit(-1);
}*/
image_buffer = new Snapshot[image_buffer_count]; image_buffer = new Snapshot[image_buffer_count];
for ( int i = 0; i < image_buffer_count; i++ ) for ( int i = 0; i < image_buffer_count; i++ )
{ {