From 703028fb5eece01ad31108f0805ad2be373fda86 Mon Sep 17 00:00:00 2001 From: MrDave Date: Sat, 5 Sep 2020 11:36:24 -0600 Subject: [PATCH] Split alg and names --- CONTRIBUTING.md | 10 +- README.md | 8 +- man/motionplus.1 | 76 +++++------ src/alg.cpp | 227 +++++++++++++++++++++++++-------- src/alg.hpp | 6 +- src/alg_sec.cpp | 6 +- src/alg_sec.hpp | 6 +- src/conf.cpp | 10 +- src/conf.hpp | 6 +- src/dbse.cpp | 6 +- src/dbse.hpp | 6 +- src/draw.cpp | 6 +- src/draw.hpp | 6 +- src/event.cpp | 6 +- src/event.hpp | 6 +- src/exif.cpp | 6 +- src/exif.hpp | 6 +- src/jpegutils.cpp | 6 +- src/jpegutils.hpp | 6 +- src/logger.cpp | 8 +- src/logger.hpp | 6 +- src/mmalcam.cpp | 6 +- src/mmalcam.hpp | 6 +- src/motion_loop.cpp | 17 ++- src/motion_loop.hpp | 6 +- src/motionplus.cpp | 6 +- src/motionplus.hpp | 6 +- src/movie.cpp | 6 +- src/movie.hpp | 6 +- src/netcam.cpp | 6 +- src/netcam.hpp | 6 +- src/picture.cpp | 6 +- src/picture.hpp | 6 +- src/raspicam/RaspiCamControl.c | 6 +- src/rotate.cpp | 6 +- src/rotate.hpp | 6 +- src/track.cpp | 6 +- src/track.hpp | 6 +- src/util.cpp | 6 +- src/util.hpp | 6 +- src/video_common.cpp | 6 +- src/video_common.hpp | 6 +- src/video_loopback.cpp | 6 +- src/video_loopback.hpp | 6 +- src/video_v4l2.cpp | 6 +- src/video_v4l2.hpp | 6 +- src/webu.cpp | 6 +- src/webu.hpp | 6 +- src/webu_html.cpp | 12 +- src/webu_html.hpp | 6 +- src/webu_stream.cpp | 6 +- src/webu_stream.hpp | 6 +- src/webu_text.cpp | 10 +- src/webu_text.hpp | 6 +- 54 files changed, 389 insertions(+), 259 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a6fc0281..4ea929e4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,13 @@ # How to contribute Issues on the github site are intended to discuss code problems, crashes and application enhancements. If you are having an issue with the setup, -configuration or use of Motionplus, we have the following additional resources which are better suited to meet these needs. +configuration or use of MotionPlus, we have the following additional resources which are better suited to meet these needs. ## Submitting Problems Provide the following in order to replicate and ultimately resolve the issue: - * A complete Motionplus log for a single run from startup to shutdown at the INF/7 log level. + * A complete MotionPlus log for a single run from startup to shutdown at the INF/7 log level. * The expected versus actual result The preferred method of providing the log file is by posting it on [gist](https://gist.github.com/). Only provide @@ -15,12 +15,12 @@ the link to the gist file within the issue. The full configuration will be print with the most common, sensitive information (URLs, usernames/passwords, etc) masked. It is recommended that you double check before posting the log file. -Note that the developers do not use any front-end application to use Motionplus and we need the actual logs from the Motionplus application rather than logs from the front-end application. +Note that the developers do not use any front-end application to use MotionPlus and we need the actual logs from the MotionPlus application rather than logs from the front-end application. ## Submitting an Enhancement Request -Motionplus has a extremely large number of configuration options. With so many options, it is important to include a description +MotionPlus has a extremely large number of configuration options. With so many options, it is important to include a description of how/why the enhancement will be used. It is possible that the existing options can be configured to address the need. (Which could then lead to a different enhancement than originally contemplated of making those options easier to use or documented better.) @@ -33,7 +33,7 @@ item to be discussed and determine how it would fit into the application. As pull requests are prepared, in addition to the actual code, please also consider: - * Changes needed to the Motionplus_Guide.html which is our user guide. + * Changes needed to the motionplus_guide.html which is our user guide. * Changes to the motionplus.1 file which is the manual * Changes to the configuration templates of motionplus.conf, camera1.conf, etc. diff --git a/README.md b/README.md index 5a1c4cbe..273094a7 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -Motionplus +MotionPlus ============= ## Description -Motionplus is a program that monitors the video signal from one or more cameras and +MotionPlus is a program that monitors the video signal from one or more cameras and is able to detect if a significant part of the picture has changed. Or in other words, it can detect motion. ## Documentation -The documentation for Motionplus is contained within the file motionplus_guide.html. +The documentation for MotionPlus is contained within the file motionplus_guide.html. The offline version of this file is available in the **doc/motionplus** directory. @@ -18,7 +18,7 @@ INSTALL file contains abbreviated building instructions. ## License -Motionplus is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) version 3 or later. +MotionPlus is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) version 3 or later. ## Contributing diff --git a/man/motionplus.1 b/man/motionplus.1 index 9a4a36bd..6f9d0738 100644 --- a/man/motionplus.1 +++ b/man/motionplus.1 @@ -1,19 +1,19 @@ -.TH MOTION 1 2020-06-08 "Motionplus" "Motionplus Options and Config Files" +.TH MOTION 1 2020-06-08 "MotionPlus" "MotionPlus Options and Config Files" .SH NAME -motionplus \- Detect motion using a video4linux device or network camera +MotionPlus \- Detect motion using a video4linux device or network camera .SH SYNOPSIS .B motionplus [ \-hbnsm ] [ \-c config file path ] [ \-d level ] [ \-k level ] [ \-p pid_file ][ \-l log_file ] .SH DESCRIPTION -.I Motionplus +.I MotionPlus uses a video4linux device or network camera to detect motion. If motion is detected both normal -and motion pictures can be taken. Motionplus can also take actions to notify you +and motion pictures can be taken. MotionPlus can also take actions to notify you if needed. Creation of automated snapshots is also possible. .SH OPTIONS .TP .B \-c Full path and filename of config file. For example: \fI /home/kurt/motionplus.conf \fR -The default is \fI /usr/local/etc/motionplus\fR unless specified differently when building Motionplus. +The default is \fI /usr/local/etc/motionplus\fR unless specified differently when building MotionPlus. Many RPMs and Debian packages will use \fI/etc\fR or \fI/etc/motionplus\fR as the default. .TP .B \-h @@ -38,7 +38,7 @@ Run with message log type 1-9. Full path and file name for the log file. .TP .B \-p -Full path and filename for process id file (pid file). E.g /var/run/motionplus.pid. Default is not defined. Pid file is only created when Motionplus is started in daemon mode. +Full path and filename for process id file (pid file). E.g /var/run/motionplus.pid. Default is not defined. Pid file is only created when MotionPlus is started in daemon mode. .TP .B \-m Start in pause mode. @@ -58,7 +58,7 @@ Default: off Description: .fi .RS -When specified as ON, Motionplus goes into daemon (background process) mode and releases the terminal. +When specified as ON, MotionPlus goes into daemon (background process) mode and releases the terminal. .RE .RE @@ -171,13 +171,13 @@ User specified string to describe the camera. .RS .nf Values: Numeric identification number for the camera -Default: The order in which the camera is opened by Motionplus +Default: The order in which the camera is opened by MotionPlus Description: .fi .RS -Use this option to assign a number to each camera that is consistent every time that Motionplus is started. -By default Motionplus will assign a number based upon the sequence in which it reads the configuration and this -sequence may not be the same every time that Motionplus starts. +Use this option to assign a number to each camera that is consistent every time that MotionPlus is started. +By default MotionPlus will assign a number based upon the sequence in which it reads the configuration and this +sequence may not be the same every time that MotionPlus starts. .RE .RE @@ -259,7 +259,7 @@ Description: .RS String to specify the parameters to pass in for a videodevice. The parameters permitted are dependent upon the device. This only applies to V4L2 devices. The -Motionplus log reports all the available options for the device. +MotionPlus log reports all the available options for the device. .RE .RE @@ -296,8 +296,8 @@ Default: 17 Description: .fi .RS -The v4l2_palette option allows users to choose the preferred palette to be use by motionplus to capture from the video device. -If the preferred palette is not available from the video device, Motionplus will attempt to use palettes that are supported. +The v4l2_palette option allows users to choose the preferred palette to be use by MotionPlus to capture from the video device. +If the preferred palette is not available from the video device, MotionPlus will attempt to use palettes that are supported. .RE .RE @@ -754,7 +754,7 @@ Description: .fi .RS When specified, draw the number of changed pixed on the images. -This option will normally be set to off except when you setup and adjust the Motionplus settings. +This option will normally be set to off except when you setup and adjust the MotionPlus settings. The text is placed in upper right corner of the image. .RE .RE @@ -1271,7 +1271,7 @@ A value of 1 is worst quality versus a value of 100 is best quality. .nf Values: .RS -Motionplus videos: +MotionPlus videos: .RS mpeg4 - Creates .avi file msmpeg4 - Creates .avi file @@ -1428,9 +1428,9 @@ Default: mpg Description: .fi .RS -For mpg timelapse videos, if Motionplus is shutdown and restarted, new pics will be appended +For mpg timelapse videos, if MotionPlus is shutdown and restarted, new pics will be appended to any previously created file with name indicated for timelapse. -For mpeg4 timelapse videos, if Motionplus is shutdown and restarted, new pics will create a +For mpeg4 timelapse videos, if MotionPlus is shutdown and restarted, new pics will create a new file with the name indicated for timelapse. .RE .RE @@ -2106,16 +2106,16 @@ Full path and file name for the script to execute to move a camera in generic tr .SH SIGNALS -Motionplus responds to the following signals: +MotionPlus responds to the following signals: .TP .B SIGHUP The config file will be reread. .TP .B SIGTERM -If needed Motionplus will create an movie file of the last event and exit +If needed MotionPlus will create an movie file of the last event and exit .TP .B SIGUSR1 -Motionplus will create an movie file of the current event. +MotionPlus will create an movie file of the current event. .SH NOTES .TP .B Snapshot @@ -2128,23 +2128,23 @@ A "motion" image/movie shows the pixels that have actually changed during the la A "normal" image is the real image taken by the camera with text overlayed. .TP .B Cameras and config files -If Motionplus was invoked with command line option \-c pathname Motionplus will expect the config file to be as specified. When you specify the config file on the command line with \-c you can call it anything. +If MotionPlus was invoked with command line option \-c pathname MotionPlus will expect the config file to be as specified. When you specify the config file on the command line with \-c you can call it anything. .br -If you do not specify \-c or the filename you give Motionplus does not exist, Motionplus will search for the configuration file called 'motionplus.conf' in the following order: +If you do not specify \-c or the filename you give MotionPlus does not exist, MotionPlus will search for the configuration file called 'motionplus.conf' in the following order: .br -1. Current directory from where Motionplus was invoked +1. Current directory from where MotionPlus was invoked .br 2. Then in a directory called '.motionplus' in the current users home directory (shell environment variable $HOME). E.g. /home/goofy/.motionplus/motionplus.conf .br -3. The motionplus subdirectory inside the directory defined by the \-\-sysconfdir=DIR when running .configure during installation of Motionplus (If this option was not defined the default is /usr/local/etc/) +3. The motionplus subdirectory inside the directory defined by the \-\-sysconfdir=DIR when running .configure during installation of MotionPlus (If this option was not defined the default is /usr/local/etc/) .br If you have write access to /usr/local/etc/motionplus then the editor recommends having only one motionplus.conf file in the default /usr/local/etc/motionplus directory. .br -motionplus has a configuration file in the distribution package called motionplus-dist.conf. When you run 'make install' this files gets copied to the /usr/local/etc/motionplus directory. +MotionPlus has a configuration file in the distribution package called motionplus-dist.conf. When you run 'make install' this files gets copied to the /usr/local/etc/motionplus directory. .br -The configuration file needs to be renamed from motionplus-dist.conf to motionplus.conf. The original file is called motionplus-dist.conf so that your perfectly working motionplus.conf file does not accidentally get overwritten when you re-install or upgrade to a newer version of motionplus. +The configuration file needs to be renamed from motionplus-dist.conf to motionplus.conf. The original file is called motionplus-dist.conf so that your perfectly working motionplus.conf file does not accidentally get overwritten when you re-install or upgrade to a newer version of MotionPlus. .br -If you have more than one camera you should not try and invoke motionplus more times. motionplus is made to work with more than one camera in a very elegant way and the way to do it is to create a number of camera config files. motionplus will then create an extra thread of itself for each camera. If you only have one camera you only need the motionplus.conf file. The minute you have two or more cameras you must have one camera config file per camera besides the motionplus.conf file. +If you have more than one camera you should not try and invoke MotionPlus more times. MotionPlus is made to work with more than one camera in a very elegant way and the way to do it is to create a number of camera config files. MotionPlus will then create an extra thread of itself for each camera. If you only have one camera you only need the motionplus.conf file. The minute you have two or more cameras you must have one camera config file per camera besides the motionplus.conf file. .br So if you have for example two cameras you need motionplus.conf and two camera config files. Total of 3 config files. .br @@ -2156,21 +2156,21 @@ The first camera is defined in the first camera file called from motionplus.conf .br Any option defined in motionplus.conf will be used for all cameras except for the cameras in which the same option is defined in a camera config file. .br -motionplus reads its configuration parameters in the following sequence. If the same parameter exists more than one place the last one read wins. +MotionPlus reads its configuration parameters in the following sequence. If the same parameter exists more than one place the last one read wins. .br -1. motionplus reads the configuration file motionplus.conf from the beginning of the file going down line by line. +1. MotionPlus reads the configuration file motionplus.conf from the beginning of the file going down line by line. .br 2. If the option "camera" is defined in motionplus.conf, the camera configuration file(s) is/(are) read. .br -3. motionplus continues reading the rest of the motionplus.conf file. Any options from here will overrule the same option previously defines in a camera config file. +3. MotionPlus continues reading the rest of the motionplus.conf file. Any options from here will overrule the same option previously defines in a camera config file. .br -4. motionplus reads the command line option again overruling any previously defined options. +4. MotionPlus reads the command line option again overruling any previously defined options. .br So always call the camera config files in the end of the motionplus.conf file. If you define options in motionplus.conf AFTER the camera file calls, the same options in the camera files will never be used. So always put the camera file call at the end of motionplus.conf. .br -If motionplus is built without specific features such as ffmpeg, mysql etc it will ignore the options that belongs to these features. You do not have to remove them or comment them out. +If MotionPlus is built without specific features such as ffmpeg, mysql etc it will ignore the options that belongs to these features. You do not have to remove them or comment them out. .br -If you run the http control command http://host:port/0/config/writeyes, motionplus will overwrite motionplus.conf and all the camera.conf files by autogenerated config files neatly formatted and only with the features included that motionplus was built with. If you later re-build motionplus with more features or upgrade to a new version, you can use your old config files, run the motionplus.conf.write command, and you will have new config files with the new options included all set to their default values. This makes upgrading very easy to do. +If you run the http control command http://host:port/0/config/writeyes, MotionPlus will overwrite motionplus.conf and all the camera.conf files by autogenerated config files neatly formatted and only with the features included that MotionPlus was built with. If you later re-build MotionPlus with more features or upgrade to a new version, you can use your old config files, run the motionplus.conf.write command, and you will have new config files with the new options included all set to their default values. This makes upgrading very easy to do. .TP .B Conversion Specifiers for Advanced Filename and Text Features The table below shows all the supported Conversion Specifiers you can use in the options text_left, text_right, snapshot_filename, jpeg_filename, ffmpeg_filename, timelapse_filename, on_event_start, on_event_end, on_picture_save, on_movie_start, on_movie_end, and on_motion_detected. @@ -2200,7 +2200,7 @@ Text defined by the text_event feature The day of the month as a decimal number (range 01 to 31). .TP .B %D -Number of pixels detected as motionplus. If labelling is enabled the number is the number of pixels in the largest labelled motion area. +Number of pixels detected as MotionPlus. If labelling is enabled the number is the number of pixels in the largest labelled motion area. .TP .B %E Modifier: use alternative format, see below. @@ -2335,13 +2335,13 @@ The frame per seconds. The id number returned from mysql_insert_id. .TP .B %{ver} -The version number of motionplus. +The version number of MotionPlus. .TP .B More information -Motionplus homepage: TBD +MotionPlus homepage: TBD -Motionplus Guide (user and installation guide): +MotionPlus Guide (user and installation guide): .br /usr/share/doc/motionplus/motionplus_guide.html diff --git a/src/alg.cpp b/src/alg.cpp index 206a2a3f..5d99e18f 100644 --- a/src/alg.cpp +++ b/src/alg.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ @@ -730,99 +730,226 @@ void alg_tune_smartmask(struct ctx_cam *cam) { /* Increment for *smartmask_buffer in alg_diff_standard. */ #define SMARTMASK_SENSITIVITY_INCR 5 -static int alg_diff_standard(struct ctx_cam *cam, unsigned char *new_var) { - struct ctx_images *imgs = &cam->imgs; - int i, diffs = 0; +static int alg_diff_nomask(struct ctx_cam *cam, unsigned char *new_var) { + unsigned char *ref = cam->imgs.ref; + unsigned char *out = cam->imgs.image_motion.image_norm; + + int i, curdiff; + int imgsz = cam->imgs.motionsize; + int diffs = 0; + int noise = cam->noise; + + memset(out + imgsz, 128, (imgsz / 2)); + memset(out, 0, imgsz); + + for (i = 0; i < imgsz; i++) { + curdiff = abs(*ref - *new_var); + if (curdiff > noise) { + *out = *new_var; + diffs++; + } + out++; + ref++; + new_var++; + } + + struct timespec ts2; + + clock_gettime(CLOCK_REALTIME, &ts2); + + MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + ,"Diffs %d detected %ld - %ld", diffs,ts2.tv_sec,ts2.tv_nsec/1000); + + return diffs; +} + +static int alg_diff_mask(struct ctx_cam *cam, unsigned char *new_img) { + unsigned char *ref = cam->imgs.ref; + unsigned char *out = cam->imgs.image_motion.image_norm; + unsigned char *mask = cam->imgs.mask; + + int i, curdiff; + int imgsz = cam->imgs.motionsize; + int diffs = 0; + int noise = cam->noise; + + memset(out + imgsz, 128, (imgsz / 2)); + memset(out, 0, imgsz); + + for (i = 0; i < imgsz; i++) { + curdiff = abs(*ref - *new_img); + if (mask){ + curdiff = ((curdiff * *mask) / 255); + mask++; + } + + if (curdiff > noise) { + *out = *new_img; + diffs++; + } + out++; + ref++; + new_img++; + } + + return diffs; +} + +static int alg_diff_smart(struct ctx_cam *cam, unsigned char *new_img) { + + unsigned char *ref = cam->imgs.ref; + unsigned char *out = cam->imgs.image_motion.image_norm; + unsigned char *smartmask_final = cam->imgs.smartmask_final; + + int i, curdiff; + int imgsz = cam->imgs.motionsize; + int diffs = 0; int noise = cam->noise; int smartmask_speed = cam->smartmask_speed; - unsigned char *ref = imgs->ref; - unsigned char *out = imgs->image_motion.image_norm; - unsigned char *mask = imgs->mask; - unsigned char *smartmask_final = imgs->smartmask_final; - int *smartmask_buffer = imgs->smartmask_buffer; - unsigned char curdiff; - int chksize1, chksize2; + int *smartmask_buffer = cam->imgs.smartmask_buffer; - chksize1 = imgs->width; - chksize2 = imgs->motionsize - imgs->width; - - memset(out + imgs->motionsize, 128, (imgs->motionsize / 2)); /* Motion pictures are now b/w i.o. green */ - memset(out, 0, imgs->motionsize); - - for (i = 0; i < imgs->motionsize; i++) - { - curdiff = (int)(abs(*ref - *new_var)); /* Using a temp variable is 12% faster. */ - /* Apply fixed mask */ - if (mask) - curdiff = ((int)(curdiff * *mask++) / 255); + imgsz = cam->imgs.motionsize; + memset(out + imgsz, 128, (imgsz / 2)); + memset(out, 0, imgsz); + for (i = 0; i < imgsz; i++) { + curdiff = abs(*ref - *new_img); if (smartmask_speed) { if (curdiff > noise) { - /* - * Increase smart_mask sensitivity every frame when motion - * is detected. (with speed=5, mask is increased by 1 every - * second. To be able to increase by 5 every second (with - * speed=10) we add 5 here. NOT related to the 5 at ratio- - * calculation. - */ - if (cam->event_nr != cam->prev_event) + if (cam->event_nr != cam->prev_event) { (*smartmask_buffer) += SMARTMASK_SENSITIVITY_INCR; - /* Apply smart_mask */ - if (!*smartmask_final) - curdiff = 0; + } + if (!*smartmask_final) curdiff = 0; } smartmask_final++; smartmask_buffer++; } /* Pixel still in motion after all the masks? */ if (curdiff > noise) { - *out = *new_var; + *out = *new_img; diffs++; } out++; ref++; - new_var++; + new_img++; } return diffs; } +static int alg_diff_masksmart(struct ctx_cam *cam, unsigned char *new_img) { + unsigned char *ref = cam->imgs.ref; + unsigned char *out = cam->imgs.image_motion.image_norm; + unsigned char *mask = cam->imgs.mask; + unsigned char *smartmask_final = cam->imgs.smartmask_final; + + int i, curdiff; + int imgsz = cam->imgs.motionsize; + int diffs = 0; + int noise = cam->noise; + int smartmask_speed = cam->smartmask_speed; + int *smartmask_buffer = cam->imgs.smartmask_buffer; + + imgsz= cam->imgs.motionsize; + memset(out + imgsz, 128, (imgsz / 2)); + memset(out, 0, imgsz); + + for (i = 0; i < imgsz; i++) { + curdiff = abs(*ref - *new_img); + if (mask){ + curdiff = ((curdiff * *mask) / 255); + mask++; + } + + if (smartmask_speed) { + if (curdiff > noise) { + if (cam->event_nr != cam->prev_event) { + (*smartmask_buffer) += SMARTMASK_SENSITIVITY_INCR; + } + if (!*smartmask_final) curdiff = 0; + } + smartmask_final++; + smartmask_buffer++; + } + /* Pixel still in motion after all the masks? */ + if (curdiff > noise) { + *out = *new_img; + diffs++; + } + + out++; + ref++; + new_img++; + } + + return diffs; +} + + static char alg_diff_fast(struct ctx_cam *cam, int max_n_changes, unsigned char *new_var) { struct ctx_images *imgs = &cam->imgs; - int i, diffs = 0, step = imgs->motionsize / 10000; + int i; + int diffs = 0; + int step = cam->imgs.motionsize / 10000; int noise = cam->noise; unsigned char *ref = imgs->ref; - unsigned char curdiff; + int curdiff; + + if (!step % 2) step++; - if (!step % 2) - step++; - /* We're checking only 1 of several pixels. */ max_n_changes /= step; + i = imgs->motionsize; for (; i > 0; i -= step) { - curdiff = (int)(abs((char)(*ref - *new_var))); /* Using a temp variable is 12% faster. */ + curdiff = abs(*ref - *new_var); /* Using a temp variable is 12% faster. */ if (curdiff > noise) { diffs++; - if (diffs > max_n_changes) + if (diffs > max_n_changes){ + + //MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + //,"Lots of fast diffs %d detected.", diffs); + return 1; + } } ref += step; new_var += step; } + //MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + // ,"Fast Diffs %d detected.", diffs); + return 0; } +static void alg_diff_standard(struct ctx_cam *cam) { + + if (cam->smartmask_speed == 0){ + if (cam->imgs.mask == NULL) { + cam->current_image->diffs = alg_diff_nomask(cam, cam->imgs.image_vprvcy); + } else { + cam->current_image->diffs = alg_diff_mask(cam, cam->imgs.image_vprvcy); + } + } else { + if (cam->imgs.mask == NULL) { + cam->current_image->diffs = alg_diff_smart(cam, cam->imgs.image_vprvcy); + } else { + cam->current_image->diffs = alg_diff_masksmart(cam, cam->imgs.image_vprvcy); + } + } + +} + void alg_diff(struct ctx_cam *cam) { if (cam->detecting_motion || cam->motapp->setup_mode) { - cam->current_image->diffs = alg_diff_standard(cam, cam->imgs.image_vprvcy); + alg_diff_standard(cam); } else { if (alg_diff_fast(cam, cam->conf->threshold / 2, cam->imgs.image_vprvcy)) { - cam->current_image->diffs = alg_diff_standard(cam, cam->imgs.image_vprvcy); + alg_diff_standard(cam); } else { cam->current_image->diffs = 0; } @@ -897,8 +1024,7 @@ void alg_switchfilter(struct ctx_cam *cam) { * action - UPDATE_REF_FRAME or RESET_REF_FRAME * */ -void alg_update_reference_frame(struct ctx_cam *cam, int action) -{ +void alg_update_reference_frame(struct ctx_cam *cam, int action) { int accept_timer = cam->lastrate * ACCEPT_STATIC_OBJECT_TIME; int i, threshold_ref; int *ref_dyn = cam->imgs.ref_dyn; @@ -910,8 +1036,7 @@ void alg_update_reference_frame(struct ctx_cam *cam, int action) if (cam->lastrate > 5) /* Match rate limit */ accept_timer /= (cam->lastrate / 3); - if (action == UPDATE_REF_FRAME) - { /* Black&white only for better performance. */ + if (action == UPDATE_REF_FRAME) { /* Black&white only for better performance. */ threshold_ref = cam->noise * EXCLUDE_LEVEL_PERCENT / 100; for (i = cam->imgs.motionsize; i > 0; i--) { diff --git a/src/alg.hpp b/src/alg.hpp index 64345a43..5e12ee36 100644 --- a/src/alg.hpp +++ b/src/alg.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/alg_sec.cpp b/src/alg_sec.cpp index 16f1859a..f6e6eb5d 100644 --- a/src/alg_sec.cpp +++ b/src/alg_sec.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/alg_sec.hpp b/src/alg_sec.hpp index 5b0c5147..c530882e 100644 --- a/src/alg_sec.hpp +++ b/src/alg_sec.hpp @@ -1,19 +1,19 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/conf.cpp b/src/conf.cpp index 44ff0410..a46a0b49 100644 --- a/src/conf.cpp +++ b/src/conf.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ @@ -3348,7 +3348,7 @@ void conf_edit_set(struct ctx_motapp *motapp, int threadnbr /** Prints usage and options allowed from Command-line. */ static void usage(void) { - printf("motionplus version %s, Copyright 2020\n",PACKAGE_VERSION); + printf("MotionPlus version %s, Copyright 2020\n",PACKAGE_VERSION); printf("\nusage:\tmotionplus [options]\n"); printf("\n\n"); printf("Possible options:\n\n"); @@ -3651,7 +3651,7 @@ void conf_parms_write(struct ctx_cam **cam_list) { strftime(timestamp, 32, "%Y-%m-%dT%H:%M:%S", localtime(&now)); fprintf(conffile, "# %s\n", cam_list[thread]->conf_filename); - fprintf(conffile, "#\n# This config file was generated by motionplus " VERSION "\n"); + fprintf(conffile, "#\n# This config file was generated by MotionPlus " VERSION "\n"); fprintf(conffile, "# at %s\n", timestamp); fprintf(conffile, "\n\n"); diff --git a/src/conf.hpp b/src/conf.hpp index c742e2e3..e8cff3e8 100644 --- a/src/conf.hpp +++ b/src/conf.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/dbse.cpp b/src/dbse.cpp index cccaebc8..eb09bf73 100644 --- a/src/dbse.cpp +++ b/src/dbse.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/dbse.hpp b/src/dbse.hpp index c835e281..b3fc9069 100644 --- a/src/dbse.hpp +++ b/src/dbse.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/draw.cpp b/src/draw.cpp index d2e8e5af..0261a7d4 100644 --- a/src/draw.cpp +++ b/src/draw.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/draw.hpp b/src/draw.hpp index 0a60b85f..c690af93 100644 --- a/src/draw.hpp +++ b/src/draw.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/event.cpp b/src/event.cpp index ff13043f..e5b17d9c 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/event.hpp b/src/event.hpp index 7f04e88f..e224b850 100644 --- a/src/event.hpp +++ b/src/event.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/exif.cpp b/src/exif.cpp index 5b136090..fca73159 100644 --- a/src/exif.cpp +++ b/src/exif.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/exif.hpp b/src/exif.hpp index af7fdef1..75c89876 100644 --- a/src/exif.hpp +++ b/src/exif.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/jpegutils.cpp b/src/jpegutils.cpp index a098a34d..30735555 100644 --- a/src/jpegutils.cpp +++ b/src/jpegutils.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/jpegutils.hpp b/src/jpegutils.hpp index 05c042a5..7bf7237c 100644 --- a/src/jpegutils.hpp +++ b/src/jpegutils.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/logger.cpp b/src/logger.cpp index a25ae6d1..7ecf1f4a 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ @@ -269,7 +269,7 @@ void log_init(struct ctx_motapp *motapp){ } else { MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Logging to syslog")); } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "Motion %s started",VERSION); + MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "MotionPlus %s started",VERSION); motapp->log_type = log_get_type(motapp->log_type_str.c_str()); diff --git a/src/logger.hpp b/src/logger.hpp index 70d3bf6a..73cd02bd 100644 --- a/src/logger.hpp +++ b/src/logger.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/mmalcam.cpp b/src/mmalcam.cpp index 05b34eda..785f8622 100644 --- a/src/mmalcam.cpp +++ b/src/mmalcam.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * Copyright 2013 by Nicholas Tuckett diff --git a/src/mmalcam.hpp b/src/mmalcam.hpp index dace093a..da48376d 100644 --- a/src/mmalcam.hpp +++ b/src/mmalcam.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * Copyright 2013 by Nicholas Tuckett diff --git a/src/motion_loop.cpp b/src/motion_loop.cpp index e9b07d4b..d0f47588 100644 --- a/src/motion_loop.cpp +++ b/src/motion_loop.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * @@ -1265,7 +1265,7 @@ static void mlp_loopback(struct ctx_cam *cam){ } else { event(cam, EVENT_IMAGE, cam->current_image, NULL, &cam->pipe, &cam->current_image->imgts); - if (!cam->conf->stream_motion || cam->shots == 1){ + if (!cam->conf->stream_motion || cam->shots == 0){ event(cam, EVENT_STREAM, cam->current_image, NULL, NULL, &cam->current_image->imgts); } } @@ -1413,8 +1413,12 @@ void *motion_loop(void *arg) { mlp_resetimages(cam); if (mlp_retry(cam) == 1) break; if (mlp_capture(cam) == 1) break; - mlp_detection(cam); - mlp_tuning(cam); + if (cam->shots == 0){ + mlp_detection(cam); + mlp_tuning(cam); + } else { + cam->current_image->diffs = cam->previous_diffs; + } mlp_overlay(cam); mlp_actions(cam); mlp_setupmode(cam); @@ -1423,6 +1427,7 @@ void *motion_loop(void *arg) { mlp_timelapse(cam); mlp_loopback(cam); mlp_parmsupdate(cam); +// mythreadname_set("ml15",cam->threadnr,cam->conf->camera_name.c_str()); mlp_frametiming(cam); } } diff --git a/src/motion_loop.hpp b/src/motion_loop.hpp index 08122d78..fb0dd176 100644 --- a/src/motion_loop.hpp +++ b/src/motion_loop.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/motionplus.cpp b/src/motionplus.cpp index 2148c137..a0de4cba 100644 --- a/src/motionplus.cpp +++ b/src/motionplus.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/motionplus.hpp b/src/motionplus.hpp index 56af6977..37c125ba 100644 --- a/src/motionplus.hpp +++ b/src/motionplus.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/movie.cpp b/src/movie.cpp index be441301..43083ab3 100644 --- a/src/movie.cpp +++ b/src/movie.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/movie.hpp b/src/movie.hpp index eb08ddbd..978e6e8b 100644 --- a/src/movie.hpp +++ b/src/movie.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/netcam.cpp b/src/netcam.cpp index e1000736..33c69809 100644 --- a/src/netcam.cpp +++ b/src/netcam.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/netcam.hpp b/src/netcam.hpp index 713eb838..2cac9721 100644 --- a/src/netcam.hpp +++ b/src/netcam.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/picture.cpp b/src/picture.cpp index 3ab99745..20bb58e9 100644 --- a/src/picture.cpp +++ b/src/picture.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/picture.hpp b/src/picture.hpp index 05f04174..375a905d 100644 --- a/src/picture.hpp +++ b/src/picture.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/raspicam/RaspiCamControl.c b/src/raspicam/RaspiCamControl.c index acfe678a..0a6c2630 100644 --- a/src/raspicam/RaspiCamControl.c +++ b/src/raspicam/RaspiCamControl.c @@ -27,9 +27,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* -This file was modified to be used with motionplus. The controls are parsed -via "mmalcam_control_params" function in motionplus to the raspicam driver. To fulfill -such functionality without expanding the motionplus code, the following changes were +This file was modified to be used with MotionPlus. The controls are parsed +via "mmalcam_control_params" function in MotionPlus to the raspicam driver. To fulfill +such functionality without expanding the MotionPlus code, the following changes were made: - remove call to helper module "RaspiHelpers.h"; - include only "mmal_status_to_int" function from "RaspiHelpers.h". This function diff --git a/src/rotate.cpp b/src/rotate.cpp index 7b117862..f72ae176 100644 --- a/src/rotate.cpp +++ b/src/rotate.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/rotate.hpp b/src/rotate.hpp index f2a5f332..a5ffebc9 100644 --- a/src/rotate.hpp +++ b/src/rotate.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/track.cpp b/src/track.cpp index 4dcaa965..0920c42d 100644 --- a/src/track.cpp +++ b/src/track.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/track.hpp b/src/track.hpp index 29922178..95fcc426 100644 --- a/src/track.hpp +++ b/src/track.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/util.cpp b/src/util.cpp index e27bf1bf..61a76143 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/util.hpp b/src/util.hpp index f4665d12..af1709da 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com * diff --git a/src/video_common.cpp b/src/video_common.cpp index c161851b..286049bb 100644 --- a/src/video_common.cpp +++ b/src/video_common.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/video_common.hpp b/src/video_common.hpp index a371fdd2..492303aa 100644 --- a/src/video_common.hpp +++ b/src/video_common.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/video_loopback.cpp b/src/video_loopback.cpp index 9be60573..4a379927 100644 --- a/src/video_loopback.cpp +++ b/src/video_loopback.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/video_loopback.hpp b/src/video_loopback.hpp index ed95626c..6ffffb69 100644 --- a/src/video_loopback.hpp +++ b/src/video_loopback.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/video_v4l2.cpp b/src/video_v4l2.cpp index f749af49..0c0ca6e4 100644 --- a/src/video_v4l2.cpp +++ b/src/video_v4l2.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/video_v4l2.hpp b/src/video_v4l2.hpp index 4d65edba..3a0a6553 100644 --- a/src/video_v4l2.hpp +++ b/src/video_v4l2.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/webu.cpp b/src/webu.cpp index 8706088e..9e3d6a3a 100644 --- a/src/webu.cpp +++ b/src/webu.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/webu.hpp b/src/webu.hpp index ce18ed86..ad811629 100644 --- a/src/webu.hpp +++ b/src/webu.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/webu_html.cpp b/src/webu_html.cpp index 6023621f..1159d41d 100644 --- a/src/webu_html.cpp +++ b/src/webu_html.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ @@ -41,7 +41,7 @@ * Additional functionality considerations: * Notification to user of items that require restart when changed. * Notification to user that item successfully implemented (config change/tracking) - * List motionplus parms somewhere so they can be found by xgettext + * List MotionPlus parms somewhere so they can be found by xgettext * */ @@ -265,7 +265,7 @@ static void webu_html_navbar_camera(struct webui_ctx *webui) { int indx; if (webui->cam_threads == 1){ - /* Only Motionplus.conf file */ + /* Only MotionPlus.conf file */ if (webui->camlst[0]->conf->camera_name == ""){ snprintf(response, sizeof (response), "
\n" @@ -288,7 +288,7 @@ static void webu_html_navbar_camera(struct webui_ctx *webui) { webu_write(webui, response); } } else if (webui->cam_threads > 1){ - /* Motionplus.conf + separate camera.conf file */ + /* MotionPlus.conf + separate camera.conf file */ snprintf(response, sizeof (response), "
\n" " \n" diff --git a/src/webu_html.hpp b/src/webu_html.hpp index 6a75ff15..ddd05f18 100644 --- a/src/webu_html.hpp +++ b/src/webu_html.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/webu_stream.cpp b/src/webu_stream.cpp index 2b691b6f..9a5f2470 100644 --- a/src/webu_stream.cpp +++ b/src/webu_stream.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/webu_stream.hpp b/src/webu_stream.hpp index c8ee7586..6b4ad801 100644 --- a/src/webu_stream.hpp +++ b/src/webu_stream.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ diff --git a/src/webu_text.cpp b/src/webu_text.cpp index 8e90c596..5892ee76 100644 --- a/src/webu_text.cpp +++ b/src/webu_text.cpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */ @@ -24,7 +24,7 @@ * are available as the HTML as well as a few more. * Additional functions not directly available via HTML * get: Returns the value of a parameter. - * quit: Terminates motionplus + * quit: Terminates MotionPlus * list: Lists all the configuration parameters and values * status Whether the camera is in pause mode. * connection Whether the camera connection is working @@ -460,7 +460,7 @@ static void webu_text_get_menu(struct webui_ctx *webui) { } static void webu_text_action_quit(struct webui_ctx *webui) { - /* Shut down motionplus or the associated thread */ + /* Shut down MotionPlus or the associated thread */ char response[WEBUI_LEN_RESP]; webu_process_action(webui); diff --git a/src/webu_text.hpp b/src/webu_text.hpp index 578f30b0..2ef81347 100644 --- a/src/webu_text.hpp +++ b/src/webu_text.hpp @@ -1,18 +1,18 @@ /* - * This file is part of Motionplus. + * This file is part of MotionPlus. * * MotionPlus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Motionplus is distributed in the hope that it will be useful, + * MotionPlus is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Motionplus. If not, see . + * along with MotionPlus. If not, see . * * Copyright 2020 MotionMrDave@gmail.com */