mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-03-05 14:56:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused default defines

Browse Source
This commit is contained in:
MrDave
2019-10-20 20:34:58 -06:00
committed by Mr-Dave
parent f67cd78909
commit a9df7743a5
3 changed files with 7 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/event.cpp
View File

@@ -390,14 +390,7 @@ static void event_image_snapshot(struct ctx_cam *cam, motion_event evnt
offset = len - 8;
if (mystrne(cam->conf->snapshot_filename+offset, "lastsnap")) {
/*
* conf.snapshot_filename would normally be defined but if someone deleted it by control interface
* it is better to revert to the default than fail
*/
if (cam->conf->snapshot_filename)
snappath = cam->conf->snapshot_filename;
else
snappath = DEF_SNAPPATH;
snappath = cam->conf->snapshot_filename;
mystrftime(cam, filepath, sizeof(filepath), snappath, ts1, NULL, 0);
snprintf(filename, PATH_MAX, "%.*s.%s"
@@ -561,16 +554,7 @@ static void event_create_extpipe(struct ctx_cam *cam, motion_event evnt
(void)ftype;
if ((cam->conf->movie_extpipe_use) && (cam->conf->movie_extpipe)) {
/*
* conf.mpegpath would normally be defined but if someone deleted it by control interface
* it is better to revert to the default than fail
*/
if (cam->conf->movie_filename) {
moviepath = cam->conf->movie_filename;
} else {
moviepath = DEF_MOVIEPATH;
MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("moviepath: %s"), moviepath);
}
moviepath = cam->conf->movie_filename;
mystrftime(cam, stamp, sizeof(stamp), moviepath, ts1, NULL, 0);
snprintf(cam->extpipefilename, PATH_MAX - 4, "%.*s/%.*s"