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

change method from getPath to Path

This commit is contained in:
Isaac Connor 2015-12-15 12:10:01 -05:00
parent 6daa8e2290
commit 0f4757b1ad
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/zm_monitor.cpp
View File

@ -463,13 +463,13 @@ Monitor::Monitor(
Debug( 1, "Monitor %s IBC = %d, WUC = %d, pEC = %d, PEC = %d, EAF = %d, FRI = %d, RBP = %d, ARBP = %d, FM = %d", name, image_buffer_count, warmup_count, pre_event_count, post_event_count, alarm_frame_count, fps_report_interval, ref_blend_perc, alarm_ref_blend_perc, track_motion ); Debug( 1, "Monitor %s IBC = %d, WUC = %d, pEC = %d, PEC = %d, EAF = %d, FRI = %d, RBP = %d, ARBP = %d, FM = %d", name, image_buffer_count, warmup_count, pre_event_count, post_event_count, alarm_frame_count, fps_report_interval, ref_blend_perc, alarm_ref_blend_perc, track_motion );
storage = new Storage( storage_id ); storage = new Storage( storage_id );
Debug(1, "Storage path: %s", storage->getPath() ); Debug(1, "Storage path: %s", storage->Path() );
if ( purpose == ANALYSIS ) if ( purpose == ANALYSIS )
{ {
static char path[PATH_MAX]; static char path[PATH_MAX];
strncpy( path, storage->getPath(), sizeof(path) ); strncpy( path, storage->Path(), sizeof(path) );
struct stat statbuf; struct stat statbuf;
errno = 0; errno = 0;
@ -482,7 +482,7 @@ Monitor::Monitor(
} }
} }
snprintf( path, sizeof(path), "%s/%d", storage->getPath(), id ); snprintf( path, sizeof(path), "%s/%d", storage->Path(), id );
errno = 0; errno = 0;
stat( path, &statbuf ); stat( path, &statbuf );
@ -494,8 +494,8 @@ Monitor::Monitor(
} }
char temp_path[PATH_MAX]; char temp_path[PATH_MAX];
snprintf( temp_path, sizeof(temp_path), "%d", id ); snprintf( temp_path, sizeof(temp_path), "%d", id );
if ( chdir( storage->getPath() ) < 0 ) if ( chdir( storage->Path() ) < 0 )
Fatal( "Can't change directory to '%s': %s", storage->getPath(), strerror(errno) ); Fatal( "Can't change directory to '%s': %s", storage->Path(), strerror(errno) );
if ( symlink( temp_path, name ) < 0 ) if ( symlink( temp_path, name ) < 0 )
Fatal( "Can't symlink '%s' to '%s': %s", temp_path, name, strerror(errno) ); Fatal( "Can't symlink '%s' to '%s': %s", temp_path, name, strerror(errno) );
if ( chdir( ".." ) < 0 ) if ( chdir( ".." ) < 0 )
@ -3424,7 +3424,7 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
static char diag_path[PATH_MAX] = ""; static char diag_path[PATH_MAX] = "";
if ( !diag_path[0] ) if ( !diag_path[0] )
{ {
snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-r.jpg", storage->getPath(), id ); snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-r.jpg", storage->Path(), id );
} }
ref_image.WriteJpeg( diag_path ); ref_image.WriteJpeg( diag_path );
} }
@ -3436,7 +3436,7 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
static char diag_path[PATH_MAX] = ""; static char diag_path[PATH_MAX] = "";
if ( !diag_path[0] ) if ( !diag_path[0] )
{ {
snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-d.jpg", storage->getPath(), id ); snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-d.jpg", storage->Path(), id );
} }
delta_image.WriteJpeg( diag_path ); delta_image.WriteJpeg( diag_path );
} }