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

Revise naming from Motionplus back to Motion

Browse Source
This commit is contained in:
Mr-Dave
2025-02-04 15:59:45 -07:00
parent 1b9c6870f0
commit cfc9246e48
108 changed files with 17671 additions and 11678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/ISSUE_TEMPLATE/config.yml vendored
View File

@@ -1,8 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: MotionPlus User Questions
url: https://github.com/Motion-Project/motionplus/discussions
- name: Motion User Questions
url: https://github.com/Motion-Project/motion/discussions
about: Please ask and answer questions here.
- name: MotionPlus Enhancements
url: https://github.com/Motion-Project/motionplus/discussions
- name: Motion Enhancements
url: https://github.com/Motion-Project/motion/discussions
about: Please use the discussions page and tag as an enhancement request.

23
.github/ISSUE_TEMPLATE/issue.yml vendored
View File

@@ -19,15 +19,20 @@ body:
- type: dropdown
id: baseversion
attributes:
label: What is the base version number of MotionPlus being used?
label: What is the base version number of Motion being used?
multiple: false
options:
- 0.0.x
- 0.1.x
- 0.2.x
- 0.3.x
- 0.4.x
- 0.5.x
- 4.0.x
- 4.1.x
- 4.2.x
- 4.3.x
- 4.4.x
- 4.5.x
- 4.6.x
- 4.7.x
- 5.0.x
- 5.1.x
- 5.2.x
validations:
required: true
- type: dropdown
@@ -99,8 +104,8 @@ body:
- type: textarea
id: logs
attributes:
label: Relevant MotionPlus log output (at log_level 8)
description: Please copy and paste the log output. This will be automatically formatted into code, so no need for backticks.
label: Full Motion log output (at log_level 8)
description: Please copy and paste the full log output. This will be automatically formatted into code, so no need for backticks.
render: shell
validations:
required: true

4
.github/workflows/ci.yml vendored
View File

@@ -93,5 +93,5 @@ jobs:
- name: Run artifact
run: |
file ./src/motionplus
./src/motionplus -h || true
file ./src/motion
./src/motion -h || true

8
.gitignore vendored
View File

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

8
CONTRIBUTING.md
View File

@@ -2,13 +2,7 @@
Issues on the github site are intended to discuss code problems, crashes and application enhancements. The discussions is intended for questions after you have read the guide.
## Submitting Problems
During the initial development of MotionPlus issues may frequently arise and it is best to provide as much detail as possible regarding how to replicate.
## Questions submitted as issues
Questions that are submitted as a github issue will be transferred to the discussions section without comment.
Questions that are submitted as a github issue will be transferred to the discussions section.
Thanks

1414
ChangeMasterFileNames.patch Normal file
View File

File diff suppressed because it is too large Load Diff

1414
ChangeMasterFileNames2.patch Normal file
View File

File diff suppressed because it is too large Load Diff

26
Makefile.am
View File

