mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2025-12-23 23:18:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change to be MotionPlus

Browse Source
This commit is contained in:
MrDave
2020-06-28 18:27:01 -06:00
committed by Mr-Dave
parent 0f99ce6a88
commit dd24b56922
69 changed files with 926 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@@ -20,8 +20,8 @@ missing
stamp-h1
#data
data/motion.service
data/motion-dist.conf
data/motionplus.service
data/motionplus-dist.conf
data/camera1-dist.conf
data/camera2-dist.conf
data/camera3-dist.conf
@@ -29,7 +29,7 @@ data/camera4-dist.conf
#src
src/*.o
src/motion
src/motionplus
src/Makefile
src/Makefile.in
src/.deps/
@@ -55,7 +55,7 @@ po/en@boldquot.header
po/en@quot.header
po/insert-header.sin
po/quot.sed
po/motion.pot
po/motionplus.pot
po/remove-potcdate.sed
po/remove-potcdate.sin
po/stamp-po

39
CONTRIBUTING.md
View File

@@ -1,43 +1,27 @@
# 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 Motion, we have the following additional resources which are better suited to meet these needs.
* User guide: [Motion User Guide](https://motion-project.github.io/motion_guide.html)
* User Group List: Please sign-up and send your issue to the list [Motion User](https://lists.sourceforge.net/lists/listinfo/motion-user)
* IRC: [#motion](irc://chat.freenode.net/motion) on freenode
It is very important to use these resources for non-code issues since it engages a much wider audience who may have experience resolving
the particular issue you are trying to resolve.
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.
## Submitting Problems
Before submitting a issue, please make sure that you are using either the latest release as posted
[here](https://github.com/Motion-Project/motion/releases) or that you have built the latest source code
from the github master branch.
Provide the following in order to replicate and ultimately resolve the issue:
If the issue still remains with the current version, please validate that the issue has not already been reported
by searching through the issue log.
Next, we must be provided the following in order to replicate and ultimately resolve the issue:
* A complete Motion 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
the link to the gist file within the issue. The full configuration will be printed out to the log at the INF/7 level
with the most common, sensitive information (URLs, usernames/passwords, etc) masked. It is recommended that you
double check before posting the log file.
For more information please read [privacy wiki article](https://github.com/Motion-Project/motion/wiki/Privacy)
Note that the developers do not use any front-end application to use Motion and we need the actual logs from the Motion
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
Motion 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.
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.)
@@ -49,10 +33,9 @@ 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 Motion_Guide.html which is our user guide.
* Changes to the motion.1 file which is the manual
* Changes to the configuration templates of motion.conf, camera1.conf, etc.
* 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.
Thanks,
Motion-Project Team.
Thanks

22
Makefile.am
View File

@@ -4,13 +4,13 @@ SUBDIRS = src po man
sysconfdir = @sysconfdir@/$(PACKAGE)
sysconf_DATA = \
data/motion-dist.conf \
data/motionplus-dist.conf \
data/camera1-dist.conf \
data/camera2-dist.conf \
data/camera3-dist.conf \
data/camera4-dist.conf
man_MANS = man/motion.1
man_MANS = man/motionplus.1
docdir = $(datadir)/doc/@PACKAGE@
doc_DATA = \
@@ -18,12 +18,12 @@ doc_DATA = \
doc/normal.jpg \
doc/outputmotion1.jpg \
doc/outputnormal1.jpg \
doc/motion_guide.html \
doc/motion_stylesheet.css \
doc/motionplus_guide.html \
doc/motionplus_stylesheet.css \
doc/COPYING \
doc/CREDITS \
doc/motion_build.html \
doc/motion_config.html
doc/motionplus_build.html \
doc/motionplus_config.html
###################################################################
## Create pristine directories to match exactly distributed files
@@ -34,9 +34,9 @@ cleanall: distclean
@rm -f compile config.guess config.rpath configure depcomp install-sh
@rm -f po/en@boldquot.header po/en@quot.header po/insert-header.sin
@rm -f po/Makevars.template po/quot.sed po/remove-potcdate.sin
@rm -f po/Rules-quot po/stamp-po po/*.gmo po/motion.pot po/boldquot.sed
@rm -f po/Rules-quot po/stamp-po po/*.gmo po/motionplus.pot po/boldquot.sed
@rm -f Makefile.in src/Makefile.in po/Makefile.in.in man/Makefile.in
@rm -f data/motion.service data/motion-dist.conf
@rm -f data/motionplus.service data/motionplus-dist.conf
@rm -f data/camera1-dist.conf data/camera2-dist.conf
@rm -f data/camera3-dist.conf data/camera4-dist.conf
@@ -50,15 +50,15 @@ all-local:
## Update contents of sample files with the correct directory
###################################################################
install-data-local:
@sed -e 's|$${prefix}|$(prefix)|' ${DESTDIR}${sysconfdir}/motion-dist.conf > ${DESTDIR}${sysconfdir}/motion-dist.conf.tmp && mv -f ${DESTDIR}${sysconfdir}/motion-dist.conf.tmp ${DESTDIR}${sysconfdir}/motion-dist.conf
@sed -e 's|$${prefix}|$(prefix)|' ${DESTDIR}${sysconfdir}/motionplus-dist.conf > ${DESTDIR}${sysconfdir}/motionplus-dist.conf.tmp && mv -f ${DESTDIR}${sysconfdir}/motionplus-dist.conf.tmp ${DESTDIR}${sysconfdir}/motionplus-dist.conf
@sed -e 's|$${prefix}|$(prefix)|' ${DESTDIR}${sysconfdir}/camera1-dist.conf > ${DESTDIR}${sysconfdir}/camera1-dist.conf.tmp && mv -f ${DESTDIR}${sysconfdir}/camera1-dist.conf.tmp ${DESTDIR}${sysconfdir}/camera1-dist.conf
@sed -e 's|$${prefix}|$(prefix)|' ${DESTDIR}${sysconfdir}/camera2-dist.conf > ${DESTDIR}${sysconfdir}/camera2-dist.conf.tmp && mv -f ${DESTDIR}${sysconfdir}/camera2-dist.conf.tmp ${DESTDIR}${sysconfdir}/camera2-dist.conf
@sed -e 's|$${prefix}|$(prefix)|' ${DESTDIR}${sysconfdir}/camera3-dist.conf > ${DESTDIR}${sysconfdir}/camera3-dist.conf.tmp && mv -f ${DESTDIR}${sysconfdir}/camera3-dist.conf.tmp ${DESTDIR}${sysconfdir}/camera3-dist.conf
@sed -e 's|$${prefix}|$(prefix)|' ${DESTDIR}${sysconfdir}/camera4-dist.conf > ${DESTDIR}${sysconfdir}/camera4-dist.conf.tmp && mv -f ${DESTDIR}${sysconfdir}/camera4-dist.conf.tmp ${DESTDIR}${sysconfdir}/camera4-dist.conf
@sed -e 's|$${exec_prefix}|$(exec_prefix)|' data/motion.service > data/motion.service.tmp && mv -f data/motion.service.tmp data/motion.service
@sed -e 's|$${exec_prefix}|$(exec_prefix)|' data/motionplus.service > data/motionplus.service.tmp && mv -f data/motionplus.service.tmp data/motionplus.service
@sed -e 's|$${prefix}|$(prefix)|' data/motion-dist.conf > data/motion-dist.conf.tmp && mv -f data/motion-dist.conf.tmp data/motion-dist.conf
@sed -e 's|$${prefix}|$(prefix)|' data/motionplus-dist.conf > data/motionplus-dist.conf.tmp && mv -f data/motionplus-dist.conf.tmp data/motionplus-dist.conf
@sed -e 's|$${prefix}|$(prefix)|' data/camera1-dist.conf > data/camera1-dist.conf.tmp && mv -f data/camera1-dist.conf.tmp data/camera1-dist.conf
@sed -e 's|$${prefix}|$(prefix)|' data/camera2-dist.conf > data/camera2-dist.conf.tmp && mv -f data/camera2-dist.conf.tmp data/camera2-dist.conf
@sed -e 's|$${prefix}|$(prefix)|' data/camera3-dist.conf > data/camera3-dist.conf.tmp && mv -f data/camera3-dist.conf.tmp data/camera3-dist.conf

24
README.md
View File

@@ -1,38 +1,24 @@
Motion
Motionplus
=============
## Status
The build status from travis-ci for the master branch is: [![Build Status](https://travis-ci.org/Motion-Project/motion.svg?branch=master)](https://travis-ci.org/Motion-Project/motion)
## Description
Motion 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 Motion is contained within the file motion_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/motion** directory. The
online version of the motion_guide.html file can be viewed [here](https://motion-project.github.io/motion_guide.html)
The offline version of this file is available in the **doc/motionplus** directory.
In addition to the detailed building instructions included within the guide, the
INSTALL file contains abbreviated building instructions.
## Resources
Please join the mailing list [here](https://lists.sourceforge.net/lists/listinfo/motion-user)
We prefer support through the mailing list because more people will have the benefit from the answers.
A archive of mailing list discussions can be viewed [here](https://sourceforge.net/p/motion/mailman/motion-user/)
## License
Motion is mainly distributed under the GNU GENERAL PUBLIC LICENSE (GPL) version 2 or later.
See the copyright file for a list of all the licensing terms of the various components of Motion.
The file CREDITS lists the many people who have contributed to Motion over the years.
Motionplus is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) version 3 or later.
## Contributing

18
configure.ac
View File

@@ -1,11 +1,11 @@
AC_INIT(motion, esyscmd(['./scripts/version.sh']))
AC_INIT(motionplus, esyscmd(['./scripts/version.sh']))
AM_INIT_AUTOMAKE([subdir-objects foreign])
CXXFLAGS="$CXXFLAGS -std=c++0x"
AC_PROG_CC
AC_PROG_CXX
AC_GNU_SOURCE
AC_CONFIG_HEADERS([config.hpp])
AC_CONFIG_SRCDIR([src/motion.cpp])
AC_CONFIG_SRCDIR([src/motionplus.cpp])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
@@ -29,7 +29,7 @@ AC_CHECK_HEADERS(stdio.h stdlib.h sys/time.h sys/wait.h \
##############################################################################
AC_CHECK_PROG([PKGCONFIG],[pkg-config],[yes],[no])
AS_IF([test "${PKGCONFIG}" = "no" ],[
AC_MSG_ERROR([Required package 'pkg-config' not found, please check motion_guide.html and install necessary dependencies.])
AC_MSG_ERROR([Required package 'pkg-config' not found, please check motionplus_guide.html and install necessary dependencies.])
]
)
@@ -55,7 +55,7 @@ AS_IF([test "${JPGS}" = "yes" ], [
]
)
],[
AC_MSG_ERROR([Required package libjpeg-dev not found, please check motion_guide.html and install necessary dependencies])
AC_MSG_ERROR([Required package libjpeg-dev not found, please check motionplus_guide.html and install necessary dependencies])
]
)
##############################################################################
@@ -68,7 +68,7 @@ AS_IF([test "${MHTTP}" = "yes" ], [
TEMP_CPPFLAGS="$TEMP_CPPFLAGS "`pkg-config --cflags libmicrohttpd`
TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libmicrohttpd`
],[
AC_MSG_ERROR([Required package libmicrohttpd-dev not found, please check motion_guide.html and install necessary dependencies])
AC_MSG_ERROR([Required package libmicrohttpd-dev not found, please check motionplus_guide.html and install necessary dependencies])
]
)
@@ -244,7 +244,7 @@ AS_IF([test "${FFMPEG}" = "no"], [
AC_MSG_RESULT(yes)
],[
AC_MSG_RESULT(no)
AC_MSG_ERROR([Required ffmpeg packages 'libavutil-dev libavformat-dev libavcodec-dev libswscale-dev libavdevice-dev' were not found. Please check motion_guide.html and install necessary dependencies])
AC_MSG_ERROR([Required ffmpeg packages 'libavutil-dev libavformat-dev libavcodec-dev libswscale-dev libavdevice-dev' were not found. Please check motionplus_guide.html and install necessary dependencies])
]
)
PKG_CONFIG_PATH=$TEMP_PATH
@@ -479,12 +479,10 @@ AC_CONFIG_FILES([
data/camera2-dist.conf
data/camera3-dist.conf
data/camera4-dist.conf
data/motion-dist.conf
data/motion.service
data/motionplus-dist.conf
data/motionplus.service
])
AC_ARG_VAR([KILL],[the 'kill' program to use to send signals to motion])
AC_PATH_PROG([KILL],[kill],['/bin/kill'])
AC_OUTPUT
##############################################################################

0
data/motion-dist.conf.in → data/motionplus-dist.conf.in
View File

0
data/motion.service.in → data/motionplus.service.in
View File

47
doc/copyright
View File

@@ -1,47 +0,0 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: motion
Source: http://motion.sourceforge.net/
License: GPL-2+
Files: *
Copyright: 1999-2014 motion authors; see CREDITS for details
License: GPL-2+
Files: md5.*
Copyright: 1991-1992 RSA Data Security, Inc
License: custom-RSA
Files: netcam_wget.*
Copyright: 1995-2002 Free Software Foundation, Inc.
License: GPL-2+
Files: mmx.h
Copyright: 1997-2001 H. Dietz and R. Fisher
License: GPL-2+
Files: debian/*
Copyright: 2000-2014 motion Debian packagers; see debian/changelog for details
License: GPL-2+
License: GPL-2+
On Debian systems, the complete text of the GNU General Public
License can be found in the file /usr/share/common-licenses/GPL-2'.
License: custom-RSA
License to copy and use this software is granted provided that it
is identified as the "RSA Data Security, Inc. MD5 Message-Digest
Algorithm" in all material mentioning or referencing this software
or this function.
.
License is also granted to make and use derivative works provided
that such works are identified as "derived from the RSA Data
Security, Inc. MD5 Message-Digest Algorithm" in all material
mentioning or referencing the derived work.
.
RSA Data Security, Inc. makes no representations concerning either
the merchantability of this software or the suitability of this
software for any particular purpose. It is provided "as is"
without express or implied warranty of any kind.
.
These notices must be retained in any copies of any part of this
documentation and/or software.

0
doc/motion_build.html → doc/motionplus_build.html
View File

0
doc/motion_config.html → doc/motionplus_config.html
View File

0
doc/motion_guide.html → doc/motionplus_guide.html
View File

0
doc/motion_stylesheet.css → doc/motionplus_stylesheet.css
View File

2
man/Makefile.am
View File

@@ -1 +1 @@
man_MANS = motion.1
man_MANS = motionplus.1

123
man/motion.1 → man/motionplus.1
View File

@@ -1,20 +1,20 @@
.TH MOTION 1 2019-02-02 "Motion" "Motion Options and Config Files"
.TH MOTION 1 2020-06-08 "Motionplus" "Motionplus Options and Config Files"
.SH NAME
motion \- Detect motion using a video4linux device or network camera
motionplus \- Detect motion using a video4linux device or network camera
.SH SYNOPSIS
.B motion [ \-hbnsm ] [ \-c config file path ] [ \-d level ] [ \-k level ] [ \-p pid_file ][ \-l log_file ]
.B motionplus [ \-hbnsm ] [ \-c config file path ] [ \-d level ] [ \-k level ] [ \-p pid_file ][ \-l log_file ]
.SH DESCRIPTION
.I Motion
.I Motionplus
uses a video4linux device or network camera to detect motion. If motion is detected both normal
and motion pictures can be taken. Motion 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/motion.conf \fR
The default is \fI /usr/local/etc/motion\fR unless specified differently when building Motion.
Many RPMs and Debian packages will use \fI/etc\fR or \fI/etc/motion\fR as the default.
For example: \fI /home/kurt/motionplus.conf \fR
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
Show help screen.
@@ -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/motion.pid. Default is not defined. Pid file is only created when Motion 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, Motion 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 Motion
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 Motion is started.
By default Motion 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 Motion 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
@@ -193,12 +193,12 @@ Description:
This option specifies the full path and file name to individual camera files.
This option can be listed multiple times.
Each camera file should contain the options that are unique to that camera/video device.
Common options are obtained from the motion.conf file and values are overwritten from each
camera file. While the motion.conf includes four sample camera files, the actual
Common options are obtained from the motionplus.conf file and values are overwritten from each
camera file. While the motionplus.conf includes four sample camera files, the actual
limit of cameras is only dependent upon the machine capabilities.
Remember: If you have more than one camera you must have one
camera file for each one. For example, 2 cameras would require 3 files:
The motion.conf file AND camera1.conf and camera2.conf.
The motionplus.conf file AND camera1.conf and camera2.conf.
only put the options that are unique to each camera in the
camera config files.
.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
Motion 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 motion to capture from the video device.
If the preferred palette is not available from the video device, Motion 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
@@ -445,9 +445,7 @@ v4l2://
The connection string is camera specific.
It is usually the same as what other video playing applications would use to connect to the camera stream.
Motion currently only supports basic authentication for the cameras.
Digest is not currently supported.
Basic authentication can be specified in the URL or via the netcam_userpass option.
Authentication can be specified in the URL or via the netcam_userpass option.
.RE
.RE
@@ -471,9 +469,7 @@ rtmp://
The connection string is camera specific.
It is usually the same as what other video playing applications would use to connect to the camera stream.
Motion currently only supports basic authentication for the cameras.
Digest is not currently supported.
Basic authentication can be specified in the URL or via the netcam_userpass option.
Authentication can be specified in the URL or via the netcam_userpass option.
.RE
.RE
@@ -758,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 motion 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
@@ -1039,7 +1035,7 @@ Description:
.RS
The number of pre-captured (buffered) pictures from before motion was detected that will be output upon motion detection.
The recommended range is 0 to 5.
It is not recommended to use large values since it will cause Motion to skip frames.
It is not recommended to use large values since it will cause skipped frames.
To smooth movies use larger values of post_capture instead.
.RE
.RE
@@ -1275,7 +1271,7 @@ A value of 1 is worst quality versus a value of 100 is best quality.
.nf
Values:
.RS
Motion videos:
Motionplus videos:
.RS
mpeg4 - Creates .avi file
msmpeg4 - Creates .avi file
@@ -1432,9 +1428,9 @@ Default: mpg
Description:
.fi
.RS
For mpg timelapse videos, if motion 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 motion 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
@@ -2110,16 +2106,16 @@ Full path and file name for the script to execute to move a camera in generic tr
.SH SIGNALS
Motion 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 motion 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
Motion will create an movie file of the current event.
Motionplus will create an movie file of the current event.
.SH NOTES
.TP
.B Snapshot
@@ -2132,49 +2128,49 @@ 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 Motion was invoked with command line option \-c pathname Motion 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 Motion does not exist, Motion will search for the configuration file called 'motion.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 motion was invoked
1. Current directory from where Motionplus was invoked
.br
2. Then in a directory called '.motion' in the current users home directory (shell environment variable $HOME). E.g. /home/goofy/.motion/motion.conf
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 motion/ subdirectory inside the directory defined by the \-\-sysconfdir=DIR when running .configure during installation of Motion (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/motion then the editor recommends having only one motion.conf file in the default /usr/local/etc/motion directory.
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
Motion has a configuration file in the distribution package called motion-dist.conf. When you run 'make install' this files gets copied to the /usr/local/etc/motion 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 motion-dist.conf to motion.conf. The original file is called motion-dist.conf so that your perfectly working motion.conf file does not accidentally get overwritten when you re-install or upgrade to a newer version of Motion.
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 Motion more times. Motion 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. Motion will then create an extra thread of itself for each camera. If you only have one camera you only need the motion.conf file. The minute you have two or more cameras you must have one camera config file per camera besides the motion.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 motion.conf and two camera config files. Total of 3 config files.
So if you have for example two cameras you need motionplus.conf and two camera config files. Total of 3 config files.
.br
An option that is common to all cameras can be placed in motion.conf. (You can also put all parameters in the camera files but that makes a lot of editing when you change a common thing).
An option that is common to all cameras can be placed in motionplus.conf. (You can also put all parameters in the camera files but that makes a lot of editing when you change a common thing).
.br
An option that is unique to a camera must be defined in each camera file.
.br
The first camera is defined in the first camera file called from motion.conf. The 2nd camera is defined in the 2nd camera file called from motion.conf etc.
The first camera is defined in the first camera file called from motionplus.conf. The 2nd camera is defined in the 2nd camera file called from motionplus.conf etc.
.br
Any option defined in motion.conf will be used for all cameras except for the cameras in which the same option is defined in a camera config file.
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
Motion 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. Motion reads the configuration file motion.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 motion.conf, the camera configuration file(s) is/(are) read.
2. If the option "camera" is defined in motionplus.conf, the camera configuration file(s) is/(are) read.
.br
3. Motion continues reading the rest of the motion.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. Motion 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 motion.conf file. If you define options in motion.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 motion.conf.
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 motion 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, motion will overwrite motion.conf and all the camera.conf files by autogenerated config files neatly formatted and only with the features included that Motion was built with. If you later re-build Motion with more features or upgrade to a new version, you can use your old config files, run the motion.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.
@@ -2204,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 Motion. 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.
@@ -2339,20 +2335,13 @@ The frame per seconds.
The id number returned from mysql_insert_id.
.TP
.B %{ver}
The version number of Motion.
The version number of motionplus.
.TP
.B More information
Motion homepage: https://motion-project.github.io/
Motionplus homepage: TBD
Motion Guide (user and installation guide):
.br /usr/share/doc/motion/motion_guide.html
.SH AUTHORS
Jeroen Vreeken (pe1rxq@amsat.org),
Folkert van Heusden,
Kenneth Lavrsen (kenneth@lavrsen.dk),
Juan Angulo Moreno <juan@apuntale.com>,
the motion-project team,
and many others
Motionplus Guide (user and installation guide):
.br /usr/share/doc/motionplus/motionplus_guide.html

2
po/Makevars
View File

@@ -41,7 +41,7 @@ PACKAGE_GNU =
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
MSGID_BUGS_ADDRESS = https://motion-project.github.io
MSGID_BUGS_ADDRESS =
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.

2
po/POTFILES.in
View File

@@ -7,7 +7,7 @@ src/movie.cpp
src/jpegutils.cpp
src/logger.cpp
src/mmalcam.cpp
src/motion.cpp
src/motionplus.cpp
src/netcam.cpp
src/picture.cpp
src/rotate.cpp

2
scripts/version.sh
View File

@@ -1,5 +1,5 @@
#!/bin/sh
BASE_VERSION="4.2.2"
BASE_VERSION="0.0.1"
if [ -d .git ]; then
if test "`git diff --name-only`" = "" ; then
GIT_COMMIT="git"

6
src/Makefile.am
View File

@@ -1,4 +1,4 @@
AM_CPPFLAGS= -Dsysconfdir=\"$(sysconfdir)/motion\" -DLOCALEDIR=\"$(DESTDIR)$(localedir)\"
AM_CPPFLAGS= -Dsysconfdir=\"$(sysconfdir)/motionplus\" -DLOCALEDIR=\"$(DESTDIR)$(localedir)\"
if INC_MMAL_SRC
MMAL_SRC=raspicam/RaspiCamControl.c raspicam/RaspiCLI.c
@@ -6,9 +6,9 @@ endif
LIBS = @LIBINTL@ @LIBS@
bin_PROGRAMS = motion
bin_PROGRAMS = motionplus
motion_SOURCES = motion.cpp motion_loop.cpp logger.cpp conf.cpp util.cpp alg.cpp alg_sec.cpp\
motionplus_SOURCES = motionplus.cpp motion_loop.cpp logger.cpp conf.cpp util.cpp alg.cpp alg_sec.cpp\
video_v4l2.cpp video_common.cpp video_loopback.cpp netcam.cpp jpegutils.cpp exif.cpp \
rotate.cpp draw.cpp event.cpp movie.cpp picture.cpp dbse.cpp track.cpp \
webu.cpp webu_html.cpp webu_stream.cpp webu_text.cpp mmalcam.cpp $(MMAL_SRC)

22
src/alg.cpp
View File

@@ -1,12 +1,22 @@
/* alg.c
/*
* This file is part of Motionplus.
*
* Detect changes in a video stream.
* Copyright 2001 by Jeroen Vreeken (pe1rxq@amsat.org)
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "util.hpp"
#include "alg.hpp"

20
src/alg.hpp
View File

@@ -1,10 +1,20 @@
/* alg.hpp
/*
* This file is part of Motionplus.
*
* Detect changes in a video stream.
* Copyright 2001 by Jeroen Vreeken (pe1rxq@amsat.org)
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_ALG_H

22
src/alg_sec.cpp
View File

@@ -1,10 +1,20 @@
/* alg_sec.cpp
/*
* This file is part of Motionplus.
*
* Algorithms for Secondary Detection
* Detect changes in a video stream using alternative methods.
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include <iostream>
@@ -12,7 +22,7 @@
#include <sstream>
#include <stdexcept>
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "util.hpp"
#include "logger.hpp"

19
src/alg_sec.hpp
View File

@@ -1,14 +1,23 @@
/*
* alg_sec.hpp
* This file is part of Motionplus.
*
* Algorithms for Secondary Detection Header
* Copyright 2019
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_ALG_SEC_H
#define _INCLUDE_ALG_SEC_H

64
src/conf.cpp
View File

@@ -1,17 +1,26 @@
/*
**
** conf.cpp
** Copyright 1999 Jeroen Vreeken (pe1rxq@chello.nl)
**
** This software is licensed under the terms of the GNU General
** Public License (GPL). Please see the file COPYING for details.
**
**
*/
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include <regex.h>
#include <dirent.h>
#include <string>
#include "motion.hpp"
#include "motionplus.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "conf.hpp"
@@ -87,7 +96,7 @@ struct ctx_parm config_parms[] = {
},
{
"vid_control_params",
"# Parameters to control video device. See motion_guide.html",
"# Parameters to control video device. See motionplus_guide.html",
0,PARM_TYP_STRING,PARM_CAT_01,WEBUI_LEVEL_LIMITED},
{
"v4l2_palette",
@@ -402,7 +411,7 @@ struct ctx_parm config_parms[] = {
0, PARM_TYP_INT, PARM_CAT_03, WEBUI_LEVEL_LIMITED },
{
"movie_codec",
"# Container/Codec to used for the movie. See motion_guide.html",
"# Container/Codec to used for the movie. See motionplus_guide.html",
0, PARM_TYP_STRING, PARM_CAT_03, WEBUI_LEVEL_LIMITED },
{
"movie_passthrough",
@@ -429,7 +438,7 @@ struct ctx_parm config_parms[] = {
0, PARM_TYP_INT, PARM_CAT_03, WEBUI_LEVEL_LIMITED },
{
"timelapse_mode",
"# Timelapse file rollover mode. See motion_guide.html for options and uses.",
"# Timelapse file rollover mode. See motionplus_guide.html for options and uses.",
0, PARM_TYP_STRING, PARM_CAT_03, WEBUI_LEVEL_LIMITED},
{
"timelapse_fps",
@@ -605,22 +614,22 @@ struct ctx_parm config_parms[] = {
0,PARM_TYP_INT, PARM_CAT_05, WEBUI_LEVEL_LIMITED},
{
"sql_query_start",
"# SQL query at event start. See motion_guide.html",
"# SQL query at event start. See motionplus_guide.html",
0, PARM_TYP_STRING, PARM_CAT_05, WEBUI_LEVEL_ADVANCED },
{
"sql_query_stop",
"# SQL query at event stop. See motion_guide.html",
"# SQL query at event stop. See motionplus_guide.html",
0, PARM_TYP_STRING, PARM_CAT_05, WEBUI_LEVEL_ADVANCED },
{
"sql_query",
"# SQL query string that is sent to the database. See motion_guide.html",
"# SQL query string that is sent to the database. See motionplus_guide.html",
0, PARM_TYP_STRING, PARM_CAT_05, WEBUI_LEVEL_ADVANCED},
{
"track_type",
"############################################################\n"
"# Tracking configuration parameters\n"
"############################################################\n\n"
"# Method used by tracking camera. See motion_guide.html",
"# Method used by tracking camera. See motionplus_guide.html",
0, PARM_TYP_INT, PARM_CAT_05, WEBUI_LEVEL_LIMITED },
{
"track_auto",
@@ -3316,9 +3325,8 @@ void conf_edit_set(struct ctx_motapp *motapp, int threadnbr
/** Prints usage and options allowed from Command-line. */
static void usage(void) {
printf("motion Version %s, Copyright 2000-2019 Jeroen Vreeken/Folkert van Heusden/Kenneth Lavrsen/Motion-Project maintainers\n",PACKAGE_VERSION);
printf("\nHome page :\t https://motion-project.github.io/ \n");
printf("\nusage:\tmotion [options]\n");
printf("motionplus version %s, Copyright 2020\n",PACKAGE_VERSION);
printf("\nusage:\tmotionplus [options]\n");
printf("\n\n");
printf("Possible options:\n\n");
printf("-b\t\t\tRun in background (daemon) mode.\n");
@@ -3329,13 +3337,9 @@ static void usage(void) {
printf("-k type\t\t\tType of log (COR, STR, ENC, NET, DBL, EVT, TRK, VID, ALL). default: ALL.\n");
printf("-p process_id_file\tFull path and filename of process id file (pid file).\n");
printf("-l log file \t\tFull path and filename of log file.\n");
printf("-m\t\t\tDisable motion detection at startup.\n");
printf("-m\t\t\tDisable detection at startup.\n");
printf("-h\t\t\tShow this screen.\n");
printf("\n");
printf("Motion is configured using a config file only. If none is supplied,\n");
printf("it will read motion.conf from current directory, ~/.motion or %s.\n", sysconfdir);
printf("%s\n", sysconfdir);
printf("\n");
}
/** Process Command-line options specified */
@@ -3624,7 +3628,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 motion " VERSION "\n");
fprintf(conffile, "#\n# This config file was generated by motionplus " VERSION "\n");
fprintf(conffile, "# at %s\n", timestamp);
fprintf(conffile, "\n\n");
@@ -3690,17 +3694,17 @@ void conf_init_app(struct ctx_motapp *motapp, int argc, char *argv[]){
MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Error getcwd"));
exit(-1);
}
filename = path + std::string("/motion.conf");
filename = path + std::string("/motionplus.conf");
fp = fopen (filename.c_str(), "r");
}
if (!fp) {
filename = std::string(getenv("HOME")) + std::string("/.motion/motion.conf");
filename = std::string(getenv("HOME")) + std::string("/.motionplus/motionplus.conf");
fp = fopen(filename.c_str(), "r");
}
if (!fp) {
filename = std::string( sysconfdir ) + std::string("/motion.conf");
filename = std::string( sysconfdir ) + std::string("/motionplus.conf");
fp = fopen(filename.c_str(), "r");
}
@@ -3709,7 +3713,7 @@ void conf_init_app(struct ctx_motapp *motapp, int argc, char *argv[]){
,_("could not open configfile %s"), filename.c_str());
}
/* Now we process the motion.conf config file and close it. */
/* Now we process the motionplus.conf config file and close it. */
if (fp) {
conf_edit_set(motapp, -1, "conf_filename", filename);

20
src/conf.hpp
View File

@@ -1,17 +1,23 @@
/*
* This file is part of Motionplus.
*
* conf.hpp - function prototypes for the config handling routines
* 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.
*
* Originally written for the dproxy package by Matthew Pratt.
*
* Copyright 2000 Jeroen Vreeken (pe1rxq@chello.nl)
*
* This software is licensed under the terms of the GNU General
* Public License (GPL). Please see the file COPYING for details.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_CONF_H
#define _INCLUDE_CONF_H

32
src/dbse.cpp
View File

@@ -1,26 +1,24 @@
/* dbse.cpp
/*
* This file is part of Motionplus.
*
* This file is part of the Motion application
* Copyright (C) 2019 Motion-Project Developers(motion-project.github.io)
* 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.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
* 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 Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
* You should have received a copy of the GNU General Public License
* along with Motionplus. If not, see <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "util.hpp"
#include "logger.hpp"

31
src/dbse.hpp
View File

@@ -1,23 +1,22 @@
/* dbse.hpp
/*
* This file is part of Motionplus.
*
* This file is part of the Motion application
* Copyright (C) 2019 Motion-Project Developers(motion-project.github.io)
* 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.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
* 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 Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
* You should have received a copy of the GNU General Public License
* along with Motionplus. If not, see <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
/*
* Header files for the database functionality.

20
src/draw.cpp
View File

@@ -1,16 +1,24 @@
/*
* draw.cpp
* This file is part of Motionplus.
*
* Routines for drawing text on images
* 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.
*
* Copyright 2000, Jeroen Vreeken
* This program is published under the GNU public license version 2
* See also the file 'COPYING'
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include <ctype.h>
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "util.hpp"
#include "logger.hpp"

31
src/draw.hpp
View File

@@ -1,23 +1,22 @@
/* draw.hpp
/*
* This file is part of Motionplus.
*
* This file is part of the Motion application
* Copyright (C) 2019 Motion-Project Developers(motion-project.github.io)
* 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.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
* 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 Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
* You should have received a copy of the GNU General Public License
* along with Motionplus. If not, see <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_DRAW_H_
#define _INCLUDE_DRAW_H_

26
src/event.cpp
View File

@@ -1,13 +1,23 @@
/*
event.cpp
Generalised event handling for motion
Copyright Jeroen Vreeken, 2002
This software is distributed under the GNU Public License Version 2
see also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

18
src/event.hpp
View File

@@ -1,12 +1,20 @@
/*
* event.hpp
* This file is part of Motionplus.
*
* Include file for event.cpp
* 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.
*
* Copyright Jeroen Vreeken, 2002
* This software is distributed under the GNU Public License Version 2
* see also the file 'COPYING'.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_EVENT_H_
#define _INCLUDE_EVENT_H_

33
src/exif.cpp
View File

@@ -1,26 +1,25 @@
/* exif.cpp
/*
* This file is part of Motionplus.
*
* This file is part of the Motion application
* Copyright (C) 2019 Motion-Project Developers(motion-project.github.io)
* 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.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
* 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 Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
* You should have received a copy of the GNU General Public License
* along with Motionplus. If not, see <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "util.hpp"
#include "logger.hpp"

31
src/exif.hpp
View File

@@ -1,23 +1,22 @@
/* exif.hpp
/*
* This file is part of Motionplus.
*
* This file is part of the Motion application
* Copyright (C) 2019 Motion-Project Developers(motion-project.github.io)
* 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.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
* 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 Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
* You should have received a copy of the GNU General Public License
* along with Motionplus. If not, see <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
/*
* Header files for the exif functionality.

33
src/jpegutils.cpp
View File

@@ -1,27 +1,22 @@
/*
* jpegutils.c: Some Utility programs for dealing with JPEG encoded images
* This file is part of Motionplus.
*
* Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
* Copyright (C) 2001 pHilipp Zabel <pzabel@gmx.de>
* Copyright (C) 2008 Angel Carpintero <motiondevelop@gmail.com>
* 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.
*
* based on jdatasrc.c and jdatadst.c from the Independent
* JPEG Group's software by Thomas G. Lane
* 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.
*
* This program 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 2
* of the License, or (at your option) any later version.
* You should have received a copy of the GNU General Public License
* along with Motionplus. If not, see <https://www.gnu.org/licenses/>.
*
* This program 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.
* Copyright 2020 MotionMrDave@gmail.com
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
*/
/*
* jpegutils.cpp
@@ -48,7 +43,7 @@
* jpgutl_decode_jpeg
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "logger.hpp"
#include "util.hpp"
#include "jpegutils.hpp"

25
src/jpegutils.hpp
View File

@@ -1,12 +1,23 @@
/*
* jpegutils.hpp: Some Utility programs for dealing with
* JPEG encoded images
/*
* This file is part of Motionplus.
*
* Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
* Copyright (C) 2001 pHilipp Zabel <pzabel@gmx.de>
* Copyright (C) 2008 Angel Carpintero <motiondevelop@gmail.com>
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
*/
#ifndef __JPEGUTILS_H__
#define __JPEGUTILS_H__

21
src/logger.cpp
View File

@@ -1,15 +1,22 @@
/*
* logger.cpp
* This file is part of Motionplus.
*
* Logger for motion
* 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.
*
* Copyright 2005, William M. Brack
* Copyright 2008 by Angel Carpintero (motiondevelop@gmail.com)
* This software is distributed under the GNU Public License Version 2
* See also the file 'COPYING'.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "util.hpp"
#include "logger.hpp"

19
src/logger.hpp
View File

@@ -1,13 +1,20 @@
/*
* logger.hpp
* This file is part of Motionplus.
*
* Include file for logger.cpp
* 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.
*
* Copyright 2005, William M. Brack
* Copyright 2008 by Angel Carpintero (motiondevelop@gmail.com)
* This software is distributed under the GNU Public License Version 2
* See also the file 'COPYING'.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_LOGGER_H_
#define _INCLUDE_LOGGER_H_

20
src/mmalcam.cpp
View File

@@ -1,17 +1,25 @@
/*
* mmalcam.cpp
* This file is part of Motionplus.
*
* Raspberry Pi camera module using MMAL API.
* 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.
*
* Built upon functionality from the Raspberry Pi userland utility raspivid.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
* Copyright 2013 by Nicholas Tuckett
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
*
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

18
src/mmalcam.hpp
View File

@@ -1,11 +1,21 @@
/*
* mmalcam.hpp
* This file is part of Motionplus.
*
* Include file for mmalcam.c
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
* Copyright 2013 by Nicholas Tuckett
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
*/
#ifndef MMALCAM_H_

32
src/motion_loop.cpp
View File

@@ -1,25 +1,25 @@
/* motion_loop.cpp
/*
* This file is part of Motionplus.
*
* This file is part of the Motion application
* Copyright (C) 2019 Motion-Project Developers(motion-project.github.io)
* 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.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "logger.hpp"
#include "util.hpp"
#include "motion_loop.hpp"

30
src/motion_loop.hpp
View File

@@ -1,24 +1,24 @@
/* motion_loop.hpp
/*
* This file is part of Motionplus.
*
* This file is part of the Motion application
* Copyright (C) 2019 Motion-Project Developers(motion-project.github.io)
* 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.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef _INCLUDE_MOTION_LOOP_H_
#define _INCLUDE_MOTION_LOOP_H_

25
src/motion.cpp → src/motionplus.cpp
View File

@@ -1,12 +1,23 @@
/* motion.cpp
/*
* This file is part of Motionplus.
*
* Detect changes in a video stream.
* Copyright 2000 by Jeroen Vreeken (pe1rxq@amsat.org)
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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.
*
*/
#include "motion.hpp"
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
*/
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

24
src/motion.hpp → src/motionplus.hpp
View File

@@ -1,11 +1,23 @@
/* motion.hpp
/*
* This file is part of Motionplus.
*
* Include file for motion.cpp
* Copyright 2000 by Jeroen Vreeken (pe1rxq@amsat.org)
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
*/
#ifndef _INCLUDE_MOTION_H
#define _INCLUDE_MOTION_H

21
src/movie.cpp
View File

@@ -1,10 +1,23 @@
/*
* This file is part of Motionplus.
*
* movie.cpp
* 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.
*
* This software is distributed under the GNU Public License version 2
* See also the file 'COPYING'.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
/*
* The contents of this file has been derived from output_example.c
* and apiexample.c from the FFmpeg distribution.
*
@@ -21,7 +34,7 @@
* indicate libav
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

21
src/movie.hpp
View File

@@ -1,3 +1,24 @@
/*
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
*/
#ifndef _INCLUDE_MOVIE_H_
#define _INCLUDE_MOVIE_H_

23
src/netcam.cpp
View File

@@ -1,3 +1,24 @@
/*
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
*/
/***********************************************************
*
* The functions:
@@ -11,7 +32,7 @@
#include <stdio.h>
#include <regex.h>
#include <time.h>
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

21
src/netcam.hpp
View File

@@ -1,3 +1,24 @@
/*
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
*/
#ifndef _INCLUDE_NETCAM_H
#define _INCLUDE_NETCAM_H

24
src/picture.cpp
View File

@@ -1,14 +1,22 @@
/* picture.cpp
/*
* This file is part of Motionplus.
*
* Various funtions for saving/loading pictures.
* Copyright 2002 by Jeroen Vreeken (pe1rxq@amsat.org)
* Portions of this file are Copyright by Lionnel Maugis
* Portions of this file are Copyright 2010 by Wim Lewis (wiml@hhhh.org)
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

22
src/picture.hpp
View File

@@ -1,12 +1,22 @@
/*
* picture.hpp
* This file is part of Motionplus.
*
* Copyright 2002 by Jeroen Vreeken (pe1rxq@amsat.org)
* Portions of this file are Copyright by Lionnel Maugis
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
*/
#ifndef _INCLUDE_PICTURE_H_
#define _INCLUDE_PICTURE_H_

6
src/raspicam/RaspiCamControl.c
View File

@@ -27,9 +27,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
This file was modified to be used with the motion project. The controls are parsed
via "mmalcam_control_params" function in motion to the raspicam driver. To fulfill
such functionality without bloating the motion 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

39
src/rotate.cpp
View File

@@ -1,35 +1,22 @@
/*
* rotate.cpp
* This file is part of Motionplus.
*
* Module for handling image rotation.
* 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.
*
* Copyright 2004-2005, Per Jonsson (per@pjd.nu)
* 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.
*
* This software is distributed under the GNU Public license
* Version 2. See also the file 'COPYING'.
* You should have received a copy of the GNU General Public License
* along with Motionplus. If not, see <https://www.gnu.org/licenses/>.
*
* Image rotation is a feature of Motion that can be used when the
* camera is mounted upside-down or on the side. The module only
* supports rotation in multiples of 90 degrees. Using rotation
* increases the Motion CPU usage slightly.
*
* Version history:
* v6 (29-Aug-2005) - simplified the code as Motion now requires
* that width and height are multiples of 16
* v5 (3-Aug-2005) - cleanup in code comments
* - better adherence to coding standard
* - fix for __bswap_32 macro collision
* - fixed bug where initialization would be
* incomplete for invalid degrees of rotation
* - now uses MOTION_LOG for error reporting
* v4 (26-Oct-2004) - new fix for width/height from imgs/conf due to
* earlier misinterpretation
* v3 (11-Oct-2004) - cleanup of width/height from imgs/conf
* v2 (26-Sep-2004) - separation of capture/internal dimensions
* - speed optimization, including bswap
* v1 (28-Aug-2004) - initial version
* Copyright 2020 MotionMrDave@gmail.com
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

18
src/rotate.hpp
View File

@@ -1,12 +1,20 @@
/*
* rotate.hpp
* This file is part of Motionplus.
*
* Include file for handling image rotation.
* 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.
*
* Copyright 2004-2005, Per Jonsson (per@pjd.nu)
* 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.
*
* This software is distributed under the GNU Public license
* Version 2. See also the file 'COPYING'.
* You should have received a copy of the GNU General Public License
* along with Motionplus. If not, see <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_ROTATE_H
#define _INCLUDE_ROTATE_H

24
src/track.cpp
View File

@@ -1,12 +1,24 @@
/* track.cpp
/*
* This file is part of Motionplus.
*
* Experimental motion tracking.
* 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.
*
* Copyright 2000, Jeroen Vreeken
* This program is published under the GNU Public license
*/
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
*/
#include <math.h>
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

22
src/track.hpp
View File

@@ -1,10 +1,22 @@
/* track.hpp
/*
* This file is part of Motionplus.
*
* Experimental motion tracking.
* 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.
*
* Copyright 2000, Jeroen Vreeken
* This program is published under the GNU Public license
*/
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
*/
#ifndef _INCLUDE_TRACK_H
#define _INCLUDE_TRACK_H

31
src/util.cpp
View File

@@ -1,25 +1,24 @@
/* util.cpp
/*
* This file is part of Motionplus.
*
* This file is part of the Motion application
* Copyright (C) 2019 Motion-Project Developers(motion-project.github.io)
* 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.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "util.hpp"
#include "logger.hpp"

30
src/util.hpp
View File

@@ -1,23 +1,23 @@
/* util.hpp
/*
* This file is part of Motionplus.
*
* This file is part of the Motion application
* Copyright (C) 2019 Motion-Project Developers(motion-project.github.io)
* 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.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Library General Public License for more details.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef _INCLUDE_UTIL_H_
#define _INCLUDE_UTIL_H_

24
src/video_common.cpp
View File

@@ -1,15 +1,23 @@
/* video_common.cpp
/*
* This file is part of Motionplus.
*
* Video stream functions for motion.
* Copyright 2000 by Jeroen Vreeken (pe1rxq@amsat.org)
* 2006 by Krzysztof Blaszkowski (kb@sysmikro.com.pl)
* 2007 by Angel Carpintero (motiondevelop@gmail.com)
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

18
src/video_common.hpp
View File

@@ -1,3 +1,21 @@
/*
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_VIDEO_COMMON_H
#define _INCLUDE_VIDEO_COMMON_H

22
src/video_loopback.cpp
View File

@@ -1,14 +1,22 @@
/*
* video_loopback.cpp
* This file is part of Motionplus.
*
* Video loopback functions for motion.
* Copyright 2000 by Jeroen Vreeken (pe1rxq@amsat.org)
* Copyright 2008 by Angel Carpintero (motiondevelop@gmail.com)
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

21
src/video_loopback.hpp
View File

@@ -1,11 +1,20 @@
/* video_loopback.hpp
/*
* This file is part of Motionplus.
*
* Include file for video_loopback.c
* Copyright 2000 by Jeroen Vreeken (pe1rxq@amsat.org)
* Copyright 2008 by Angel Carpintero (motiondevelop@gmail.com)
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_VIDEO_LOOPBACK_H
#define _INCLUDE_VIDEO_LOOPBACK_H

28
src/video_v4l2.cpp
View File

@@ -1,23 +1,23 @@
/*
* video_v4l2.cpp
* This file is part of Motionplus.
*
* V4L2 interface with basically JPEG decompression support and even more ...
* Copyright 2006 Krzysztof Blaszkowski (kb@sysmikro.com.pl)
* 2007 Angel Carpintero (motiondevelop@gmail.com)
* Refactor/rewrite code: 2018 MrDave
* 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.
*
* This program 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 2 of the License, or (at your
* option) any later version.
* 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.
*
* This program 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

22
src/video_v4l2.hpp
View File

@@ -1,11 +1,21 @@
/* video_v4l2.hpp
/*
* This file is part of Motionplus.
*
* Include file for video_v4l2.c
* Copyright 2000 by Jeroen Vreeken (pe1rxq@amsat.org)
* This software is distributed under the GNU public license version 2
* See also the file 'COPYING'.
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_VIDEO_V4L2_H
#define _INCLUDE_VIDEO_V4L2_H

26
src/webu.cpp
View File

@@ -1,16 +1,24 @@
/*
* webu.cpp
* This file is part of Motionplus.
*
* Webcontrol and Streams for motion.
* 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.
*
* This software is distributed under the GNU Public License Version 2
* See also the file 'COPYING'.
* 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.
*
* Portions of code from Angel Carpintero (motiondevelop@gmail.com)
* from webhttpd.c Copyright 2004-2005
*
* Majority of module written by MrDave.
* You should have received a copy of the GNU General Public License
* along with Motionplus. If not, see <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
/*
* Function naming scheme:
* webu* - All functions in this module have this prefix.
* webu_start - Entry point to start the daemon.
@@ -37,7 +45,7 @@
#include <arpa/inet.h>
#include <sys/socket.h>
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

20
src/webu.hpp
View File

@@ -1,12 +1,22 @@
/*
* webu.hpp
* This file is part of Motionplus.
*
* Include file for webu.c
* 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.
*
* This software is distributed under the GNU Public License Version 2
* See also the file 'COPYING'.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_WEBU_H_
#define _INCLUDE_WEBU_H_

22
src/webu_html.cpp
View File

@@ -1,11 +1,23 @@
/*
* webu_html.cpp
* This file is part of Motionplus.
*
* Create the html for the webcontrol page
* 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.
*
* This software is distributed under the GNU Public License Version 2
* See also the file 'COPYING'.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
/*
* Functional naming scheme
* webu_html* - Functions that create the display webcontrol page.
* webu_html_main - Entry point from webu_ans_ctrl(in webu.c)
@@ -33,7 +45,7 @@
*
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

19
src/webu_html.hpp
View File

@@ -1,3 +1,22 @@
/*
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_WEBU_HTML_H_
#define _INCLUDE_WEBU_HTML_H_

22
src/webu_stream.cpp
View File

@@ -1,11 +1,23 @@
/*
* webu_stream.cpp
* This file is part of Motionplus.
*
* Create the web streams for Motion
* 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.
*
* This software is distributed under the GNU Public License Version 2
* See also the file 'COPYING'.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
/*
* Functional naming scheme
* webu_stream* - All functions in this module
* webu_stream_mjpeg* - Create the motion-jpeg stream for the user
@@ -13,7 +25,7 @@
* webu_stream_checks - Edit/validate request from user
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

19
src/webu_stream.hpp
View File

@@ -1,3 +1,22 @@
/*
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_WEBU_STREAM_H_
#define _INCLUDE_WEBU_STREAM_H_

22
src/webu_text.cpp
View File

@@ -1,11 +1,23 @@
/*
* webu_text.cpp
* This file is part of Motionplus.
*
* Create the text(programatic) interface Motion
* 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.
*
* This software is distributed under the GNU Public License Version 2
* See also the file 'COPYING'.
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
/*
* This module processes the requests associated with the text inferface
* of the webcontrol. This interface is intended to be used by programs
* and does not have any user interface to navigate. The same actions
@@ -19,7 +31,7 @@
*
*/
#include "motion.hpp"
#include "motionplus.hpp"
#include "conf.hpp"
#include "logger.hpp"
#include "util.hpp"

19
src/webu_text.hpp
View File

@@ -1,3 +1,22 @@
/*
* 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,
* 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 <https://www.gnu.org/licenses/>.
*
* Copyright 2020 MotionMrDave@gmail.com
*/
#ifndef _INCLUDE_WEBU_TEXT_H_
#define _INCLUDE_WEBU_TEXT_H_