mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-04-25 00:17:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added on_camera_lost to motion-dist.conf.in , fix back link for threads in http control

Browse Source
This commit is contained in:
AngelCarpintero
2007-12-02 17:04:28 +00:00
parent d4c0d499c3
commit 3ededa4dbd
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
conf.c
View File

@@ -113,8 +113,8 @@ struct config conf_template = {
mysql_user: NULL,
mysql_password: NULL,
on_picture_save: NULL,
on_area_detected: NULL,
on_motion_detected: NULL,
on_area_detected: NULL,
on_movie_start: NULL,
on_movie_end: NULL,
on_camera_lost: NULL,
@@ -1110,23 +1110,12 @@ config_param config_params[] = {
{
"on_area_detected",
"# Command to be executed when motion in a predefined area is detected\n"
"# Check option 'area_detect'. (default: none)",
"# Check option 'area_detect'. (default: none)",
0,
CONF_OFFSET(on_area_detected),
copy_string,
print_string
},
{
"on_camera_lost",
"# Command to be executed when a camera can't be opened or if it is lost\n"
"# NOTE: There is situations when motion don't detect a lost camera!\n"
"# It depends on the driver, some drivers dosn't detect a lost camera at all\n"
"# Some hangs the motion thread. Some even hangs the PC! (default: none)\n",
0,
CONF_OFFSET(on_camera_lost),
copy_string,
print_string
},
#ifdef HAVE_FFMPEG
{
"on_movie_start",
@@ -1147,6 +1136,17 @@ config_param config_params[] = {
print_string
},
#endif /* HAVE_FFMPEG */
{
"on_camera_lost",
"# Command to be executed when a camera can't be opened or if it is lost\n"
"# NOTE: There is situations when motion don't detect a lost camera!\n"
"# It depends on the driver, some drivers dosn't detect a lost camera at all\n"
"# Some hangs the motion thread. Some even hangs the PC! (default: none)\n",
0,
CONF_OFFSET(on_camera_lost),
copy_string,
print_string
},
#if defined(HAVE_MYSQL) || defined(HAVE_PGSQL)
{

5
motion-dist.conf.in
View File

@@ -523,6 +523,11 @@ quiet on
# To give the filename as an argument to a command append it with %f
; on_movie_end value
# Command to be executed when a camera can't be opened or if it is lost
# NOTE: There is situations when motion don't detect a lost camera!
# It depends on the driver, some drivers dosn't detect a lost camera at all
# Some hangs the motion thread. Some even hangs the PC! (default: none)
; on_camera_lost value
############################################################
# Common Options For MySQL and PostgreSQL database features.

4
webhttpd.c
View File

@@ -972,7 +972,7 @@ static unsigned short int action(char *pointer, char *res, unsigned short int le
cnt[thread]->restart=1;
if (cnt[0]->conf.control_html_output) {
send_template_ini_client(client_socket, ini_template);
sprintf(res,"<a href=/%hu/config><- back</a><br><br>\n"
sprintf(res,"<a href=/%hu/action><- back</a><br><br>\n"
"restart for thread %hu done<br>\n", thread, thread);
send_template(client_socket, res);
send_template_end_client(client_socket);
@@ -1016,7 +1016,7 @@ static unsigned short int action(char *pointer, char *res, unsigned short int le
cnt[thread]->watchdog=WATCHDOG_OFF;
if (cnt[0]->conf.control_html_output) {
send_template_ini_client(client_socket, ini_template);
sprintf(res,"<a href=/%hu/config><- back</a><br><br>\n"
sprintf(res,"<a href=/%hu/action><- back</a><br><br>\n"
"quit for thread %hu done<br>\n", thread, thread);
send_template(client_socket, res);
send_template_end_client(client_socket);