@@ -1,18 +1,18 @@
#/*
# * This file is part of MotionPlus.
# * This file is part of Motion.
# *
# * MotionPlus is free software: you can redistribute it and/or modify
# * Motion 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,
# * Motion 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/>.
# * along with Motion. If not, see <https://www.gnu.org/licenses/>.
# *
# */
@@ -25,26 +25,26 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
libstatedir = @localstatedir@/lib/@PACKAGE@
dist_libstate_DATA = \
data/motionplus-dist.conf \
data/motion-dist.conf \
data/camera1-dist.conf \
data/camera2-dist.conf \
data/camera3-dist.conf \
data/sound1-dist.conf
dist_man_MANS = man/motionplus.1
dist_man_MANS = man/motion.1
dist_doc_DATA = \
doc/motionplus_guide.html \
doc/motionplus_stylesheet.css \
doc/motionplus_build.html \
doc/motionplus_config.html
doc/motion_guide.html \
doc/motion_stylesheet.css \
doc/motion_build.html \
doc/motion_config.html
###################################################################
## Clean tilde crumbs and add prefix in config file.
###################################################################
all-local:
@rm -f po/*.po\~
@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/motion-dist.conf > data/motion-dist.conf.tmp && mv -f data/motion-dist.conf.tmp data/motion-dist.conf
###################################################################
## Create pristine directories to match exactly distributed files
@@ -55,9 +55,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/motionplus.pot po/boldquot.sed
@rm -f po/Rules-quot po/stamp-po po/*.gmo po/motion.pot po/boldquot.sed
@rm -f Makefile.in src/Makefile.in po/Makefile.in.in man/Makefile.in
@rm -f data/motionplus-dist.service data/motionplus-dist.conf
@rm -f data/motion-dist.service data/motion-dist.conf
@rm -f data/camera1-dist.conf data/camera2-dist.conf
@rm -f data/camera3-dist.conf data/sound1-dist.conf

16
README.md
View File

@@ -1,11 +1,15 @@
MotionPlus
Motion
=============
## Description
MotionPlus is a break from Motion version 4.2.2 to provide an application for enhancements. MotionPlus removes some of the outdated processes, cleans up the code base and introduces new functionality.
Motion is a program that monitors the signal from video cameras
and detects changes in the images. Version 5.0 and later versions
remove some of the outdated processes, cleans up the code base and
introduces new functionality.
The following are some of the things that are different from Motion.
The following are some of the things that are different from earlier
version of Motion (versions 4.7 and lower).
- Secondary detection method via OpenCV
- HOG (Histogram of Oriented Gradients)
- Haar cascade classifiers
@@ -16,11 +20,11 @@ The following are some of the things that are different from Motion.
- Sound recording from network camera sources
- ROI pictures for output or secondary detection
- Enhanced web contorl
- Only needs a single port for all camera video streams and controls
- Single port for all camera video streams and controls
- Consolidated stream(a single image) showing all cameras
- List/download movies
- Add/delete cameras
- Live view of the Motionplus log output
- Live view of the Motion log output
- Video streams via MPEGTS format
- Change/update configuration parameters
- Permits a user created web page
@@ -29,6 +33,6 @@ The following are some of the things that are different from Motion.
## License
MotionPlus is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) version 3 or later.
Motion version 5.0 and later is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) version 3 or later.

22
configure.ac
View File

@@ -1,10 +1,10 @@
AC_INIT(motionplus, esyscmd(['./scripts/version.sh']))
AC_INIT(motion, esyscmd(['./scripts/version.sh']))
AM_INIT_AUTOMAKE([subdir-objects foreign])
CXXFLAGS="$CXXFLAGS -std=c++17"
AC_PROG_CC
AC_PROG_CXX
AC_CONFIG_HEADERS([config.hpp])
AC_CONFIG_SRCDIR([src/motionplus.cpp])
AC_CONFIG_SRCDIR([src/motion.cpp])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
@@ -28,7 +28,7 @@ AC_CHECK_HEADERS(stdio.h stdlib.h sys/time.h sys/wait.h \
##############################################################################
AC_CHECK_PROG([PKGCONFIG],[pkgconf],[yes],[no])
AS_IF([test "${PKGCONFIG}" = "no" ],[
AC_MSG_ERROR([Required package 'pkgconf' not found, please check motionplus_guide.html and install necessary dependencies.])
AC_MSG_ERROR([Required package 'pkgconf' not found, please check motion_guide.html and install necessary dependencies.])
]
)
@@ -55,7 +55,7 @@ AC_CHECK_HEADERS(setjmp.h jerror.h jpeglib.h,[JPGS="yes"],[JPGS="no"])
AC_MSG_CHECKING(jpg libraries)
AC_MSG_RESULT($JPGS)
AS_IF([test "${JPGS}" != "yes" ], [
AC_MSG_ERROR([Required jpeg headers not found, please check motionplus_guide.html and install necessary dependencies])
AC_MSG_ERROR([Required jpeg headers not found, please check motion_guide.html and install necessary dependencies])
]
)
CPPFLAGS="$HOLD_CPPFLAGS"
@@ -67,7 +67,7 @@ AS_IF([pkgconf libmicrohttpd ], [
TEMP_CPPFLAGS="$TEMP_CPPFLAGS "`pkgconf --cflags libmicrohttpd`
TEMP_LIBS="$TEMP_LIBS "`pkgconf --libs libmicrohttpd`
],[
AC_MSG_ERROR([Required package libmicrohttpd-dev not found, please check motionplus_guide.html and install necessary dependencies])
AC_MSG_ERROR([Required package libmicrohttpd-dev not found, please check motion_guide.html and install necessary dependencies])
]
)
HOLD_CPPFLAGS="$CPPFLAGS"
@@ -76,7 +76,7 @@ AC_CHECK_HEADERS(microhttpd.h,[MHTTP="yes"],[MHTTP="no"])
AC_MSG_CHECKING(libmicrohttpd libraries)
AC_MSG_RESULT($MHTTP)
AS_IF([test "${MHTTP}" != "yes" ], [
AC_MSG_ERROR([Required package libmicrohttpd-dev not found, please check motionplus_guide.html and install necessary dependencies])
AC_MSG_ERROR([Required package libmicrohttpd-dev not found, please check motion_guide.html and install necessary dependencies])
]
)
CPPFLAGS="$HOLD_CPPFLAGS"
@@ -88,7 +88,7 @@ AS_IF([pkgconf zlib ], [
TEMP_CPPFLAGS="$TEMP_CPPFLAGS "`pkgconf --cflags zlib`
TEMP_LIBS="$TEMP_LIBS "`pkgconf --libs zlib`
],[
AC_MSG_ERROR([Required package zlib not found, please check motionplus_guide.html and install necessary dependencies])
AC_MSG_ERROR([Required package zlib not found, please check motion_guide.html and install necessary dependencies])
]
)
HOLD_CPPFLAGS="$CPPFLAGS"
@@ -97,7 +97,7 @@ AC_CHECK_HEADERS(zlib.h,[ZLIB="yes"],[ZLIB="no"])
AC_MSG_CHECKING(zlib libraries)
AC_MSG_RESULT($ZLIB)
AS_IF([test "${ZLIB}" != "yes" ], [
AC_MSG_ERROR([Required package zlib not found, please check motionplus_guide.html and install necessary dependencies])
AC_MSG_ERROR([Required package zlib not found, please check motion_guide.html and install necessary dependencies])
]
)
CPPFLAGS="$HOLD_CPPFLAGS"
@@ -275,7 +275,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 motionplus_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 motion_guide.html and install necessary dependencies])
]
)
PKG_CONFIG_PATH=$TEMP_PATH
@@ -660,8 +660,8 @@ AC_CONFIG_FILES([
data/camera2-dist.conf
data/camera3-dist.conf
data/sound1-dist.conf
data/motionplus-dist.conf
data/motionplus-dist.service
data/motion-dist.conf
data/motion-dist.service
])
AC_OUTPUT

2
data/camera1-dist.conf.in
View File

@@ -1,4 +1,4 @@
; @prefix@/etc/motionplus/camera1.conf
; @prefix@/etc/motion/camera1.conf
;
; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@

2
data/camera2-dist.conf.in
View File

@@ -1,4 +1,4 @@
; @prefix@/etc/motionplus/camera2.conf
; @prefix@/etc/motion/camera2.conf
;
; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@

2
data/camera3-dist.conf.in
View File

@@ -1,4 +1,4 @@
; @prefix@/etc/motionplus/camera3.conf
; @prefix@/etc/motion/camera3.conf
;
; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@

30
data/camera4-dist.conf Normal file
View File

@@ -0,0 +1,30 @@
# /home/dave/source/build/etc/motion/camera4.conf
#
# This config file was generated by motion 4.7.0+dirty20240909-8d69cbf
###########################################################
# Configuration options specific to camera 4
############################################################
# User defined name for the camera.
camera_name Server room
# Numeric identifier for the camera.
camera_id 104
# Video device (e.g. /dev/video0) to be used for capturing.
video_device /dev/video0
# Image width in pixels.
width 640
# Image height in pixels.
height 480
# Text to be overlayed in the lower left corner of images
text_left
# Text to be overlayed in the lower right corner of images.
text_right Camera4\n%Y-%m-%d\n%T-%q
# File name(without extension) for movies relative to target directory
movie_filename CAM04_%t-%v-%Y%m%d%H%M%S

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

@@ -1,5 +1,5 @@
; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@
; Documentation: @prefix@/share/doc/motionplus/motionplus_guide.html
; Documentation: @prefix@/share/doc/motion/motion_guide.html
;
; This file contains only the basic configuration options to get a
; system working. There are many more options available. Please

26
data/motionplus-dist.service.in → data/motion-dist.service.in
View File

@@ -1,54 +1,54 @@
#
# This file is part of MotionPlus.
# This file is part of 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.
#
# MotionPlus is distributed in the hope that it will be useful,
# Motion 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/>.
# along with Motion. If not, see <https://www.gnu.org/licenses/>.
#
#
[Unit]
Description=MotionPlus - Enhanced security camera monitoring software.
Documentation=man:motionplus(1)
Description=Motion - Enhanced security camera monitoring software.
Documentation=man:motion(1)
After=local-fs.target network.target
[Service]
User=motion
UMask=002
ExecStart=@BIN_PATH@/motionplus
ExecStart=@BIN_PATH@/motion
Type=simple
# Set StandardError=journal to use journald to log messages from motionplus.
# See also the "log_file" config file option in motionplus(1) and systemd.service(5).
# Set StandardError=journal to use journald to log messages from motion.
# See also the "log_file" config file option in motion(1) and systemd.service(5).
StandardError=null
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
RestartSec=5
ExecStartPre=!/bin/mkdir -p /var/log/motionplus
ExecStartPre=!/bin/chown motion:adm /var/log/motionplus
ExecStartPre=!/bin/mkdir -p /var/log/motion
ExecStartPre=!/bin/chown motion:adm /var/log/motion
# Don't restart if unconfigured / misconfigured e.g. daemon disabled
# in defaults file. See also /usr/include/sysexits.h or sysexits(3)
RestartPreventExitStatus=78
# To tune restart behaviour, see systemd.unit(5) and use
# "systemctl edit motionplus" to change the following settings:
# "systemctl edit motion" to change the following settings:
#StartLimitBurst=
#StartLimitIntervalSec=
#StartLimitAction=
#FailureAction=
# The following can be used to increase the security of the
# installation, by mitigating risk from attacks on motionplus and the
# installation, by mitigating risk from attacks on motion and the
# binaries, libraries and scripts which it relies on. They are disabled
# by default in case they break existing installations, e.g. those which
# call site-local scripts which would inherit the same restrictions.
@@ -57,7 +57,7 @@ RestartPreventExitStatus=78
# http://0pointer.net/public/systemd-nluug-2014.pdf for more details
# of these and other related options.
#
# Use "systemctl edit motionplus" to change these settings.
# Use "systemctl edit motion" to change these settings.
#PrivateTmp=true
#NoNewPrivileges=yes
#PrivateNetwork=yes

69
data/motion.service Normal file
View File

@@ -0,0 +1,69 @@
#
# This systemd unit file is part of the motion project:
#
# https://motion-project.github.io/
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of version 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# 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 Lesser General Public
# License along with this program. If not, see
# <https://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
#
[Unit]
Description=Motion - monitor live video, trigger responses, record video/stills.
Documentation=man:motion(1)
After=local-fs.target network.target
[Service]
User=motion
EnvironmentFile=-/etc/default/motion
# The the sleep on the following line is needed with systemd version
# 232, otherwise the error message that we echo doesn't hit 'systemctl
# status'.
ExecStart=/bin/sh -c '([ -r "/etc/default/motion" ] && [ "x$start_motion_daemon" != "xyes" ]) && echo "Not starting motion because start_motion_daemon=$start_motion_daemon - check /etc/default/motion" && sleep 1 && exit 78 ; exec @BIN_PATH@/motion -n'
Type=simple
# Set StandardError=journal to use journald to log messages from motion.
# See also the "log_file" config file option in motion(1) and
# systemd.service(5).
StandardError=null
ExecReload=/usr/bin/kill -HUP $MAINPID
Restart=on-failure
RestartSec=5
# Don't restart if unconfigured / misconfigured e.g. daemon disabled
# in defaults file. See also /usr/include/sysexits.h or sysexits(3)
RestartPreventExitStatus=78
# To tune restart behaviour, see systemd.unit(5) and use
# "systemctl edit motion" to change the following settings:
#StartLimitBurst=
#StartLimitIntervalSec=
#StartLimitAction=
#FailureAction=
# The following can be used to increase the security of the
# installation, by mitigating risk from attacks on motion and the
# binaries, libraries and scripts which it relies on. They are disabled
# by default in case they break existing installations, e.g. those which
# call site-local scripts which would inherit the same restrictions.
#
# See systemd.exec(5) and
# http://0pointer.net/public/systemd-nluug-2014.pdf for more details
# of these and other related options.
#
# Use "systemctl edit motion" to change these settings.
#PrivateTmp=true
#NoNewPrivileges=yes
#PrivateNetwork=yes
#ProtectHome=yes
#DeviceAllow=/dev/video0
#MountFlags=slave
#SystemCallFilter=
[Install]
WantedBy=multi-user.target

2
data/sound1-dist.conf.in
View File

@@ -1,4 +1,4 @@
; @prefix@/etc/motionplus/sound1.conf
; @prefix@/etc/motion/sound1.conf
;
; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@

6
doc/INSTALL
View File

@@ -1,7 +1,7 @@
The following is a brief overview of the building and installing instructions for Debian / Ubuntu.
For full instructions on how to build and install MotionPlus, see the motionplus_build.html that is
distributed with this source code.
For full instructions on how to build and install Motion, see the motion_build.html that is
distributed with this source code.
The packages and library names change frequently and vary across base operating systems.
Adjust the following lines as required by the base operating system.
@@ -18,5 +18,5 @@ Once required packages are installed, execute:
make install
Sample custom configuration options:
--prefix : Specify the install location for the motionplus package
--prefix : Specify the install location for the motion package
--with-ffmpeg=[dir] : Specify the location in which ffmpeg/libav is installed.

2862
doc/changelog
View File

File diff suppressed because it is too large Load Diff

12
doc/code_standard
View File

@@ -1,4 +1,4 @@
Formatting for MotionPlus.
Formatting for Motion.
--------------------
RULE 1
@@ -14,12 +14,12 @@ the corresponding code above. Use common sense to enhance readability.
--------------------
RULE 3
Never use TABS to align anything. A tab may be 4 positions in one editor
and 8 in another. A space is always a space.
and 8 in another. A space is always a space.
--------------------
RULE 4
If blocks always use braces and follow K&R. Braces are free and do not cost money,
use them to clarify what you are doing.
use them to clarify what you are doing.
--------------------
RULE 5
@@ -44,11 +44,11 @@ Use // style comments for something you add temporarily while testing.
--------------------
RULE 7
Use variable names that say what the variable is used for.
Variable and function names are in lower case.
Variable and function names are in lower case.
Use '_' to separate words.
MACROS are in uppercase.
Follow the naming scheme for functions

BIN
doc/motion.gif Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

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

@@ -2,10 +2,10 @@
<html lang="en-us">
<head>
<meta charset="UTF-8">
<link href="motionplus.png" rel="icon" type="image/png">
<title>MotionPlus</title>
<link href="motion.png" rel="icon" type="image/png">
<title>Motion</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="motionplus_stylesheet.css" media="screen">
<link rel="stylesheet" type="text/css" href="motion_stylesheet.css" media="screen">
<script>
function fnc_topnav() {
var x = document.getElementById("id_topnav");
@@ -27,7 +27,7 @@
</head>
<body>
<div class="topnav" id="id_topnav">
<img class="logoimg" src="motionplus.gif">
<img class="logoimg" src="motion.gif">
<a class="topnav-d" href="https://motion-project.github.io/motion_support.html">Support</a>
<a class="topnav-d" href="https://motion-project.github.io/motion_news.html" >News</a>
@@ -72,8 +72,8 @@
<h3><a name="Install_Deb"></a> Installing with a release deb package </h3>
<ul>
MotionPlus can also be installed from the release deb files. Download the appropriate
deb from the <a href="https://github.com/Motion-Project/motionplus/releases">Releases</a> page
Motion can also be installed from the release deb files. Download the appropriate
deb from the <a href="https://github.com/Motion-Project/motion/releases">Releases</a> page
and install using <code><strong>dpkg</strong></code>
or <code><strong>gdebi-core</strong></code>.
</ul>
@@ -108,13 +108,13 @@
<p></p>
Note: PostgreSQL or Sqlite3 database may also be added
via <code><strong>sudo apt install libpq-dev libsqlite3-dev</strong></code>. If
no database is running on the system, some functionality of Motionplus will not be available.
no database is running on the system, some functionality of Motion will not be available.
<p></p>
Once packages are installed, run the following to build Motionplus
Once packages are installed, run the following to build Motion
<p></p>
<code><strong>cd ~</strong></code>
<br /><code><strong>git clone https://github.com/Motion-Project/motionplus.git</strong></code>
<br /><code><strong>cd motionplus</strong></code>
<br /><code><strong>git clone https://github.com/Motion-Project/motion.git</strong></code>
<br /><code><strong>cd motion</strong></code>
<br /><code><strong>autoreconf -fiv</strong></code>
<br /><code><strong>./configure</strong></code>
<br /><code><strong>make</strong></code>
@@ -128,7 +128,7 @@
<ul>
<p></p>
<p></p>
The following custom configure options can be specified for MotionPlus.
The following custom configure options can be specified for Motion.
<div class="tblconfig">
<table border="1" class="fixed" >
<colgroup>

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

@@ -2,10 +2,10 @@
<html lang="en-us">
<head>
<meta charset="UTF-8">
<link href="motionplus.png" rel="icon" type="image/png">
<title>MotionPlus</title>
<link href="motion.png" rel="icon" type="image/png">
<title>Motion</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="motionplus_stylesheet.css" media="screen">
<link rel="stylesheet" type="text/css" href="motion_stylesheet.css" media="screen">
<script>
function fnc_topnav() {
var x = document.getElementById("id_topnav");
@@ -28,7 +28,7 @@
<body>
<div class="topnav" id="id_topnav">
<img class="logoimg" src="motionplus.gif">
<img class="logoimg" src="motion.gif">
<a class="topnav-d" href="https://motion-project.github.io/motion_support.html">Support</a>
<a class="topnav-d" href="https://motion-project.github.io/motion_news.html" >News</a>
@@ -695,11 +695,11 @@
<td bgcolor="#edf4f9" >%{fps}</a> </td>
<td bgcolor="#edf4f9" >current frames per second</a> </td>
<td bgcolor="#edf4f9" >%{host}</a> </td>
<td bgcolor="#edf4f9" >name of computer running MotionPlus</a> </td>
<td bgcolor="#edf4f9" >name of computer running Motion</a> </td>
</tr>
<tr>
<td bgcolor="#edf4f9" >%{ver}</a> </td>
<td bgcolor="#edf4f9" >version of MotionPlus</a> </td>
<td bgcolor="#edf4f9" >version of Motion</a> </td>
<td bgcolor="#edf4f9" >%{trig_nbr}</a> </td>
<td bgcolor="#edf4f9" >sound alert number that was triggered</a> </td>
<td bgcolor="#edf4f9" >%{trig_nm}</a> </td>
@@ -725,7 +725,7 @@
<h3><a name="daemon"></a> daemon </h3>
<ul>
<li> Values: on, off | Default: off</li>
Run in daemon mode. When running MotionPlus under systemd specify as off.
Run in daemon mode. When running Motion under systemd specify as off.
</ul>
<p></p>
@@ -845,7 +845,7 @@
</ul>
<ul>
<p></p>
This parameter specifies the time of the day that Motionplus will perform
This parameter specifies the time of the day that Motion will perform
motion detection. To use this, the pause parameter must be set to schedule.
<p></p>
@@ -904,7 +904,7 @@
</ul>
<ul>
<p></p>
This parameter specifies the information used for purging older recording and pictures created by Motionplus. This option
This parameter specifies the information used for purging older recording and pictures created by Motion. This option
is only applicable if a database has been specified. The default for this parameter is an empty string which means that
no clean directory actions will be performed.
<p></p>
@@ -914,7 +914,7 @@
String specifying either <code><small>delete</small></code> or <code><small>script</small></code>. If the option
of <code><small>script</small></code> is specified, then the provided script will be executed at the specified
interval. If the option of <code><small>delete</small></code> is specified, then all files that were created
by Motionplus will be deleted from the system according to the schedule. The default for this
by Motion will be deleted from the system according to the schedule. The default for this
parameter is <code><small>delete</small></code>
</div>
<p></p>
@@ -961,7 +961,7 @@
<i><h4>removedir</h4></i>
This parameter is a boolean that specifies whether the associated directory (only one level up) should be
removed if there are no longer any files in it after the clean process has run. If there are other files
in the directory that are not created by Motionplus, then the directory will not be removed.
in the directory that are not created by Motion, then the directory will not be removed.
</div>
<p></p>
@@ -986,7 +986,7 @@
<h3><a name="watchdog_tmo"></a>watchdog_tmo</h3>
<ul>
<li> Values: Integer | Default: 90 </li>
Number of seconds that elapse before a camera is deemed to be unresponsive and MotionPlus triggers
Number of seconds that elapse before a camera is deemed to be unresponsive and Motion triggers
a watchdog timeout and begins to force the camera to shut down. When camera is initially starting, the
timeout is set to three(3) times this value.
</ul>
@@ -995,11 +995,11 @@
<h3><a name="watchdog_kill"></a>watchdog_kill</h3>
<ul>
<li> Values: Integer | Default: 0 </li>
Specifying a value of zero indicates that Motionplus will completely terminate after the watchdog_tmo.
Values greater than zero represent the number of additional seconds after the watchdog_tmo MotionPlus will wait
Specifying a value of zero indicates that Motion will completely terminate after the watchdog_tmo.
Values greater than zero represent the number of additional seconds after the watchdog_tmo Motion will wait
until camera processes are forcefully terminated. Forceful termination of camera processes will result in memory
leaks and detrimental effects therefore the default is to completely terminate the application let external processes
such as systemctl or cron jobs restart Motionplus.
such as systemctl or cron jobs restart Motion.
</ul>
<p></p>
@@ -1041,7 +1041,7 @@
<ul>
<p></p>
The configuration parameters for v4l2_params are specified by name or ID. They may also be
enclosed in double quotes. Review the MotionPlus log with log_level 8 to see the options that
enclosed in double quotes. Review the Motion log with log_level 8 to see the options that
are applicable to the device. The following is a sample output from the log and
examples of how to specify the parameters
<p></p>
@@ -1055,7 +1055,7 @@
</ul>
</div>
<p></p>
Additional MotionPlus specific options for v4l2_params are listed below.
Additional Motion specific options for v4l2_params are listed below.
</ul>
<ul>
@@ -1063,7 +1063,7 @@
<div>
<ul>
<li> Values: 0 - 20 | Default: 17</li>
Preferred color palette for MotionPlus to use for the device. See table below for the meaning of
Preferred color palette for Motion to use for the device. See table below for the meaning of
each parameter number value.
<div class="tblpaltte">
<table border="1" class="fixed" >
@@ -1449,16 +1449,16 @@
</ul>
<ul>
<p></p>
MotionPlus uses the ffmpeg libraries to process network cameras. This option is
Motion uses the ffmpeg libraries to process network cameras. This option is
a comma separated list of the ffmpeg options for the camera. In addition
to the ffmpeg options, MotionPlus includes the following additional options.
to the ffmpeg options, Motion includes the following additional options.
<p></p>
<div>
<i><h4>capture_rate</h4></i>
The number of frames per second to capture from the camera. This option should be slightly higher than
the FPS that the camera is sending image. Users can also specify the capture_rate as
<code>pts</code>. When using <code>pts</code> as the capture_rate MotionPlus will sync the timing
<code>pts</code>. When using <code>pts</code> as the capture_rate Motion will sync the timing
of the capture to match between the clock and the presentation time stamps sent from the camera.
</div>
<p></p>
@@ -1515,16 +1515,16 @@
</ul>
<ul>
<p></p>
MotionPlus uses the ffmpeg libraries to process network cameras. This option is
Motion uses the ffmpeg libraries to process network cameras. This option is
a comma separated list of the ffmpeg options for the stream specified by netcam_high_url. In addition
to the ffmpeg options, MotionPlus includes the following additional options.
to the ffmpeg options, Motion includes the following additional options.
<p></p>
<div>
<i><h4>capture_rate</h4></i>
The number of frames per second to capture from the camera. This option should be slightly higher than
the FPS that the camera is sending images. Users can also specify the capture_rate as
<code>pts</code>. When using <code>pts</code> as the capture_rate MotionPlus will sync the timing
<code>pts</code>. When using <code>pts</code> as the capture_rate Motion will sync the timing
of the capture to match between the clock and the presentation time stamps sent from the camera.
</div>
<p></p>
@@ -1726,7 +1726,7 @@
<ul>
<p></p>
This option is a comma separated list of the secondary detection model options. In addition to the
options for each of the models, MotionPlus includes the following additional options.
options for each of the models, Motion includes the following additional options.
<p></p>
<div>
@@ -2286,9 +2286,9 @@
<li> Values: mpg, mkv | Default: mpg</li>
Container to be used by timelapse video.
<ul>
<li>mpg - Creates mpg file with mpeg-2 encoding. If MotionPlus is shutdown and restarted, new
<li>mpg - Creates mpg file with mpeg-2 encoding. If Motion is shutdown and restarted, new
pictures will be appended to any previously created file with name indicated for timelapse.</li>
<li>mkv - Creates mkv file with the default encoding. If MotionPlus is shutdown and restarted,
<li>mkv - Creates mkv file with the default encoding. If Motion is shutdown and restarted,
new pictures will create a new file with the name indicated for timelapse.</li>
</ul>
</ul>
@@ -2325,12 +2325,12 @@
<h3><a name="OptDetail_Webcontrol"></a>Web Control</a> </h3>
<p></p>
These options must be placed in the motionplus.conf file and not in a camera config files.
These options must be placed in the motion.conf file and not in a camera config files.
<ul>
<h3><a name="webcontrol_port"></a> webcontrol_port </h3>
<ul>
<li>Values: 0 to 65535 | Default: 0 (disabled)</li>
The port number for the web based control of MotionPlus.
The port number for the web based control of Motion.
</ul>
<p></p>
@@ -2353,7 +2353,7 @@
<h3><a name="webcontrol_localhost"></a> webcontrol_localhost </h3>
<ul>
<li> Values: on, off | Default: on</li>
Restrict the webcontrol of MotionPlus to the localhost.
Restrict the webcontrol of Motion to the localhost.
</ul>
<p></p>
@@ -2372,14 +2372,14 @@
<li> 0: None - No configuration parameters or actions will be available.</li>
<li> 1: Limited- A limited list of parameters will be available. </li>
<li> 2: Advanced - The advanced list of parameters will be available. These
typically require MotionPlus to be restarted to become effective.</li>
typically require Motion to be restarted to become effective.</li>
<li> 3: Restricted - User IDs, passwords and "on_" commands.</li>
</ul>
The default for this parameter is 0 (none) to enhance the security of the web interface. The
setting of the webcontrol_parms is not included on the web interface and this parameter
can only be specified via the configuration file.
<p></p>
Once MotionPlus has been configured, it is advised to complete the setup by setting
Once Motion has been configured, it is advised to complete the setup by setting
this value to zero.
</ul>
<p></p>
@@ -2553,9 +2553,9 @@
<i><h4>offset_col</h4></i>
<ul>
<li> Values: positive and negative integers | Default: 0 </li>
On the consolidated image, Motionplus will arrange the image of
On the consolidated image, Motion will arrange the image of
the camera into the row and columns indicated by the other parameters.
After the image is positioned, Motionplus centers the image in the
After the image is positioned, Motion centers the image in the
row and column grid space. This parameter allows the user to move the image
to the left(negative values) or right(positive values) from that center position.
<p></p>
@@ -2567,9 +2567,9 @@
<i><h4>offset_row </h4></i>
<ul>
<li> Values: positive and negative integers | Default: 0 </li>
On the consolidated image, Motionplus will arrange the image of
On the consolidated image, Motion will arrange the image of
the camera into the row and columns indicated by the other parameters.
After the image is positioned, Motionplus centers the image in the
After the image is positioned, Motion centers the image in the
row and column grid space. This parameter allows the user to move the image
up (negative values) or down(positive values) from that center position.
<p></p>
@@ -2617,7 +2617,7 @@
than the mjpg option but allows for a higher number of cameras to get around the
browser concurrent connection limits.</li>
<br><li>`combined`<br>The webcontrol page uses a combined single mjpg stream. The
combined single mjpg stream is constructed by Motionplus from all of the cameras
combined single mjpg stream is constructed by Motion from all of the cameras
currently running.</li>
</ul>
</ul>
@@ -2675,7 +2675,7 @@
</ul>
<h3><a name="OptDetail_Database"></a>Database</h3>
Only one database can be used by MotionPlus at a time. These options must be placed in the motionplus.conf
Only one database can be used by Motion at a time. These options must be placed in the motion.conf
file and not in a camera config files.
<ul>
<h3><a name="database_type"></a> database_type </h3>
@@ -3035,7 +3035,7 @@
<h2><a name="command_line_options"></a> Command Line Options </h2>
<ul>
<p></p>
<code>motionplus [ -hbnsm ] [ -c config file path ] [ -d level ] [ -k level ] [ -p pid_file ] [ -l log_file ]</code>
<code>motion [ -hbnsm ] [ -c config file path ] [ -d level ] [ -k level ] [ -p pid_file ] [ -l log_file ]</code>
<p></p>
<ul>
<li>-c : Full path and filename of config file.</li>
@@ -3055,23 +3055,23 @@
<h2><a name="config_files"></a> The Configuration Files </h2>
<ul>
<p></p>
MotionPlus will search for the configuration file called 'motionplus.conf' in the following order:
Motion will search for the configuration file called 'motion.conf' in the following order:
<p></p>
<ol>
<li> Current directory where motionplus was invoked</li>
<li> The directory called '.motionplus' in the current users home directory</li>
<li> The sub directory of lib/motionplus from the directory defined
<li> Current directory where motion was invoked</li>
<li> The directory called '.motion' in the current users home directory</li>
<li> The sub directory of lib/motion from the directory defined
by --localstatedir=DIR during the configure step of installation. If this was
not defined, it will default to /var/lib/motionplus or /usr/local/var/lib/motionplus
not defined, it will default to /var/lib/motion or /usr/local/var/lib/motion
depending upon your system</li>
<li> The directory defined by --sysconfdir=DIR during the configure step of installation.
If this was not defined, it will default to /etc/motionplus or /usr/local/etc/motionplus
If this was not defined, it will default to /etc/motion or /usr/local/etc/motion
depending upon your system. Please note that the use of this directory for the configuration
files is deprecated. Some significant functionality of Motionplus will not be available
files is deprecated. Some significant functionality of Motion will not be available
if the configuration files are in this directory.</li>
</ol>
<p></p>
The motionplus.conf file specifies parameters for the entire MotionPlus application and defaults for
The motion.conf file specifies parameters for the entire Motion application and defaults for
each camera. Specifications that are unique to each camera are included in separate files.
<p></p>
@@ -3081,7 +3081,7 @@
<ul>
<p></p>
A signal can be sent from the command line by typing
e.g. <code>kill -s SIGHUP pid</code>, where the last parameter is the process ID for MotionPlus.
e.g. <code>kill -s SIGHUP pid</code>, where the last parameter is the process ID for Motion.
<p></p>
<div class="tblsignal">
<table border="1" class="fixed" >
@@ -3103,11 +3103,11 @@
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > SIGTERM </td>
<td bgcolor="#edf4f9" word-wrap:break-word > If needed MotionPlus will create an movie file of the last event and exit </td>
<td bgcolor="#edf4f9" word-wrap:break-word > If needed Motion will create an movie file of the last event and exit </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > SIGUSR1 </td>
<td bgcolor="#edf4f9" word-wrap:break-word > MotionPlus will create an movie file of the current event. </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Motion will create an movie file of the current event. </td>
</tr>
</tbody>
</table>

82
doc/motionplus_examples.html → doc/motion_examples.html
View File

@@ -2,10 +2,10 @@
<html lang="en-us">
<head>
<meta charset="UTF-8">
<link href="motionplus.png" rel="icon" type="image/png">
<title>MotionPlus</title>
<link href="motion.png" rel="icon" type="image/png">
<title>Motion</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="motionplus_stylesheet.css" media="screen">
<link rel="stylesheet" type="text/css" href="motion_stylesheet.css" media="screen">
<script>
function fnc_topnav() {
var x = document.getElementById("id_topnav");
@@ -19,7 +19,7 @@
</head>
<body>
<div class="topnav" id="id_topnav">
<img class="logoimg" src="motionplus.gif">
<img class="logoimg" src="motion.gif">
<a class="topnav-d" href="https://motion-project.github.io/motion_support.html">Support</a>
<a class="topnav-d" href="https://motion-project.github.io/motion_news.html" >News</a>
@@ -44,7 +44,7 @@
<h3><a name="Examples"></a> Examples</h3>
<ul>
The following provides some sample configuration options and examples for MotionPlus.
The following provides some sample configuration options and examples for Motion.
<li> <a href="#persistent_device"> Persistent v4l2 device name </a></li>
<li> <a href="#extpipe_commands"> Sample extpipe commands </a></li>
<li> <a href="#loopback_setup">Loopback device setup</a></li>
@@ -133,12 +133,12 @@
<h3><a name="ffmpeg_input_device"></a>Use ffmpeg as input device</h3>
<ul>
Sometimes the particular device is not function for MotionPlus but does work with FFmpeg. In
this situation the device can be setup to be used in MotionPlus using FFMpeg as an intermediate
Sometimes the particular device is not function for Motion but does work with FFmpeg. In
this situation the device can be setup to be used in Motion using FFMpeg as an intermediate
application. The process would be to set up a loopback device and then have FFmpeg feed the
video into that device and then Motion can read from it. The following are some examples. First set up
the loopback device and set it to /dev/video0. Then start ffmpeg using options such as the following.
<code> ffmpeg -re -i mymovie.mp4 -f v4l2 /dev/video0 </code> Then in a separate terminal, start MotionPlus
<code> ffmpeg -re -i mymovie.mp4 -f v4l2 /dev/video0 </code> Then in a separate terminal, start Motion
with it set to use the <code>/dev/video0</code> device as input. This method can can also be used to
reformat the content to a different format. The following outputs the original movie into a gray pixel format.
<code> ffmpeg -re -i mymovie.mp4 -f v4l2 -pix_fmt gray /dev/video0 </code>
@@ -146,16 +146,16 @@
<h3><a name="database_setup"></a>Database Setup</h3>
<ul>
If a database is specified in the MotionPlus configuration, upon start up, MotionPlus will check for a table in
the database called "motionplus" and if it is not found, it will create it. This MotionPlus specific table is
required so that movies can be displayed on the webcontrol page. It tracks the movies created by MotionPlus along
If a database is specified in the Motion configuration, upon start up, Motion will check for a table in
the database called "motion" and if it is not found, it will create it. This Motion specific table is
required so that movies can be displayed on the webcontrol page. It tracks the movies created by Motion along
with the various metadata about the movies. The following is a brief overview of how to create a simple database
and specify it within the MotionPlus parameters so recordings can be downloaded from the webcontrol.
and specify it within the Motion parameters so recordings can be downloaded from the webcontrol.
<ul>
<div>
<i><h4>sqlite3</h4></i>
This database type is by far the easiest to set up since it is file based. Simply provide the
parameters in the MotionPlus configuration parameters
parameters in the Motion configuration parameters
<ul>
<small><small><code>
database_type sqlite3
@@ -163,7 +163,7 @@
</code></small></small>
</ul>
While this is the easiest to set up, it has also been observed that it can at times be unstable. This
is especially true if the database file is included as part of a archive process while in use by MotionPlus.
is especially true if the database file is included as part of a archive process while in use by Motion.
</div>
<p></p>
@@ -184,8 +184,8 @@
mariadb -u YourUserNameHere -p
<ul>
{enter YourPasswordHere}
<br>create database motionplus;
<br>use motionplus;
<br>create database motion;
<br>use motion;
<br>quit;
</ul>
</code></small></small>
@@ -198,11 +198,11 @@
</code></small></small>
</ul>
Specify the following in the MotionPlus configuration parameters.
Specify the following in the Motion configuration parameters.
<ul>
<small><small><code>
database_type mariadb
<br>database_dbname motionplus
<br>database_dbname motion
<br>database_host localhost
<br>database_port 3306
<br>database_user YourUserNameHere
@@ -225,8 +225,8 @@
<br>sudo -u postgres psql
<ul>
CREATE ROLE 'your_username_here' LOGIN PASSWORD 'YourPasswordHere';
<br>CREATE DATABASE motionplus WITH OWNER = your_username_here;
<br>GRANT ALL PRIVILEGES ON DATABASE motionplus TO your_username_here;
<br>CREATE DATABASE motion WITH OWNER = your_username_here;
<br>GRANT ALL PRIVILEGES ON DATABASE motion TO your_username_here;
<br>\quit
</ul>
</code></small></small>
@@ -243,14 +243,14 @@
username only seems to accept lowercase)
<ul>
<small><small><code>
psql -h localhost -d motionplus -U your_username_here -p 5432
psql -h localhost -d motion -U your_username_here -p 5432
</code></small></small>
Specify the following in the MotionPlus configuration parameters.
Specify the following in the Motion configuration parameters.
<ul>
<small><small><code>
database_type postgresql
<br>database_dbname motionplus
<br>database_dbname motion
<br>database_host localhost
<br>database_port 5432
<br>database_user your_username_here
@@ -313,7 +313,7 @@
<li><code>pause_schedule</code>Allow schedule to pause or enable motion detection</li>
<li><code>restart</code>Restart camera</li>
<li><code>stop</code>Stop camera</li>
<li><code>config_write</code>Write out the configuration to file. User account running Motionplus must have write access to directory</li>
<li><code>config_write</code>Write out the configuration to file. User account running Motion must have write access to directory</li>
<li><code>camera_add</code>Add a camera</li>
<li><code>camera_delete</code>Delete camera</li>
<li><code>config</code>Set configuration item</li>
@@ -334,7 +334,7 @@
<h3><a name="haar_setup"></a>HAAR setup</h3>
<ul>
<li>Set the following Motionplus items within the secondardy_params</li>
<li>Set the following Motion items within the secondardy_params</li>
<ul>
<li><code>frame_interval</code>Default: 5 | The number of images between each secondary detection</li>
<li><code>image_type</code>Default: full | Type of image to process through secondary detection</li>
@@ -400,7 +400,7 @@
<ul>
The OpenCV documentation is the definitive source for instructions on how to train
a Haar model. This brief introduction only provides a few scripts that may be
helpful in using MotionPlus to get positive and negative images to feed into the
helpful in using Motion to get positive and negative images to feed into the
training process.
<br>
<br>Start with creating positive images movie as input file.
@@ -442,25 +442,25 @@
<h3><a name="sound_sample"></a>Sound Frequency Sample</h3>
<ul>
Since sound frequency processing is new to MotionPlus, the following provides an illustrative sample of setting
up the sound and the associated alerts processing. This example will use ALSA. For PulseAudio, MotionPlus uses
the default audio recording device. Although MotionPlus has parameters for the PulseAudio server and device,
Since sound frequency processing is new to Motion, the following provides an illustrative sample of setting
up the sound and the associated alerts processing. This example will use ALSA. For PulseAudio, Motion uses
the default audio recording device. Although Motion has parameters for the PulseAudio server and device,
the set up is not straight forward and it is just recommended to change the PulseAudio default.
<br>
<br>Go to the command prompt and use <small><code>arecord -l</code></small> to get the
device name such as <small><code>hw:1,0</code></small>
<br>Specify log_level 8 in MotionPlus.conf
<br>Specify log_level 8 in Motion.conf
<br>Do not specify a log file so that it is console output.
<br>Specify snd_device and snd_show in the sound configuration file such as
<br><small><code>snd_device hw:1,0</code></small>
<br><small><code>snd_show on</code></small>
<br>Start MotionPlus and make a noise to test the output.
<br>Once MotionPlus responds to sounds, press the test button on the device to be monitored.
<br>Start Motion and make a noise to test the output.
<br>Once Motion responds to sounds, press the test button on the device to be monitored.
<br>Note that while the various devices being monitored may be the same, the detected frequency from
each may be slightly different. Care should be taken to not be too precise in the setting of the alert
range for MotionPlus. For example, the frequency may be reported as 3402.2456 and MotionPlus can be
range for Motion. For example, the frequency may be reported as 3402.2456 and Motion can be
set up to look for that precise number but devices age and the frequency may change. Also, note that the
frequency resolution of MotionPlus is limited by the sample rate and frames from the audio device.
frequency resolution of Motion is limited by the sample rate and frames from the audio device.
The maximum resolution is determined by the following formula. Sample Rate / (frames * 2). So with the
default sample rate of 44100hz, and frames of 2048, the maximum resolution is appoximately 10.7666hz. This
means that the frequencies detected around the range reported above would be 3413.0122, 3402.2456
@@ -491,7 +491,7 @@
<br>&nbsp; MYSTR=""
<br>&nbsp; MYSTR=$MYSTR" -f \"Friendly Name <SendingEmailAddress@gwhatever.com>\" "
<br>&nbsp; MYSTR=$MYSTR" -t \"DestinationEmailAddress@gwhatever.com\" "
<br>&nbsp; MYSTR=$MYSTR" -u \"MotionPlus Notification\" "
<br>&nbsp; MYSTR=$MYSTR" -u \"Motion Notification\" "
<br>&nbsp; MYSTR=$MYSTR" -s \"smtp.gwhatever.com:587\" "
<br>&nbsp; MYSTR=$MYSTR" -xu \"SendingEmailAddress@gwhatever.com\" "
<br>&nbsp; MYSTR=$MYSTR" -xp \"SendingEmailPassword\" "
@@ -537,7 +537,7 @@
Install fail2ban and create the following files:
<br>File 1:
<small><small><code><ul>
<br>&nbsp;# Fail2Ban configuration file: /etc/fail2ban/filter.d/motionplus.conf
<br>&nbsp;# Fail2Ban configuration file: /etc/fail2ban/filter.d/motion.conf
<br>&nbsp;# Author: Mr Dave
<br>&nbsp;#
<br>&nbsp;[INCLUDES]
@@ -566,11 +566,11 @@
</ul></code></small></small>
<br>File2:
<small><small><code><ul>
<br>&nbsp;#Fail2Ban Jail Configuration File: /etc/fail2ban/jail.d/motionplus-jail.conf
<br>&nbsp;[motionplus]
<br>&nbsp;#Fail2Ban Jail Configuration File: /etc/fail2ban/jail.d/motion-jail.conf
<br>&nbsp;[motion]
<br>&nbsp;enabled = true
<br>&nbsp;filter = motionplus
<br>&nbsp;logpath = /var/log/motionplus/motionplus.log
<br>&nbsp;filter = motion
<br>&nbsp;logpath = /var/log/motion/motion.log
<br>&nbsp;bantime = 23h
<br>&nbsp;banaction = iptables-allports[blocktype="DROP"]
<br>&nbsp;maxretry = 0
@@ -598,7 +598,7 @@
<br>
<a href="https://github.com/Mr-Dave/camxmctl">camxmctl</a> is a c++ program with a sample HTML page that makes adjusting the parameters
easier. It reuses some of the code from Motionplus and is based upon the JSON files and commands in the
easier. It reuses some of the code from Motion and is based upon the JSON files and commands in the
<a href="https://github.com/667bdrm/sofiactl">sofiactl</a> script.
<br> Adjust location, timing, cameraip, user, etc as appropriate.
<small><small><code><ul>

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

@@ -2,10 +2,10 @@
<html lang="en-us">
<head>
<meta charset="UTF-8">
<link href="motionplus.png" rel="icon" type="image/png">
<title>MotionPlus</title>
<link href="motion.png" rel="icon" type="image/png">
<title>Motion</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="motionplus_stylesheet.css" media="screen">
<link rel="stylesheet" type="text/css" href="motion_stylesheet.css" media="screen">
<script>
function fnc_topnav() {
var x = document.getElementById("id_topnav");
@@ -19,7 +19,7 @@
</head>
<body>
<div class="topnav" id="id_topnav">
<img class="logoimg" src="motionplus.gif">
<img class="logoimg" src="motion.gif">
<a class="topnav-d" href="https://motion-project.github.io/motion_support.html">Support</a>
<a class="topnav-d" href="https://motion-project.github.io/motion_news.html" >News</a>
@@ -44,14 +44,14 @@
<h3><a name="Current_Release"></a> Latest Stable Release</h3>
<ul>
<li> <a href="motionplus_build.html"> Building from source </a></li>
<li> <a href="motionplus_config.html"> Configuration Options </a></li>
<li> <a href="motionplus_examples.html"> Examples</a></li>
<li> <a href="motion_build.html"> Building from source </a></li>
<li> <a href="motion_config.html"> Configuration Options </a></li>
<li> <a href="motion_examples.html"> Examples</a></li>
<p></p>
<p></p>
</ul>
<p></p>
Short videos demonstrating the Motion software can also be viewed
Short videos demonstrating the Motion software can also be viewed
<a href="https://www.youtube.com/channel/UCZpOjUMnc-uO3qIyZAD_4lg/videos"> here</a>.
<p></p>

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

BIN
doc/motionplus.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

4
doc/samplepage.html
View File

@@ -2,7 +2,7 @@
<html lang='en'>
<head>
<meta charset='UTF-8'>
<title>MotionPlusSamplePage</title>
<title>MotionSamplePage</title>
<meta name='viewport' content='width=device-width, initial-scale=1'>
<style>
* {
@@ -496,7 +496,7 @@
}
function assign_version() {
var verstr ='<a>MotionPlus \n'+pData['version'] +'</a>';
var verstr ='<a>Motion \n'+pData['version'] +'</a>';
document.getElementById('divnav_version').innerHTML = verstr;
}

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

@@ -1,20 +1,20 @@
.TH MOTION 1 2022-03-13 "MotionPlus" "MotionPlus Options and Config Files"
.TH MOTION 1 2022-03-13 "Motion" "Motion Options and Config Files"
.SH NAME
MotionPlus \- Detect motion using a video4linux device or network camera
Motion \- Detect motion using a video4linux device or network camera
.SH SYNOPSIS
.B motionplus [ \-hbnsm ] [ \-c config file path ] [ \-d level ] [ \-k level ] [ \-p pid_file ][ \-l log_file ]
.B motion [ \-hbnsm ] [ \-c config file path ] [ \-d level ] [ \-k level ] [ \-p pid_file ][ \-l log_file ]
.SH DESCRIPTION
.I MotionPlus
.I Motion
uses a video4linux device or network camera to detect motion. If motion is detected both normal
and motion pictures can be taken. MotionPlus can also take actions to notify you
and motion pictures can be taken. Motion can also take actions to notify you
if needed. Creation of automated snapshots is also possible.
.SH OPTIONS
.TP
.B \-c
Full path and filename of config file.
For example: \fI /home/kurt/motionplus.conf \fR
The default is \fI /usr/local/etc/motionplus\fR unless specified differently when building MotionPlus.
Many RPMs and Debian packages will use \fI/etc\fR or \fI/etc/motionplus\fR as the default.
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.
.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/motionplus.pid. Default is not defined. Pid file is only created when MotionPlus is started in daemon mode.
Full path and filename for process id file (pid file). E.g /var/run/motion.pid. Default is not defined. Pid file is only created when Motion is started in daemon mode.
.TP
.B \-m
Start in pause mode.
@@ -58,7 +58,7 @@ Default: off
Description:
.fi
.RS
When specified as ON, MotionPlus goes into daemon (background process) mode and releases the terminal.
When specified as ON, Motion goes into daemon (background process) mode and releases the terminal.
.RE
.RE
@@ -158,13 +158,13 @@ User specified string to describe the device.
.RS
.nf
Values: Numeric identification number for the device
Default: The order in which the device is opened by MotionPlus
Default: The order in which the device is opened by Motion
Description:
.fi
.RS
Use this option to assign a number to each camera that is consistent every time that MotionPlus is started.
By default MotionPlus will assign a number based upon the sequence in which it reads the configuration and this
sequence may not be the same every time that MotionPlus starts.
Use this option to assign a number to each camera that is consistent every time that 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.
.RE
.RE
@@ -180,12 +180,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 motionplus.conf file and values are overwritten from each
camera file. While the motionplus.conf includes four sample camera files, the actual
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
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 motionplus.conf file AND camera1.conf and camera2.conf.
The motion.conf file AND camera1.conf and camera2.conf.
only put the options that are unique to each camera in the
camera config files.
.RE
@@ -245,7 +245,7 @@ Description:
.RS
String to specify the parameters to pass in for a videodevice. The parameters
permitted are dependent upon the device. This only applies to V4L2 devices. The
MotionPlus log reports all the available options for the device.
Motion log reports all the available options for the device.
.RE
.RE
@@ -282,8 +282,8 @@ Default: 17
Description:
.fi
.RS
The v4l2_palette option allows users to choose the preferred palette to be use by MotionPlus to capture from the video device.
If the preferred palette is not available from the video device, MotionPlus will attempt to use palettes that are supported.
The v4l2_palette option allows users to choose the preferred palette to be use by 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.
.RE
.RE
@@ -695,7 +695,7 @@ Description:
.fi
.RS
When specified, draw the number of changed pixed on the images.
This option will normally be set to off except when you setup and adjust the MotionPlus settings.
This option will normally be set to off except when you setup and adjust the Motion settings.
The text is placed in upper right corner of the image.
.RE
.RE
@@ -1212,7 +1212,7 @@ A value of 1 is worst quality versus a value of 100 is best quality.
.nf
Values:
.RS
MotionPlus videos:
Motion videos:
.RS
mpeg4 - Creates .avi file
msmpeg4 - Creates .avi file
@@ -1369,9 +1369,9 @@ Default: mpg
Description:
.fi
.RS
For mpg timelapse videos, if MotionPlus is shutdown and restarted, new pics will be appended
For mpg timelapse videos, if Motion is shutdown and restarted, new pics will be appended
to any previously created file with name indicated for timelapse.
For mpeg4 timelapse videos, if MotionPlus is shutdown and restarted, new pics will create a
For mpeg4 timelapse videos, if Motion is shutdown and restarted, new pics will create a
new file with the name indicated for timelapse.
.RE
.RE
@@ -2107,16 +2107,16 @@ Show the sound frequencies being detected.
.RE
.SH SIGNALS
MotionPlus responds to the following signals:
Motion responds to the following signals:
.TP
.B SIGHUP
The config file will be reread.
.TP
.B SIGTERM
If needed MotionPlus will create an movie file of the last event and exit
If needed Motion will create an movie file of the last event and exit
.TP
.B SIGUSR1
MotionPlus will create an movie file of the current event.
Motion will create an movie file of the current event.
.SH NOTES
.TP
.B Snapshot
@@ -2129,49 +2129,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 MotionPlus was invoked with command line option \-c pathname MotionPlus will expect the config file to be as specified. When you specify the config file on the command line with \-c you can call it anything.
If 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.
.br
If you do not specify \-c or the filename you give MotionPlus does not exist, MotionPlus will search for the configuration file called 'motionplus.conf' in the following order:
If you do not specify \-c or the filename you give Motion does not exist, Motion will search for the configuration file called 'motion.conf' in the following order:
.br
1. Current directory from where MotionPlus was invoked
1. Current directory from where Motion was invoked
.br
2. Then in a directory called '.motionplus' in the current users home directory (shell environment variable $HOME). E.g. /home/goofy/.motionplus/motionplus.conf
2. Then in a directory called '.motion' in the current users home directory (shell environment variable $HOME). E.g. /home/goofy/.motion/motion.conf
.br
3. The motionplus subdirectory inside the directory defined by the \-\-sysconfdir=DIR when running .configure during installation of MotionPlus (If this option was not defined the default is /usr/local/etc/)
3. The 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/)
.br
If you have write access to /usr/local/etc/motionplus then the editor recommends having only one motionplus.conf file in the default /usr/local/etc/motionplus directory.
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.
.br
MotionPlus has a configuration file in the distribution package called motionplus-dist.conf. When you run 'make install' this files gets copied to the /usr/local/etc/motionplus directory.
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.
.br
The configuration file needs to be renamed from motionplus-dist.conf to motionplus.conf. The original file is called motionplus-dist.conf so that your perfectly working motionplus.conf file does not accidentally get overwritten when you re-install or upgrade to a newer version of MotionPlus.
The configuration file needs to be renamed from 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.
.br
If you have more than one camera you should not try and invoke MotionPlus more times. MotionPlus is made to work with more than one camera in a very elegant way and the way to do it is to create a number of camera config files. MotionPlus will then create an extra thread of itself for each camera. If you only have one camera you only need the motionplus.conf file. The minute you have two or more cameras you must have one camera config file per camera besides the motionplus.conf file.
If you have more than one camera you should not try and invoke 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.
.br
So if you have for example two cameras you need motionplus.conf and two camera config files. Total of 3 config files.
So if you have for example two cameras you need motion.conf and two camera config files. Total of 3 config files.
.br
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).
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).
.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 motionplus.conf. The 2nd camera is defined in the 2nd camera file called from motionplus.conf etc.
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.
.br
Any option defined in motionplus.conf will be used for all cameras except for the cameras in which the same option is defined in a camera config file.
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.
.br
MotionPlus reads its configuration parameters in the following sequence. If the same parameter exists more than one place the last one read wins.
Motion reads its configuration parameters in the following sequence. If the same parameter exists more than one place the last one read wins.
.br
1. MotionPlus reads the configuration file motionplus.conf from the beginning of the file going down line by line.
1. Motion reads the configuration file motion.conf from the beginning of the file going down line by line.
.br
2. If the option "camera" is defined in motionplus.conf, the camera configuration file(s) is/(are) read.
2. If the option "camera" is defined in motion.conf, the camera configuration file(s) is/(are) read.
.br
3. MotionPlus continues reading the rest of the motionplus.conf file. Any options from here will overrule the same option previously defines in a camera config file.
3. 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.
.br
4. MotionPlus reads the command line option again overruling any previously defined options.
4. Motion reads the command line option again overruling any previously defined options.
.br
So always call the camera config files in the end of the motionplus.conf file. If you define options in motionplus.conf AFTER the camera file calls, the same options in the camera files will never be used. So always put the camera file call at the end of motionplus.conf.
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.
.br
If MotionPlus is built without specific features such as ffmpeg, MariaDB etc it will ignore the options that belongs to these features. You do not have to remove them or comment them out.
If Motion is built without specific features such as ffmpeg, MariaDB etc it will ignore the options that belongs to these features. You do not have to remove them or comment them out.
.br
If you run the http control command http://host:port/0/config/writeyes, MotionPlus will overwrite motionplus.conf and all the camera.conf files by autogenerated config files neatly formatted and only with the features included that MotionPlus was built with. If you later re-build MotionPlus with more features or upgrade to a new version, you can use your old config files, run the motionplus.conf.write command, and you will have new config files with the new options included all set to their default values. This makes upgrading very easy to do.
If you run the http control command http://host:port/0/config/writeyes, 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.
.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.
@@ -2201,7 +2201,7 @@ Text defined by the text_event feature
The day of the month as a decimal number (range 01 to 31).
.TP
.B %D
Number of pixels detected as MotionPlus. If labelling is enabled the number is the number of pixels in the largest labelled motion area.
Number of pixels detected as Motion. 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.
@@ -2333,13 +2333,13 @@ The computer host name
The frame per seconds.
.TP
.B %{ver}
The version number of MotionPlus.
The version number of Motion.
.TP
.B More information
MotionPlus homepage: TBD
Motion homepage: TBD
MotionPlus Guide (user and installation guide):
.br /usr/share/doc/motionplus/motionplus_guide.html
Motion Guide (user and installation guide):
.br /usr/share/doc/motion/motion_guide.html

2
po/POTFILES.in
View File

@@ -21,6 +21,6 @@ src/draw.cpp
src/camera.cpp
src/sound.cpp
src/webu_file.cpp
src/motionplus.cpp
src/motion.cpp
src/util.cpp
src/webu_html.cpp

1574
po/da.po
View File

File diff suppressed because it is too large Load Diff

1574
po/de.po
View File

File diff suppressed because it is too large Load Diff

1574
po/es.po
View File

File diff suppressed because it is too large Load Diff

1574
po/fi.po
View File

File diff suppressed because it is too large Load Diff

1574
po/fr.po
View File

File diff suppressed because it is too large Load Diff

1574
po/it.po
View File

File diff suppressed because it is too large Load Diff

1568
po/ja.po
View File

File diff suppressed because it is too large Load Diff

1566
po/ko.po
View File

File diff suppressed because it is too large Load Diff

1574
po/li.po
View File

File diff suppressed because it is too large Load Diff

1574
po/nl.po
View File

File diff suppressed because it is too large Load Diff

1574
po/no.po
View File

File diff suppressed because it is too large Load Diff

1574
po/pt.po
View File

File diff suppressed because it is too large Load Diff

1574
po/sv.po
View File

File diff suppressed because it is too large Load Diff

1574
po/zh.po
View File

File diff suppressed because it is too large Load Diff

383
rename.patch Normal file
View File

@@ -0,0 +1,383 @@
From 5d8f33e4ecf3715580f1353eadbcae68d0fc65f3 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Tue, 4 Feb 2025 14:57:34 -0700
Subject: [PATCH] Rename files to prepare for merge with 5.0 branch
---
doc/{CHANGELOG => changelog} | 0
doc/{CODE_STANDARD => code_standard} | 0
src/{alg.c => alg.cpp} | 0
src/{alg.h => alg.hpp} | 0
src/{conf.c => conf.cpp} | 0
src/{conf.h => conf.hpp} | 0
src/{dbse.c => dbse.cpp} | 0
src/{dbse.h => dbse.hpp} | 0
src/{draw.c => draw.cpp} | 0
src/{draw.h => draw.hpp} | 0
src/{event.c => event.cpp} | 0
src/{event.h => event.hpp} | 0
src/{ffmpeg.c => ffmpeg.cpp} | 0
src/{ffmpeg.h => ffmpeg.hpp} | 0
src/{jpegutils.c => jpegutils.cpp} | 0
src/{jpegutils.h => jpegutils.hpp} | 0
src/{logger.c => logger.cpp} | 0
src/{logger.h => logger.hpp} | 0
src/{mmx.h => mmx.hpp} | 0
src/{motion.c => motion.cpp} | 0
src/{motion.h => motion.hpp} | 0
src/{netcam.c => netcam.cpp} | 0
src/{netcam.h => netcam.hpp} | 0
src/{netcam_ftp.c => netcam_ftp.cpp} | 0
src/{netcam_ftp.h => netcam_ftp.hpp} | 0
src/{netcam_http.c => netcam_http.cpp} | 0
src/{netcam_http.h => netcam_http.hpp} | 0
src/{netcam_jpeg.c => netcam_jpeg.cpp} | 0
src/{netcam_jpeg.h => netcam_jpeg.hpp} | 0
src/{netcam_rtsp.c => netcam_rtsp.cpp} | 0
src/{netcam_rtsp.h => netcam_rtsp.hpp} | 0
src/{netcam_wget.c => netcam_wget.cpp} | 0
src/{netcam_wget.h => netcam_wget.hpp} | 0
src/{picture.c => picture.cpp} | 0
src/{picture.h => picture.hpp} | 0
src/{pwc-ioctl.h => pwc-ioctl.hpp} | 0
src/{rotate.c => rotate.cpp} | 0
src/{rotate.h => rotate.hpp} | 0
src/{track.c => track.cpp} | 0
src/{track.h => track.hpp} | 0
src/{translate.c => translate.cpp} | 0
src/{translate.h => translate.hpp} | 0
src/{util.c => util.cpp} | 0
src/{util.h => util.hpp} | 0
src/{video_bktr.c => video_bktr.cpp} | 0
src/{video_bktr.h => video_bktr.hpp} | 0
src/{video_common.c => video_common.cpp} | 0
src/{video_common.h => video_common.hpp} | 0
src/{video_loopback.c => video_loopback.cpp} | 0
src/{video_loopback.h => video_loopback.hpp} | 0
src/{video_v4l2.c => video_v4l2.cpp} | 0
src/{video_v4l2.h => video_v4l2.hpp} | 0
src/{webu.c => webu.cpp} | 0
src/{webu.h => webu.hpp} | 0
src/{webu_html.c => webu_html.cpp} | 0
src/{webu_html.h => webu_html.hpp} | 0
src/{webu_status.c => webu_status.cpp} | 0
src/{webu_status.h => webu_status.hpp} | 0
src/{webu_stream.c => webu_stream.cpp} | 0
src/{webu_stream.h => webu_stream.hpp} | 0
src/{webu_text.c => webu_text.cpp} | 0
src/{webu_text.h => webu_text.hpp} | 0
62 files changed, 0 insertions(+), 0 deletions(-)
rename doc/{CHANGELOG => changelog} (100%)
rename doc/{CODE_STANDARD => code_standard} (100%)
rename src/{alg.c => alg.cpp} (100%)
rename src/{alg.h => alg.hpp} (100%)
rename src/{conf.c => conf.cpp} (100%)
rename src/{conf.h => conf.hpp} (100%)
rename src/{dbse.c => dbse.cpp} (100%)
rename src/{dbse.h => dbse.hpp} (100%)
rename src/{draw.c => draw.cpp} (100%)
rename src/{draw.h => draw.hpp} (100%)
rename src/{event.c => event.cpp} (100%)
rename src/{event.h => event.hpp} (100%)
rename src/{ffmpeg.c => ffmpeg.cpp} (100%)
rename src/{ffmpeg.h => ffmpeg.hpp} (100%)
rename src/{jpegutils.c => jpegutils.cpp} (100%)
rename src/{jpegutils.h => jpegutils.hpp} (100%)
rename src/{logger.c => logger.cpp} (100%)
rename src/{logger.h => logger.hpp} (100%)
rename src/{mmx.h => mmx.hpp} (100%)
rename src/{motion.c => motion.cpp} (100%)
rename src/{motion.h => motion.hpp} (100%)
rename src/{netcam.c => netcam.cpp} (100%)
rename src/{netcam.h => netcam.hpp} (100%)
rename src/{netcam_ftp.c => netcam_ftp.cpp} (100%)
rename src/{netcam_ftp.h => netcam_ftp.hpp} (100%)
rename src/{netcam_http.c => netcam_http.cpp} (100%)
rename src/{netcam_http.h => netcam_http.hpp} (100%)
rename src/{netcam_jpeg.c => netcam_jpeg.cpp} (100%)
rename src/{netcam_jpeg.h => netcam_jpeg.hpp} (100%)
rename src/{netcam_rtsp.c => netcam_rtsp.cpp} (100%)
rename src/{netcam_rtsp.h => netcam_rtsp.hpp} (100%)
rename src/{netcam_wget.c => netcam_wget.cpp} (100%)
rename src/{netcam_wget.h => netcam_wget.hpp} (100%)
rename src/{picture.c => picture.cpp} (100%)
rename src/{picture.h => picture.hpp} (100%)
rename src/{pwc-ioctl.h => pwc-ioctl.hpp} (100%)
rename src/{rotate.c => rotate.cpp} (100%)
rename src/{rotate.h => rotate.hpp} (100%)
rename src/{track.c => track.cpp} (100%)
rename src/{track.h => track.hpp} (100%)
rename src/{translate.c => translate.cpp} (100%)
rename src/{translate.h => translate.hpp} (100%)
rename src/{util.c => util.cpp} (100%)
rename src/{util.h => util.hpp} (100%)
rename src/{video_bktr.c => video_bktr.cpp} (100%)
rename src/{video_bktr.h => video_bktr.hpp} (100%)
rename src/{video_common.c => video_common.cpp} (100%)
rename src/{video_common.h => video_common.hpp} (100%)
rename src/{video_loopback.c => video_loopback.cpp} (100%)
rename src/{video_loopback.h => video_loopback.hpp} (100%)
rename src/{video_v4l2.c => video_v4l2.cpp} (100%)
rename src/{video_v4l2.h => video_v4l2.hpp} (100%)
rename src/{webu.c => webu.cpp} (100%)
rename src/{webu.h => webu.hpp} (100%)
rename src/{webu_html.c => webu_html.cpp} (100%)
rename src/{webu_html.h => webu_html.hpp} (100%)
rename src/{webu_status.c => webu_status.cpp} (100%)
rename src/{webu_status.h => webu_status.hpp} (100%)
rename src/{webu_stream.c => webu_stream.cpp} (100%)
rename src/{webu_stream.h => webu_stream.hpp} (100%)
rename src/{webu_text.c => webu_text.cpp} (100%)
rename src/{webu_text.h => webu_text.hpp} (100%)
diff --git a/doc/CHANGELOG b/doc/changelog
similarity index 100%
rename from doc/CHANGELOG
rename to doc/changelog
diff --git a/doc/CODE_STANDARD b/doc/code_standard
similarity index 100%
rename from doc/CODE_STANDARD
rename to doc/code_standard
diff --git a/src/alg.c b/src/alg.cpp
similarity index 100%
rename from src/alg.c
rename to src/alg.cpp
diff --git a/src/alg.h b/src/alg.hpp
similarity index 100%
rename from src/alg.h
rename to src/alg.hpp
diff --git a/src/conf.c b/src/conf.cpp
similarity index 100%
rename from src/conf.c
rename to src/conf.cpp
diff --git a/src/conf.h b/src/conf.hpp
similarity index 100%
rename from src/conf.h
rename to src/conf.hpp
diff --git a/src/dbse.c b/src/dbse.cpp
similarity index 100%
rename from src/dbse.c
rename to src/dbse.cpp
diff --git a/src/dbse.h b/src/dbse.hpp
similarity index 100%
rename from src/dbse.h
rename to src/dbse.hpp
diff --git a/src/draw.c b/src/draw.cpp
similarity index 100%
rename from src/draw.c
rename to src/draw.cpp
diff --git a/src/draw.h b/src/draw.hpp
similarity index 100%
rename from src/draw.h
rename to src/draw.hpp
diff --git a/src/event.c b/src/event.cpp
similarity index 100%
rename from src/event.c
rename to src/event.cpp
diff --git a/src/event.h b/src/event.hpp
similarity index 100%
rename from src/event.h
rename to src/event.hpp
diff --git a/src/ffmpeg.c b/src/ffmpeg.cpp
similarity index 100%
rename from src/ffmpeg.c
rename to src/ffmpeg.cpp
diff --git a/src/ffmpeg.h b/src/ffmpeg.hpp
similarity index 100%
rename from src/ffmpeg.h
rename to src/ffmpeg.hpp
diff --git a/src/jpegutils.c b/src/jpegutils.cpp
similarity index 100%
rename from src/jpegutils.c
rename to src/jpegutils.cpp
diff --git a/src/jpegutils.h b/src/jpegutils.hpp
similarity index 100%
rename from src/jpegutils.h
rename to src/jpegutils.hpp
diff --git a/src/logger.c b/src/logger.cpp
similarity index 100%
rename from src/logger.c
rename to src/logger.cpp
diff --git a/src/logger.h b/src/logger.hpp
similarity index 100%
rename from src/logger.h
rename to src/logger.hpp
diff --git a/src/mmx.h b/src/mmx.hpp
similarity index 100%
rename from src/mmx.h
rename to src/mmx.hpp
diff --git a/src/motion.c b/src/motion.cpp
similarity index 100%
rename from src/motion.c
rename to src/motion.cpp
diff --git a/src/motion.h b/src/motion.hpp
similarity index 100%
rename from src/motion.h
rename to src/motion.hpp
diff --git a/src/netcam.c b/src/netcam.cpp
similarity index 100%
rename from src/netcam.c
rename to src/netcam.cpp
diff --git a/src/netcam.h b/src/netcam.hpp
similarity index 100%
rename from src/netcam.h
rename to src/netcam.hpp
diff --git a/src/netcam_ftp.c b/src/netcam_ftp.cpp
similarity index 100%
rename from src/netcam_ftp.c
rename to src/netcam_ftp.cpp
diff --git a/src/netcam_ftp.h b/src/netcam_ftp.hpp
similarity index 100%
rename from src/netcam_ftp.h
rename to src/netcam_ftp.hpp
diff --git a/src/netcam_http.c b/src/netcam_http.cpp
similarity index 100%
rename from src/netcam_http.c
rename to src/netcam_http.cpp
diff --git a/src/netcam_http.h b/src/netcam_http.hpp
similarity index 100%
rename from src/netcam_http.h
rename to src/netcam_http.hpp
diff --git a/src/netcam_jpeg.c b/src/netcam_jpeg.cpp
similarity index 100%
rename from src/netcam_jpeg.c
rename to src/netcam_jpeg.cpp
diff --git a/src/netcam_jpeg.h b/src/netcam_jpeg.hpp
similarity index 100%
rename from src/netcam_jpeg.h
rename to src/netcam_jpeg.hpp
diff --git a/src/netcam_rtsp.c b/src/netcam_rtsp.cpp
similarity index 100%
rename from src/netcam_rtsp.c
rename to src/netcam_rtsp.cpp
diff --git a/src/netcam_rtsp.h b/src/netcam_rtsp.hpp
similarity index 100%
rename from src/netcam_rtsp.h
rename to src/netcam_rtsp.hpp
diff --git a/src/netcam_wget.c b/src/netcam_wget.cpp
similarity index 100%
rename from src/netcam_wget.c
rename to src/netcam_wget.cpp
diff --git a/src/netcam_wget.h b/src/netcam_wget.hpp
similarity index 100%
rename from src/netcam_wget.h
rename to src/netcam_wget.hpp
diff --git a/src/picture.c b/src/picture.cpp
similarity index 100%
rename from src/picture.c
rename to src/picture.cpp
diff --git a/src/picture.h b/src/picture.hpp
similarity index 100%
rename from src/picture.h
rename to src/picture.hpp
diff --git a/src/pwc-ioctl.h b/src/pwc-ioctl.hpp
similarity index 100%
rename from src/pwc-ioctl.h
rename to src/pwc-ioctl.hpp
diff --git a/src/rotate.c b/src/rotate.cpp
similarity index 100%
rename from src/rotate.c
rename to src/rotate.cpp
diff --git a/src/rotate.h b/src/rotate.hpp
similarity index 100%
rename from src/rotate.h
rename to src/rotate.hpp
diff --git a/src/track.c b/src/track.cpp
similarity index 100%
rename from src/track.c
rename to src/track.cpp
diff --git a/src/track.h b/src/track.hpp
similarity index 100%
rename from src/track.h
rename to src/track.hpp
diff --git a/src/translate.c b/src/translate.cpp
similarity index 100%
rename from src/translate.c
rename to src/translate.cpp
diff --git a/src/translate.h b/src/translate.hpp
similarity index 100%
rename from src/translate.h
rename to src/translate.hpp
diff --git a/src/util.c b/src/util.cpp
similarity index 100%
rename from src/util.c
rename to src/util.cpp
diff --git a/src/util.h b/src/util.hpp
similarity index 100%
rename from src/util.h
rename to src/util.hpp
diff --git a/src/video_bktr.c b/src/video_bktr.cpp
similarity index 100%
rename from src/video_bktr.c
rename to src/video_bktr.cpp
diff --git a/src/video_bktr.h b/src/video_bktr.hpp
similarity index 100%
rename from src/video_bktr.h
rename to src/video_bktr.hpp
diff --git a/src/video_common.c b/src/video_common.cpp
similarity index 100%
rename from src/video_common.c
rename to src/video_common.cpp
diff --git a/src/video_common.h b/src/video_common.hpp
similarity index 100%
rename from src/video_common.h
rename to src/video_common.hpp
diff --git a/src/video_loopback.c b/src/video_loopback.cpp
similarity index 100%
rename from src/video_loopback.c
rename to src/video_loopback.cpp
diff --git a/src/video_loopback.h b/src/video_loopback.hpp
similarity index 100%
rename from src/video_loopback.h
rename to src/video_loopback.hpp
diff --git a/src/video_v4l2.c b/src/video_v4l2.cpp
similarity index 100%
rename from src/video_v4l2.c
rename to src/video_v4l2.cpp
diff --git a/src/video_v4l2.h b/src/video_v4l2.hpp
similarity index 100%
rename from src/video_v4l2.h
rename to src/video_v4l2.hpp
diff --git a/src/webu.c b/src/webu.cpp
similarity index 100%
rename from src/webu.c
rename to src/webu.cpp
diff --git a/src/webu.h b/src/webu.hpp
similarity index 100%
rename from src/webu.h
rename to src/webu.hpp
diff --git a/src/webu_html.c b/src/webu_html.cpp
similarity index 100%
rename from src/webu_html.c
rename to src/webu_html.cpp
diff --git a/src/webu_html.h b/src/webu_html.hpp
similarity index 100%
rename from src/webu_html.h
rename to src/webu_html.hpp
diff --git a/src/webu_status.c b/src/webu_status.cpp
similarity index 100%
rename from src/webu_status.c
rename to src/webu_status.cpp
diff --git a/src/webu_status.h b/src/webu_status.hpp
similarity index 100%
rename from src/webu_status.h
rename to src/webu_status.hpp
diff --git a/src/webu_stream.c b/src/webu_stream.cpp
similarity index 100%
rename from src/webu_stream.c
rename to src/webu_stream.cpp
diff --git a/src/webu_stream.h b/src/webu_stream.hpp
similarity index 100%
rename from src/webu_stream.h
rename to src/webu_stream.hpp
diff --git a/src/webu_text.c b/src/webu_text.cpp
similarity index 100%
rename from src/webu_text.c
rename to src/webu_text.cpp
diff --git a/src/webu_text.h b/src/webu_text.hpp
similarity index 100%
rename from src/webu_text.h
rename to src/webu_text.hpp
--
2.39.5

2
scripts/version.sh
View File

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

16
src/Makefile.am
View File

@@ -1,32 +1,32 @@
#/*
# * This file is part of MotionPlus.
# * This file is part of Motion.
# *
# * MotionPlus is free software: you can redistribute it and/or modify
# * Motion 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,
# * Motion 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/>.
# * along with Motion. If not, see <https://www.gnu.org/licenses/>.
# *
# */
AM_CPPFLAGS= \
-Dconfigdir=\"$(localstatedir)/lib/@PACKAGE@\" \
-Dsysconfdir=\"$(sysconfdir)/motionplus\" \
-Dsysconfdir=\"$(sysconfdir)/motion\" \
-DLOCALEDIR=\"$(localedir)\"
LDADD = $(LIBINTL)
bin_PROGRAMS = motionplus
bin_PROGRAMS = motion
motionplus_SOURCES = \
motion_SOURCES = \
alg.hpp alg.cpp \
alg_sec.hpp alg_sec.cpp \
conf.hpp conf.cpp \
@@ -35,7 +35,7 @@ motionplus_SOURCES = \
jpegutils.hpp jpegutils.cpp \
libcam.hpp libcam.cpp \
logger.hpp logger.cpp \
motionplus.hpp motionplus.cpp \
motion.hpp motion.cpp \
allcam.hpp allcam.cpp \
schedule.hpp schedule.cpp \
camera.hpp camera.cpp \

10
src/alg.cpp
View File

@@ -1,21 +1,21 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "conf.hpp"
#include "camera.hpp"

8
src/alg.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

10
src/alg_sec.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"

8
src/alg_sec.hpp
View File

@@ -1,19 +1,19 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

10
src/allcam.cpp
View File

@@ -1,23 +1,23 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "conf.hpp"
#include "logger.hpp"

8
src/allcam.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

10
src/camera.cpp
View File

@@ -1,23 +1,23 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "camera.hpp"

8
src/camera.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/

30
src/conf.cpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
@@ -24,10 +24,10 @@ Reassign class categories to group together those applicable to application vs c
Create a class of just the parms/edits to segregate from the config file processes
Perhaps a lightweight class of just the parms. Use this instead of full class for the config
parms that are being used "live" with devices
(currently called "cfg" in the camera,sound and motionplus classes)
(currently called "cfg" in the camera,sound and motion classes)
Remove the depreceated parameters from old Motion.
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "logger.hpp"
#include "camera.hpp"
@@ -3648,8 +3648,8 @@ std::string cls_config::cat_desc(enum PARM_CAT pcat, bool shrt) {
void cls_config::usage(void)
{
printf("MotionPlus version %s, Copyright 2020-2024\n",PACKAGE_VERSION);
printf("\nusage:\tmotionplus [options]\n");
printf("Motion version %s, Copyright 2020-2024\n",PACKAGE_VERSION);
printf("\nusage:\tmotion [options]\n");
printf("\n\n");
printf("Possible options:\n\n");
printf("-b\t\t\tRun in background (daemon) mode.\n");
@@ -4140,7 +4140,7 @@ void cls_config::parms_write_app()
}
fprintf(conffile, "; %s\n", app->conf_src->conf_filename.c_str());
fprintf(conffile, ";\n; This config file was generated by MotionPlus " VERSION "\n");
fprintf(conffile, ";\n; This config file was generated by Motion " VERSION "\n");
fprintf(conffile, "; at %s\n", timestamp);
fprintf(conffile, "\n\n");
@@ -4219,7 +4219,7 @@ void cls_config::parms_write_cam()
return;
}
fprintf(conffile, "; %s\n", app->cam_list[indx]->conf_src->conf_filename.c_str());
fprintf(conffile, ";\n; This config file was generated by MotionPlus " VERSION "\n");
fprintf(conffile, ";\n; This config file was generated by Motion " VERSION "\n");
fprintf(conffile, "; at %s\n", timestamp);
fprintf(conffile, "\n\n");
parms_write_parms(conffile, "", "", PARM_CAT_00, true);
@@ -4279,7 +4279,7 @@ void cls_config::parms_write_snd()
return;
}
fprintf(conffile, "; %s\n", app->snd_list[indx]->conf_src->conf_filename.c_str());
fprintf(conffile, ";\n; This config file was generated by MotionPlus " VERSION "\n");
fprintf(conffile, ";\n; This config file was generated by Motion " VERSION "\n");
fprintf(conffile, "; at %s\n", timestamp);
fprintf(conffile, "\n\n");
parms_write_parms(conffile, "", "", PARM_CAT_00, true);
@@ -4378,28 +4378,28 @@ void cls_config::init()
MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Error getcwd"));
exit(-1);
}
filename = path + std::string("/motionplus.conf");
filename = path + std::string("/motion.conf");
if (stat(filename.c_str(), &statbuf) != 0) {
filename = "";
}
}
if (filename == "") {
filename = std::string(getenv("HOME")) + std::string("/.motionplus/motionplus.conf");
filename = std::string(getenv("HOME")) + std::string("/.motion/motion.conf");
if (stat(filename.c_str(), &statbuf) != 0) {
filename = "";
}
}
if (filename == "") {
filename = std::string( configdir ) + std::string("/motionplus.conf");
filename = std::string( configdir ) + std::string("/motion.conf");
if (stat(filename.c_str(), &statbuf) != 0) {
filename = "";
}
}
if (filename == "") {
filename = std::string( sysconfdir ) + std::string("/motionplus.conf");
filename = std::string( sysconfdir ) + std::string("/motion.conf");
if (stat(filename.c_str(), &statbuf) != 0) {
filename = "";
}

8
src/conf.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

40
src/dbse.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"
@@ -131,20 +131,20 @@ void cls_dbse::sql_motpls(std::string &sql)
if (app->cfg->database_type == "mariadb") {
sql = "Select table_name "
" from information_schema.tables "
" where table_name = 'motionplus';";
" where table_name = 'motion';";
} else if (app->cfg->database_type == "postgresql") {
sql = " select tablename as table_nm "
" from pg_catalog.pg_tables "
" where schemaname != 'pg_catalog' "
" and schemaname != 'information_schema' "
" and tablename = 'motionplus';";
" and tablename = 'motion';";
} else if (app->cfg->database_type == "sqlite3") {
sql = "select name from sqlite_master"
" where type='table' "
" and name='motionplus';";
" and name='motion';";
}
} else if (dbse_action == DBSE_TBL_CREATE) {
sql = "create table motionplus (";
sql = "create table motion (";
if ((app->cfg->database_type == "mariadb") ||
(app->cfg->database_type == "postgresql")) {
sql += " record_id serial ";
@@ -155,7 +155,7 @@ void cls_dbse::sql_motpls(std::string &sql)
sql += ");";
} else if ((dbse_action == DBSE_COLS_LIST) || (dbse_action == DBSE_COLS_CURRENT)) {
sql = " select * from motionplus;";
sql = " select * from motion;";
}
@@ -171,11 +171,11 @@ void cls_dbse::sql_motpls(std::string &sql, std::string col_p1, std::string col_
if ((dbse_action == DBSE_COLS_ADD) &&
(col_p1 != "") && (col_p2 != "")) {
sql = "Alter table motionplus add column ";
sql = "Alter table motion add column ";
sql += col_p1 + " " + col_p2 + " ;";
} else if ((dbse_action == DBSE_COLS_RENAME) &&
(col_p1 != "") && (col_p2 != "")) {
sql = "Alter table motionplus rename column ";
sql = "Alter table motion rename column ";
sql += col_p1 + " to " + col_p2 + " ;";
}
}
@@ -221,7 +221,7 @@ void cls_dbse::sqlite3db_cb (int arg_nb, char **arg_val, char **col_nm)
if (dbse_action == DBSE_TBL_CHECK) {
for (indx=0; indx < arg_nb; indx++) {
if (mystrceq(arg_val[indx],"motionplus")) {
if (mystrceq(arg_val[indx],"motion")) {
table_ok = true;
}
}
@@ -506,7 +506,7 @@ void cls_dbse::mariadb_recs(std::string sql)
while (qry_row != nullptr) {
for(indx = 0; indx < qry_fields; indx++) {
if (qry_row[indx] != nullptr) {
if (mystrceq(qry_row[indx], "motionplus")) {
if (mystrceq(qry_row[indx], "motion")) {
table_ok = true;
}
}
@@ -614,7 +614,7 @@ void cls_dbse::mariadb_setup()
if (table_ok == false) {
MOTPLS_LOG(INF, TYPE_DB, NO_ERRNO
, _("Creating motionplus table"));
, _("Creating motion table"));
dbse_action = DBSE_TBL_CREATE;
sql_motpls(sql);
mariadb_exec(sql.c_str());
@@ -772,7 +772,7 @@ void cls_dbse::pgsqldb_recs (std::string sql)
for(indx = 0; indx < rows; indx++) {
for (indx2 = 0; indx2 < cols; indx2++){
if (mystrceq("table_nm", PQfname(res, indx2)) &&
mystrceq("motionplus", PQgetvalue(res, indx, indx2))) {
mystrceq("motion", PQgetvalue(res, indx, indx2))) {
table_ok = true;
}
}
@@ -890,7 +890,7 @@ void cls_dbse::pgsqldb_setup()
if (table_ok == false) {
MOTPLS_LOG(INF, TYPE_DB, NO_ERRNO
, _("Creating motionplus table"));
, _("Creating motion table"));
dbse_action = DBSE_TBL_CREATE;
sql_motpls(sql);
pgsqldb_exec(sql.c_str());
@@ -1125,7 +1125,7 @@ void cls_dbse::filelist_add(cls_camera *cam, timespec *ts1, std::string ftyp
sdev_avg =0;
}
sqlquery = "insert into motionplus ";
sqlquery = "insert into motion ";
sqlquery += " (device_id, file_nm, file_typ, file_dir";
sqlquery += " , full_nm, file_sz, file_dtl";
sqlquery += " , file_tmc, file_tml, diff_avg";
@@ -1205,7 +1205,7 @@ void cls_dbse::dbse_clean()
return;
}
sql = " select * from motionplus ";
sql = " select * from motion ";
sql += " where device_id = ";
sql += std::to_string(app->cam_list[camindx]->cfg->device_id);
sql += " order by file_dtl, file_tml;";
@@ -1219,7 +1219,7 @@ void cls_dbse::dbse_clean()
}
if (stat(flst[indx].full_nm.c_str(), &statbuf) != 0) {
if (sql == "") {
sql = " delete from motionplus ";
sql = " delete from motion ";
sql += " where record_id in (";
delimit = " ";
delcnt = 0;

10
src/dbse.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
@@ -71,7 +71,7 @@ struct ctx_file_item {
};
typedef std::vector<ctx_file_item> vec_files;
/* Column item attributes in the motionplus table */
/* Column item attributes in the motion table */
struct ctx_col_item {
bool found; /*Bool for whether the col in existing db*/
std::string col_nm; /*Name of the column*/

10
src/draw.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"

8
src/draw.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

10
src/jpegutils.cpp
View File

@@ -1,23 +1,23 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"

8
src/jpegutils.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/

10
src/libcam.cpp
View File

@@ -1,23 +1,23 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"

8
src/libcam.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

12
src/logger.cpp
View File

@@ -1,21 +1,21 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "conf.hpp"
#include "logger.hpp"
@@ -168,7 +168,7 @@ void cls_log::add_errmsg(int flgerr, int err_save)
void cls_log::set_mode(int mode_new)
{
if ((log_mode != LOGMODE_SYSLOG) && (mode_new == LOGMODE_SYSLOG)) {
openlog("motionplus", LOG_PID, LOG_USER);
openlog("motion", LOG_PID, LOG_USER);
}
if ((log_mode == LOGMODE_SYSLOG) && (mode_new != LOGMODE_SYSLOG)) {
closelog();

8
src/logger.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#ifndef _INCLUDE_LOGGER_HPP_

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

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "conf.hpp"
#include "logger.hpp"
@@ -70,7 +70,7 @@ static void sigchild_handler(int signo)
#endif /* WNOHANG */
}
/** Attach handlers to a number of signals that MotionPlus need to catch. */
/** Attach handlers to a number of signals that Motion need to catch. */
static void setup_signals(void)
{
struct sigaction sig_handler_action;
@@ -201,11 +201,11 @@ void cls_motapp::pid_write()
}
}
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Motionplus pid: %d"), getpid());
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Motion pid: %d"), getpid());
}
/** Remove the process id file ( pid file ) before MotionPlus exit. */
/** Remove the process id file ( pid file ) before Motion exit. */
void cls_motapp::pid_remove()
{
if ((cfg->pid_file != "") &&
@@ -233,13 +233,13 @@ void cls_motapp::daemon()
sigemptyset(&sig_ign_action.sa_mask);
if (fork()) {
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("MotionPlus going to daemon mode"));
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Motion going to daemon mode"));
exit(0);
}
/*
* Changing dir to root enables people to unmount a disk
* without having to stop MotionPlus
* without having to stop Motion
*/
if (chdir("/")) {
MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Could not change directory"));
@@ -534,7 +534,7 @@ void cls_motapp::init(int p_argc, char *p_argv[])
if (cfg->daemon) {
daemon();
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("MotionPlus running as daemon process"));
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Motion running as daemon process"));
}
cfg->parms_log();
@@ -649,7 +649,7 @@ void cls_motapp::camera_delete()
}
/** Main entry point of MotionPlus. */
/** Main entry point of Motion. */
int main (int p_argc, char **p_argv)
{
cls_motapp *app;
@@ -672,7 +672,7 @@ int main (int p_argc, char **p_argv)
app->camera_delete();
app->check_restart();
}
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Motionplus devices finished"));
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Motion devices finished"));
if (app->reload_all) {
app->deinit();
app->reload_all = false;
@@ -683,7 +683,7 @@ int main (int p_argc, char **p_argv)
app->deinit();
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("MotionPlus terminating"));
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Motion terminating"));
mydelete(motlog);
mydelete(app);

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

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/

10
src/movie.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"

8
src/movie.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/

10
src/netcam.cpp
View File

@@ -1,23 +1,23 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"

8
src/netcam.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/

10
src/picture.cpp
View File

@@ -1,21 +1,21 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"

8
src/picture.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/

10
src/rotate.cpp
View File

@@ -1,21 +1,21 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"

8
src/rotate.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#ifndef _INCLUDE_ROTATE_HPP_

14
src/schedule.cpp
View File

@@ -1,23 +1,23 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "conf.hpp"
#include "logger.hpp"
@@ -130,7 +130,7 @@ void cls_schedule::cleandir_remove(std::string sql, bool removedir)
MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO
, _("Removing %s"),flst[indx].full_nm.c_str());
remove(flst[indx].full_nm.c_str());
sql = " delete from motionplus ";
sql = " delete from motion ";
sql += " where record_id = ";
sql += std::to_string(flst[indx].record_id);
app->dbse->exec_sql(sql);
@@ -160,7 +160,7 @@ void cls_schedule::cleandir_sql(int device_id, std::string &sql, struct timespec
tmp_tml = tmp;
sql = " select * ";
sql += " from motionplus ";
sql += " from motion ";
sql += " where ";
sql += " device_id = " + std::to_string(device_id);
sql += " and ((file_dtl < " + tmp_dtl + ") ";

8
src/schedule.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

14
src/sound.cpp
View File

@@ -1,23 +1,23 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "conf.hpp"
#include "logger.hpp"
@@ -556,9 +556,9 @@ void cls_sound::pulse_init()
snd_info->snd_pulse->dev = NULL;
snd_info->snd_pulse->dev = pa_simple_new(
(snd_info->pulse_server=="" ? NULL : snd_info->pulse_server.c_str())
, "motionplus", PA_STREAM_RECORD
, "motion", PA_STREAM_RECORD
, (cfg->snd_device=="" ? NULL : cfg->snd_device.c_str())
, "motionplus", &specs, NULL, NULL, &errcd);
, "motion", &specs, NULL, NULL, &errcd);
if (snd_info->snd_pulse->dev == NULL) {
MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
, _("Error opening pulse (%s)")

8
src/sound.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

16
src/util.cpp
View File

@@ -1,23 +1,23 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"
@@ -528,9 +528,9 @@ void mytranslate_init(void)
//translate_locale_chg("li");
mytranslate_locale_chg("es");
bindtextdomain ("motionplus", LOCALEDIR);
bind_textdomain_codeset ("motionplus", "UTF-8");
textdomain ("motionplus");
bindtextdomain ("motion", LOCALEDIR);
bind_textdomain_codeset ("motion", "UTF-8");
textdomain ("motion");
MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Language: English"));

8
src/util.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*
*/

10
src/video_convert.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "logger.hpp"

8
src/video_convert.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

10
src/video_loopback.cpp
View File

@@ -1,21 +1,21 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"

8
src/video_loopback.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#ifndef _INCLUDE_VIDEO_LOOPBACK_HPP_

12
src/video_v4l2.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"
@@ -627,7 +627,7 @@ void cls_v4l2cam::params_check()
}
/*List camera palettes and return index of one that Motionplus supports*/
/*List camera palettes and return index of one that Motion supports*/
int cls_v4l2cam::pixfmt_list()
{
int v4l2_pal, indx_palette, indx;

8
src/video_v4l2.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

10
src/webu.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"

8
src/webu.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

10
src/webu_ans.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "allcam.hpp"

8
src/webu_ans.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

12
src/webu_file.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"
@@ -63,7 +63,7 @@ void cls_webu_file::main() {
}
sql = " select * from motionplus ";
sql = " select * from motion ";
sql += " where device_id = " + std::to_string(webua->cam->cfg->device_id);
sql += " order by file_dtl, file_tml;";
app->dbse->filelist_get(sql, flst);

8
src/webu_file.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

10
src/webu_getimg.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "conf.hpp"
#include "logger.hpp"

8
src/webu_getimg.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

14
src/webu_html.cpp
View File

@@ -1,22 +1,22 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "motionplus.hpp"
#include "motion.hpp"
#include "util.hpp"
#include "camera.hpp"
#include "conf.hpp"
@@ -315,7 +315,7 @@ void cls_webu_html::head()
{
webua->resp_page += "<head> \n"
"<meta charset='UTF-8'> \n"
"<title>MotionPlus</title> \n"
"<title>Motion</title> \n"
"<meta name='viewport' content='width=device-width, initial-scale=1'> \n";
style();
@@ -606,7 +606,7 @@ void cls_webu_html::script_assign_version()
{
webua->resp_page +=
" function assign_version() {\n"
" var verstr ='<a>MotionPlus \\n'+pData['version'] +'</a>';\n"
" var verstr ='<a>Motion \\n'+pData['version'] +'</a>';\n"
" document.getElementById('divnav_version').innerHTML = verstr;\n"
" }\n\n";
}

8
src/webu_html.hpp
View File

@@ -1,18 +1,18 @@
/*
* This file is part of MotionPlus.
* This file is part of Motion.
*
* MotionPlus is free software: you can redistribute it and/or modify
* Motion 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,
* Motion 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/>.
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*
*/

Some files were not shown because too many files have changed in this diff Show More