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

Revise ctx_conf to cls_conf

Browse Source
This commit is contained in:
Mr-Dave
2024-08-07 22:42:21 -06:00
parent b296be61cb
commit 5e172c91ac
9 changed files with 1483 additions and 1297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2042
src/conf.cpp
View File

File diff suppressed because it is too large Load Diff

653
src/conf.hpp
View File

@@ -20,202 +20,6 @@
#ifndef _INCLUDE_CONF_HPP_
#define _INCLUDE_CONF_HPP_
struct ctx_config {
/* Overall system configuration parameters */
std::string conf_filename;
bool from_conf_dir;
/* Overall application parameters */
bool daemon;
std::string pid_file;
std::string log_file;
std::string log_type_str;
int log_level;
int log_type;
bool native_language;
std::string device_name;
int device_id;
std::string config_dir;
std::string target_dir;
int watchdog_tmo;
int watchdog_kill;
int device_tmo;
bool pause;
/* Capture device configuration parameters */
std::string v4l2_device;
std::string v4l2_params;
std::string netcam_url;
std::string netcam_params;
std::string netcam_high_url;
std::string netcam_high_params;
std::string netcam_userpass;
std::string libcam_device;
std::string libcam_params;
/* Image processing configuration parameters */
int width;
int height;
int framerate;
int rotate;
std::string flip_axis;
std::string locate_motion_mode;
std::string locate_motion_style;
std::string text_left;
std::string text_right;
bool text_changes;
int text_scale;
std::string text_event;
/* Motion detection configuration parameters */
bool emulate_motion;
int threshold;
int threshold_maximum;
int threshold_sdevx;
int threshold_sdevy;
int threshold_sdevxy;
int threshold_ratio;
int threshold_ratio_change;
bool threshold_tune;
std::string secondary_method;
std::string secondary_params;
int noise_level;
bool noise_tune;
std::string despeckle_filter;
std::string area_detect;
std::string mask_file;
std::string mask_privacy;
int smart_mask_speed;
int lightswitch_percent;
int lightswitch_frames;
int minimum_motion_frames;
int static_object_time;
int event_gap;
int pre_capture;
int post_capture;
/* Script execution configuration parameters */
std::string on_event_start;
std::string on_event_end;
std::string on_picture_save;
std::string on_area_detected;
std::string on_motion_detected;
std::string on_movie_start;
std::string on_movie_end;
std::string on_camera_lost;
std::string on_camera_found;
std::string on_secondary_detect;
std::string on_action_user;
std::string on_sound_alert;
/* Picture output configuration parameters */
std::string picture_output;
std::string picture_output_motion;
std::string picture_type;
int picture_quality;
std::string picture_exif;
std::string picture_filename;
/* Snapshot configuration parameters */
int snapshot_interval;
std::string snapshot_filename;
/* Movie output configuration parameters */
bool movie_output;
bool movie_output_motion;
int movie_max_time;
int movie_bps;
int movie_quality;
std::string movie_container;
bool movie_passthrough;
std::string movie_filename;
std::string movie_retain;
bool movie_extpipe_use;
std::string movie_extpipe;
/* Timelapse movie configuration parameters */
int timelapse_interval;
std::string timelapse_mode;
int timelapse_fps;
std::string timelapse_container;
std::string timelapse_filename;
/* Loopback device configuration parameters */
std::string video_pipe;
std::string video_pipe_motion;
/* Webcontrol configuration parameters */
int webcontrol_port;
int webcontrol_port2;
std::string webcontrol_base_path;
bool webcontrol_ipv6;
bool webcontrol_localhost;
int webcontrol_parms;
std::string webcontrol_interface;
std::string webcontrol_auth_method;
std::string webcontrol_authentication;
bool webcontrol_tls;
std::string webcontrol_cert;
std::string webcontrol_key;
std::string webcontrol_headers;
std::string webcontrol_html;
std::string webcontrol_actions;
int webcontrol_lock_minutes;
int webcontrol_lock_attempts;
std::string webcontrol_lock_script;
/* Live stream configuration parameters */
int stream_preview_scale;
bool stream_preview_newline;
std::string stream_preview_location;
std::string stream_preview_method;
bool stream_preview_ptz;
int stream_quality;
bool stream_grey;
bool stream_motion;
int stream_maxrate;
int stream_scan_time;
int stream_scan_scale;
/* Database and SQL configuration parameters */
std::string database_type;
std::string database_dbname;
std::string database_host;
int database_port;
std::string database_user;
std::string database_password;
int database_busy_timeout;
std::string sql_event_start;
std::string sql_event_end;
std::string sql_movie_start;
std::string sql_movie_end;
std::string sql_pic_save;
bool ptz_auto_track; /* Bool to enable auto tracking */
int ptz_wait; /* Frames to wait after a PTZ move */
std::string ptz_move_track; /* Auto tracking command */
std::string ptz_pan_left; /* Pan left command */
std::string ptz_pan_right; /* Pan right command */
std::string ptz_tilt_up; /* Tilt up command */
std::string ptz_tilt_down; /* Tilt down command */
std::string ptz_zoom_in; /* Zoom in command */
std::string ptz_zoom_out; /* Zoom out command */
/* Sound processing parameters */
std::string snd_device;
std::string snd_params;
std::list<std::string> snd_alerts;
std::string snd_window;
bool snd_show;
};
/* Categories for he edits and display on web interface*/
enum PARM_CAT{
PARM_CAT_00 /* system */
@@ -255,6 +59,13 @@
int webui_level; /* Enum to display in webui: 0,1,2,3,99(always to never)*/
};
enum PARM_ACT{
PARM_ACT_DFLT
, PARM_ACT_SET
, PARM_ACT_GET
, PARM_ACT_LIST
};
/** Deprecated parameters in the config file */
struct ctx_parm_depr{
const std::string parm_name; /* Name of the deprecated option */
@@ -266,22 +77,442 @@
extern struct ctx_parm config_parms[];
extern struct ctx_parm_depr config_parms_depr[];
void conf_init(ctx_motapp *motapp);
void conf_deinit(ctx_motapp *motapp);
void conf_parms_log(ctx_motapp *motapp);
void conf_parms_write(ctx_motapp *motapp);
void conf_camera_add(ctx_motapp *motapp);
class cls_config {
public:
cls_config();
~cls_config();
void conf_edit_set(ctx_config *conf, std::string parm_nm
, std::string parm_val);
void conf_edit_get(ctx_config *conf, std::string parm_nm
, std::string &parm_val, enum PARM_CAT parm_cat);
void conf_edit_get(ctx_config *conf, std::string parm_nm
, std::list<std::string> &parm_val, enum PARM_CAT parm_cat);
void conf_edit_list(ctx_config *conf, std::string parm_nm
, std::string &parm_val, enum PARM_CAT parm_cat);
/* Overall system configuration parameters */
std::string conf_filename;
bool from_conf_dir;
std::string conf_type_desc(enum PARM_TYP ptype);
std::string conf_cat_desc(enum PARM_CAT pcat, bool shrt);
/* Overall application parameters */
bool daemon;
std::string pid_file;
std::string log_file;
std::string log_type_str;
int log_level;
int log_type;
bool native_language;
std::string device_name;
int device_id;
std::string config_dir;
std::string target_dir;
int watchdog_tmo;
int watchdog_kill;
int device_tmo;
bool pause;
/* Capture device configuration parameters */
std::string v4l2_device;
std::string v4l2_params;
std::string netcam_url;
std::string netcam_params;
std::string netcam_high_url;
std::string netcam_high_params;
std::string netcam_userpass;
std::string libcam_device;
std::string libcam_params;
/* Image processing configuration parameters */
int width;
int height;
int framerate;
int rotate;
std::string flip_axis;
std::string locate_motion_mode;
std::string locate_motion_style;
std::string text_left;
std::string text_right;
bool text_changes;
int text_scale;
std::string text_event;
/* Motion detection configuration parameters */
bool emulate_motion;
int threshold;
int threshold_maximum;
int threshold_sdevx;
int threshold_sdevy;
int threshold_sdevxy;
int threshold_ratio;
int threshold_ratio_change;
bool threshold_tune;
std::string secondary_method;
std::string secondary_params;
int noise_level;
bool noise_tune;
std::string despeckle_filter;
std::string area_detect;
std::string mask_file;
std::string mask_privacy;
int smart_mask_speed;
int lightswitch_percent;
int lightswitch_frames;
int minimum_motion_frames;
int static_object_time;
int event_gap;
int pre_capture;
int post_capture;
/* Script execution configuration parameters */
std::string on_event_start;
std::string on_event_end;
std::string on_picture_save;
std::string on_area_detected;
std::string on_motion_detected;
std::string on_movie_start;
std::string on_movie_end;
std::string on_camera_lost;
std::string on_camera_found;
std::string on_secondary_detect;
std::string on_action_user;
std::string on_sound_alert;
/* Picture output configuration parameters */
std::string picture_output;
std::string picture_output_motion;
std::string picture_type;
int picture_quality;
std::string picture_exif;
std::string picture_filename;
/* Snapshot configuration parameters */
int snapshot_interval;
std::string snapshot_filename;
/* Movie output configuration parameters */
bool movie_output;
bool movie_output_motion;
int movie_max_time;
int movie_bps;
int movie_quality;
std::string movie_container;
bool movie_passthrough;
std::string movie_filename;
std::string movie_retain;
bool movie_extpipe_use;
std::string movie_extpipe;
/* Timelapse movie configuration parameters */
int timelapse_interval;
std::string timelapse_mode;
int timelapse_fps;
std::string timelapse_container;
std::string timelapse_filename;
/* Loopback device configuration parameters */
std::string video_pipe;
std::string video_pipe_motion;
/* Webcontrol configuration parameters */
int webcontrol_port;
int webcontrol_port2;
std::string webcontrol_base_path;
bool webcontrol_ipv6;
bool webcontrol_localhost;
int webcontrol_parms;
std::string webcontrol_interface;
std::string webcontrol_auth_method;
std::string webcontrol_authentication;
bool webcontrol_tls;
std::string webcontrol_cert;
std::string webcontrol_key;
std::string webcontrol_headers;
std::string webcontrol_html;
std::string webcontrol_actions;
int webcontrol_lock_minutes;
int webcontrol_lock_attempts;
std::string webcontrol_lock_script;
/* Live stream configuration parameters */
int stream_preview_scale;
bool stream_preview_newline;
std::string stream_preview_location;
std::string stream_preview_method;
bool stream_preview_ptz;
int stream_quality;
bool stream_grey;
bool stream_motion;
int stream_maxrate;
int stream_scan_time;
int stream_scan_scale;
/* Database and SQL configuration parameters */
std::string database_type;
std::string database_dbname;
std::string database_host;
int database_port;
std::string database_user;
std::string database_password;
int database_busy_timeout;
std::string sql_event_start;
std::string sql_event_end;
std::string sql_movie_start;
std::string sql_movie_end;
std::string sql_pic_save;
bool ptz_auto_track; /* Bool to enable auto tracking */
int ptz_wait; /* Frames to wait after a PTZ move */
std::string ptz_move_track; /* Auto tracking command */
std::string ptz_pan_left; /* Pan left command */
std::string ptz_pan_right; /* Pan right command */
std::string ptz_tilt_up; /* Tilt up command */
std::string ptz_tilt_down; /* Tilt down command */
std::string ptz_zoom_in; /* Zoom in command */
std::string ptz_zoom_out; /* Zoom out command */
/* Sound processing parameters */
std::string snd_device;
std::string snd_params;
std::list<std::string> snd_alerts;
std::string snd_window;
bool snd_show;
void camera_add(ctx_motapp *motapp);
void sound_add(ctx_motapp *motapp);
void edit_set(std::string parm_nm, std::string parm_val);
void edit_get(std::string parm_nm, std::string &parm_val, enum PARM_CAT parm_cat);
void edit_get(std::string parm_nm, std::list<std::string> &parm_val, enum PARM_CAT parm_cat);
void edit_list(std::string parm_nm, std::string &parm_val, enum PARM_CAT parm_cat);
std::string type_desc(enum PARM_TYP ptype);
std::string cat_desc(enum PARM_CAT pcat, bool shrt);
void usage();
void init(ctx_motapp *motapp);
void deinit(ctx_motapp *motapp);
void parms_log(ctx_motapp *motapp);
void parms_write(ctx_motapp *motapp);
private:
void cmdline(ctx_motapp *motapp);
void defaults();
void process(ctx_motapp *motapp);
void camera_filenm(ctx_motapp *motapp);
void camera_parm(ctx_motapp *motapp, std::string filename);
void sound_filenm(ctx_motapp *motapp);
void sound_parm(ctx_motapp *motapp, std::string filename);
void config_dir_parm(ctx_motapp *motapp, std::string confdir);
void parms_log_parm(std::string parm_nm, std::string parm_vl);
void parms_write_app(ctx_motapp *motapp);
void parms_write_cam(ctx_motapp *motapp);
void parms_write_parms(FILE *conffile, std::string parm_nm, std::string parm_vl, enum PARM_CAT parm_ct, bool reset);
void parms_write_snd(ctx_motapp *motapp);
int edit_set_active(std::string parm_nm, std::string parm_val);
int edit_set_depr(std::string &parm_nm, std::string &parm_val);
void edit_depr_tdbl(std::string newname, std::string &parm_val);
void edit_depr_vid(std::string parm_nm, std::string newname, std::string parm_val);
void edit_depr_web(std::string newname, std::string &parm_val);
void edit_config_dir(std::string &parm, enum PARM_ACT pact);
void edit_get_bool(std::string &parm_dest, bool &parm_in);
void edit_set_bool(bool &parm_dest, std::string &parm_in);
void edit_cat(std::string parm_nm, std::list<std::string> &parm_val, enum PARM_ACT pact, enum PARM_CAT pcat);
void edit_cat(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact, enum PARM_CAT pcat);
void edit_cat00(std::string cmd, std::string &parm_val, enum PARM_ACT pact);
void edit_cat01(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat02(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat03(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat04(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat05(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat06(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat07(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat08(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat09(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat10(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat11(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat12(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat13(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat14(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat15(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat16(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat17(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat18(std::string parm_nm, std::string &parm_val, enum PARM_ACT pact);
void edit_cat18(std::string parm_nm,std::list<std::string> &parm_val, enum PARM_ACT pact);
void edit_daemon(std::string &parm, enum PARM_ACT pact);
void edit_conf_filename(std::string &parm, enum PARM_ACT pact);
void edit_pid_file(std::string &parm, int pact);
void edit_log_file(std::string &parm, enum PARM_ACT pact);
void edit_log_level(std::string &parm, enum PARM_ACT pact);
void edit_log_type(std::string &parm, enum PARM_ACT pact);
void edit_native_language(std::string &parm, enum PARM_ACT pact);
void edit_device_name(std::string &parm, enum PARM_ACT pact);
void edit_device_id(std::string &parm, enum PARM_ACT pact);
void edit_device_tmo(std::string &parm, enum PARM_ACT pact);
void edit_pause(std::string &parm, int pact);
void edit_target_dir(std::string &parm, enum PARM_ACT pact);
void edit_watchdog_kill(std::string &parm, enum PARM_ACT pact);
void edit_watchdog_tmo(std::string &parm, enum PARM_ACT pact);
void edit_v4l2_device(std::string &parm, enum PARM_ACT pact);
void edit_v4l2_params(std::string &parm, enum PARM_ACT pact);
void edit_netcam_high_params(std::string &parm, enum PARM_ACT pact);
void edit_netcam_high_url(std::string &parm, enum PARM_ACT pact);
void edit_netcam_params(std::string &parm, enum PARM_ACT pact);
void edit_netcam_url(std::string &parm, enum PARM_ACT pact);
void edit_netcam_userpass(std::string &parm, enum PARM_ACT pact);
void edit_libcam_device(std::string &parm, enum PARM_ACT pact);
void edit_libcam_params(std::string &parm, enum PARM_ACT pact);
void edit_width(std::string &parm, enum PARM_ACT pact);
void edit_height(std::string &parm, enum PARM_ACT pact);
void edit_framerate(std::string &parm, enum PARM_ACT pact);
void edit_rotate(std::string &parm, enum PARM_ACT pact);
void edit_flip_axis(std::string &parm, enum PARM_ACT pact);
void edit_locate_motion_mode(std::string &parm, enum PARM_ACT pact);
void edit_locate_motion_style(std::string &parm, enum PARM_ACT pact);
void edit_text_changes(std::string &parm, enum PARM_ACT pact);
void edit_text_event(std::string &parm, enum PARM_ACT pact);
void edit_text_left(std::string &parm, enum PARM_ACT pact);
void edit_text_right(std::string &parm, enum PARM_ACT pact);
void edit_text_scale(std::string &parm, enum PARM_ACT pact);
void edit_emulate_motion(std::string &parm, enum PARM_ACT pact);
void edit_threshold(std::string &parm, enum PARM_ACT pact);
void edit_threshold_maximum(std::string &parm, enum PARM_ACT pact);
void edit_threshold_ratio(std::string &parm, enum PARM_ACT pact);
void edit_threshold_ratio_change(std::string &parm, enum PARM_ACT pact);
void edit_threshold_sdevx(std::string &parm, enum PARM_ACT pact);
void edit_threshold_sdevxy(std::string &parm, enum PARM_ACT pact);
void edit_threshold_sdevy(std::string &parm, enum PARM_ACT pact);
void edit_threshold_tune(std::string &parm, enum PARM_ACT pact);
void edit_secondary_method(std::string &parm, enum PARM_ACT pact);
void edit_secondary_params(std::string &parm, enum PARM_ACT pact);
void edit_noise_level(std::string &parm, enum PARM_ACT pact);
void edit_noise_tune(std::string &parm, enum PARM_ACT pact);
void edit_despeckle_filter(std::string &parm, enum PARM_ACT pact);
void edit_area_detect(std::string &parm, enum PARM_ACT pact);
void edit_mask_file(std::string &parm, enum PARM_ACT pact);
void edit_mask_privacy(std::string &parm, enum PARM_ACT pact);
void edit_smart_mask_speed(std::string &parm, enum PARM_ACT pact);
void edit_lightswitch_frames(std::string &parm, enum PARM_ACT pact);
void edit_lightswitch_percent(std::string &parm, enum PARM_ACT pact);
void edit_minimum_motion_frames(std::string &parm, enum PARM_ACT pact);
void edit_event_gap(std::string &parm, enum PARM_ACT pact);
void edit_static_object_time(std::string &parm, enum PARM_ACT pact);
void edit_post_capture(std::string &parm, enum PARM_ACT pact);
void edit_pre_capture(std::string &parm, enum PARM_ACT pact);
void edit_on_action_user(std::string &parm, enum PARM_ACT pact);
void edit_on_area_detected(std::string &parm, enum PARM_ACT pact);
void edit_on_camera_found(std::string &parm, enum PARM_ACT pact);
void edit_on_camera_lost(std::string &parm, enum PARM_ACT pact);
void edit_on_event_end(std::string &parm, enum PARM_ACT pact);
void edit_on_event_start(std::string &parm, enum PARM_ACT pact);
void edit_on_motion_detected(std::string &parm, enum PARM_ACT pact);
void edit_on_movie_end(std::string &parm, enum PARM_ACT pact);
void edit_on_movie_start(std::string &parm, enum PARM_ACT pact);
void edit_on_picture_save(std::string &parm, enum PARM_ACT pact);
void edit_on_secondary_detect(std::string &parm, enum PARM_ACT pact);
void edit_on_sound_alert(std::string &parm, enum PARM_ACT pact);
void edit_picture_exif(std::string &parm, enum PARM_ACT pact);
void edit_picture_filename(std::string &parm, enum PARM_ACT pact);
void edit_picture_output(std::string &parm, enum PARM_ACT pact);
void edit_picture_output_motion(std::string &parm, enum PARM_ACT pact);
void edit_picture_quality(std::string &parm, enum PARM_ACT pact);
void edit_picture_type(std::string &parm, enum PARM_ACT pact);
void edit_snapshot_filename(std::string &parm, enum PARM_ACT pact);
void edit_snapshot_interval(std::string &parm, enum PARM_ACT pact);
void edit_movie_bps(std::string &parm, enum PARM_ACT pact);
void edit_movie_container(std::string &parm, enum PARM_ACT pact);
void edit_movie_extpipe(std::string &parm, enum PARM_ACT pact);
void edit_movie_extpipe_use(std::string &parm, enum PARM_ACT pact);
void edit_movie_filename(std::string &parm, enum PARM_ACT pact);
void edit_movie_max_time(std::string &parm, enum PARM_ACT pact);
void edit_movie_output(std::string &parm, enum PARM_ACT pact);
void edit_movie_output_motion(std::string &parm, enum PARM_ACT pact);
void edit_movie_passthrough(std::string &parm, enum PARM_ACT pact);
void edit_movie_quality(std::string &parm, enum PARM_ACT pact);
void edit_movie_retain(std::string &parm, enum PARM_ACT pact);
void edit_timelapse_container(std::string &parm, enum PARM_ACT pact);
void edit_timelapse_filename(std::string &parm, enum PARM_ACT pact);
void edit_timelapse_fps(std::string &parm, enum PARM_ACT pact);
void edit_timelapse_interval(std::string &parm, enum PARM_ACT pact);
void edit_timelapse_mode(std::string &parm, enum PARM_ACT pact);
void edit_video_pipe(std::string &parm, enum PARM_ACT pact);
void edit_video_pipe_motion(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_actions(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_auth_method(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_authentication(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_base_path(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_cert(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_headers(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_html(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_interface(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_ipv6(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_key(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_localhost(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_lock_attempts(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_lock_minutes(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_lock_script(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_parms(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_port(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_port2(std::string &parm, enum PARM_ACT pact);
void edit_webcontrol_tls(std::string &parm, enum PARM_ACT pact);
void edit_stream_grey(std::string &parm, enum PARM_ACT pact);
void edit_stream_maxrate(std::string &parm, enum PARM_ACT pact);
void edit_stream_motion(std::string &parm, enum PARM_ACT pact);
void edit_stream_preview_location(std::string &parm, enum PARM_ACT pact);
void edit_stream_preview_method(std::string &parm, enum PARM_ACT pact);
void edit_stream_preview_newline(std::string &parm, enum PARM_ACT pact);
void edit_stream_preview_ptz(std::string &parm, enum PARM_ACT pact);
void edit_stream_preview_scale(std::string &parm, enum PARM_ACT pact);
void edit_stream_quality(std::string &parm, enum PARM_ACT pact);
void edit_stream_scan_scale(std::string &parm, enum PARM_ACT pact);
void edit_stream_scan_time(std::string &parm, enum PARM_ACT pact);
void edit_database_busy_timeout(std::string &parm, enum PARM_ACT pact);
void edit_database_dbname(std::string &parm, enum PARM_ACT pact);
void edit_database_host(std::string &parm, enum PARM_ACT pact);
void edit_database_password(std::string &parm, enum PARM_ACT pact);
void edit_database_port(std::string &parm, enum PARM_ACT pact);
void edit_database_type(std::string &parm, enum PARM_ACT pact);
void edit_database_user(std::string &parm, enum PARM_ACT pact);
void edit_sql_event_end(std::string &parm, enum PARM_ACT pact);
void edit_sql_event_start(std::string &parm, enum PARM_ACT pact);
void edit_sql_movie_end(std::string &parm, enum PARM_ACT pact);
void edit_sql_movie_start(std::string &parm, enum PARM_ACT pact);
void edit_sql_pic_save(std::string &parm, enum PARM_ACT pact);
void edit_ptz_auto_track(std::string &parm, enum PARM_ACT pact);
void edit_ptz_move_track(std::string &parm, enum PARM_ACT pact);
void edit_ptz_pan_left(std::string &parm, enum PARM_ACT pact);
void edit_ptz_pan_right(std::string &parm, enum PARM_ACT pact);
void edit_ptz_tilt_down(std::string &parm, enum PARM_ACT pact);
void edit_ptz_tilt_up(std::string &parm, enum PARM_ACT pact);
void edit_ptz_wait(std::string &parm, enum PARM_ACT pact);
void edit_ptz_zoom_in(std::string &parm, enum PARM_ACT pact);
void edit_ptz_zoom_out(std::string &parm, enum PARM_ACT pact);
void edit_snd_device(std::string &parm, enum PARM_ACT pact);
void edit_snd_params(std::string &parm, enum PARM_ACT pact);
void edit_snd_alerts(std::list<std::string> &parm, enum PARM_ACT pact);
void edit_snd_alerts(std::string &parm, enum PARM_ACT pact);
void edit_snd_show(std::string &parm, enum PARM_ACT pact);
void edit_snd_window(std::string &parm, enum PARM_ACT pact);
};
#endif /* _INCLUDE_CONF_HPP_ */

5
src/motion_loop.cpp
View File

@@ -279,7 +279,6 @@ static void mlp_track_move(ctx_dev *cam)
/* motion detected */
static void mlp_detected(ctx_dev *cam)
{
ctx_config *conf = cam->conf;
unsigned int distX, distY;
cam->draw->locate();
@@ -293,8 +292,8 @@ static void mlp_detected(ctx_dev *cam)
mlp_detected_trigger(cam);
if (cam->current_image->shot <= conf->framerate) {
if ((conf->stream_motion == true) &&
if (cam->current_image->shot <= cam->conf->framerate) {
if ((cam->conf->stream_motion == true) &&
(cam->current_image->shot != 1)) {
webu_getimg_main(cam);
}

33
src/motionplus.cpp
View File

@@ -492,9 +492,6 @@ static void motpls_shutdown(ctx_motapp *motapp)
mydelete(motapp->webu);
mydelete(motapp->dbse);
conf_deinit(motapp);
mydelete(motapp->conf);
mydelete(motapp->all_sizes);
mydelete(motlog);
@@ -626,11 +623,11 @@ static void motpls_ntc(void)
/** Initialize upon start up or restart */
static void motpls_startup(ctx_motapp *motapp, int daemonize)
{
motapp->conf = new ctx_config;
motapp->conf = new cls_config;
motlog = new cls_log(motapp);
conf_init(motapp);
motapp->conf->init(motapp);
motlog->log_level = motapp->conf->log_level;
motlog->log_fflevel = 3;
@@ -647,7 +644,7 @@ static void motpls_startup(ctx_motapp *motapp, int daemonize)
}
}
conf_parms_log(motapp);
motapp->conf->parms_log(motapp);
motpls_pid_write(motapp);
@@ -839,10 +836,10 @@ static void motpls_init(ctx_motapp *motapp, int argc, char *argv[])
motapp->argv = argv;
motapp->cam_list = (ctx_dev **)mymalloc(sizeof(ctx_dev *));
motapp->cam_list[0] = NULL;
motapp->cam_list[0] = nullptr;
motapp->snd_list = (ctx_dev **)mymalloc(sizeof(ctx_dev *));
motapp->snd_list[0] = NULL;
motapp->snd_list[0] = nullptr;
motapp->threads_running = 0;
motapp->finish_all = false;
@@ -875,10 +872,28 @@ static void motpls_init(ctx_motapp *motapp, int argc, char *argv[])
static void motpls_deinit(ctx_motapp *motapp)
{
int indx;
motpls_av_deinit();
motpls_shutdown(motapp);
indx = 0;
while (motapp->cam_list[indx] != nullptr) {
mydelete(motapp->cam_list[indx]->conf);
mydelete(motapp->cam_list[indx]);
indx++;
};
myfree(motapp->cam_list);
indx = 0;
while (motapp->snd_list[indx] != nullptr) {
mydelete(motapp->snd_list[indx]->conf);
mydelete(motapp->snd_list[indx]);
indx++;
};
myfree(motapp->snd_list);
pthread_key_delete(tls_key_threadnr);
pthread_mutex_destroy(&motapp->global_lock);
pthread_mutex_destroy(&motapp->mutex_parms);
@@ -896,7 +911,7 @@ static void motpls_cam_add(ctx_motapp *motapp)
}
pthread_mutex_lock(&motapp->mutex_camlst);
conf_camera_add(motapp);
motapp->conf->camera_add(motapp);
pthread_mutex_unlock(&motapp->mutex_camlst);
indx = 1;

7
src/motionplus.hpp
View File

@@ -113,12 +113,11 @@
#endif
struct ctx_motapp;
struct ctx_images;
struct ctx_image_data;
struct ctx_algsec;
struct ctx_config;
class cls_config;
class cls_dbse;
class cls_draw;
class cls_log;
@@ -488,7 +487,7 @@ struct ctx_dev {
int threadnr;
pthread_t thread_id;
ctx_config *conf;
cls_config *conf;
ctx_images imgs;
ctx_image_data *current_image; /* Pointer to a structure where the image, diffs etc is stored */
@@ -609,7 +608,7 @@ struct ctx_motapp {
int argc;
char **argv;
bool pause;
ctx_config *conf;
cls_config *conf;
int cam_cnt;
int snd_cnt;
ctx_all_sizes *all_sizes;

2
src/sound.cpp
View File

@@ -130,7 +130,7 @@ static void snd_load_alerts(ctx_dev *snd)
ctx_params *tmp_params;
p_it it;
conf_edit_get(snd->conf, "snd_alerts", parm_val, PARM_CAT_18);
snd->conf->edit_get("snd_alerts", parm_val, PARM_CAT_18);
tmp_params = new ctx_params;
for (it_a=parm_val.begin(); it_a!=parm_val.end(); it_a++) {

24
src/webu_json.cpp
View File

@@ -26,7 +26,7 @@
#include "webu_json.hpp"
#include "dbse.hpp"
void cls_webu_json::parms_item(ctx_config *conf, int indx_parm)
void cls_webu_json::parms_item(cls_config *conf, int indx_parm)
{
size_t indx;
std::string parm_orig, parm_val, parm_list, parm_enable;
@@ -41,7 +41,7 @@ void cls_webu_json::parms_item(ctx_config *conf, int indx_parm)
parm_enable = "true";
}
conf_edit_get(conf, config_parms[indx_parm].parm_name
conf->edit_get(config_parms[indx_parm].parm_name
, parm_orig, config_parms[indx_parm].parm_cat);
for (indx = 0; indx < parm_orig.length(); indx++) {
@@ -59,7 +59,7 @@ void cls_webu_json::parms_item(ctx_config *conf, int indx_parm)
" \"value\":" + parm_val +
",\"enabled\":" + parm_enable +
",\"category\":" + std::to_string(config_parms[indx_parm].parm_cat) +
",\"type\":\"" + conf_type_desc(config_parms[indx_parm].parm_type) + "\"" +
",\"type\":\"" + conf->type_desc(config_parms[indx_parm].parm_type) + "\"" +
"}";
} else if (config_parms[indx_parm].parm_type == PARM_TYP_BOOL) {
@@ -70,7 +70,7 @@ void cls_webu_json::parms_item(ctx_config *conf, int indx_parm)
" \"value\":true" +
",\"enabled\":" + parm_enable +
",\"category\":" + std::to_string(config_parms[indx_parm].parm_cat) +
",\"type\":\"" + conf_type_desc(config_parms[indx_parm].parm_type) + "\""+
",\"type\":\"" + conf->type_desc(config_parms[indx_parm].parm_type) + "\""+
"}";
} else {
webua->resp_page +=
@@ -79,11 +79,11 @@ void cls_webu_json::parms_item(ctx_config *conf, int indx_parm)
" \"value\":false" +
",\"enabled\":" + parm_enable +
",\"category\":" + std::to_string(config_parms[indx_parm].parm_cat) +
",\"type\":\"" + conf_type_desc(config_parms[indx_parm].parm_type) + "\"" +
",\"type\":\"" + conf->type_desc(config_parms[indx_parm].parm_type) + "\"" +
"}";
}
} else if (config_parms[indx_parm].parm_type == PARM_TYP_LIST) {
conf_edit_list(conf, config_parms[indx_parm].parm_name
conf->edit_list(config_parms[indx_parm].parm_name
, parm_list, config_parms[indx_parm].parm_cat);
webua->resp_page +=
@@ -92,7 +92,7 @@ void cls_webu_json::parms_item(ctx_config *conf, int indx_parm)
" \"value\": \"" + parm_val + "\"" +
",\"enabled\":" + parm_enable +
",\"category\":" + std::to_string(config_parms[indx_parm].parm_cat) +
",\"type\":\"" + conf_type_desc(config_parms[indx_parm].parm_type) + "\"" +
",\"type\":\"" + conf->type_desc(config_parms[indx_parm].parm_type) + "\"" +
",\"list\":" + parm_list +
"}";
@@ -103,12 +103,12 @@ void cls_webu_json::parms_item(ctx_config *conf, int indx_parm)
" \"value\":\"" + parm_val + "\"" +
",\"enabled\":" + parm_enable +
",\"category\":" + std::to_string(config_parms[indx_parm].parm_cat) +
",\"type\":\""+ conf_type_desc(config_parms[indx_parm].parm_type) + "\"" +
",\"type\":\""+ conf->type_desc(config_parms[indx_parm].parm_type) + "\"" +
"}";
}
}
void cls_webu_json::parms_one(ctx_config *conf)
void cls_webu_json::parms_one(cls_config *conf)
{
int indx_parm;
bool first;
@@ -138,7 +138,7 @@ void cls_webu_json::parms_one(ctx_config *conf)
" \"value\":\"\"" +
",\"enabled\":false" +
",\"category\":" + std::to_string(config_parms[indx_parm].parm_cat) +
",\"type\":\""+ conf_type_desc(config_parms[indx_parm].parm_type) + "\"";
",\"type\":\""+ conf->type_desc(config_parms[indx_parm].parm_type) + "\"";
if (config_parms[indx_parm].parm_type == PARM_TYP_LIST) {
webua->resp_page += ",\"list\":[\"na\"]";
@@ -207,8 +207,8 @@ void cls_webu_json::categories_list()
}
webua->resp_page += "\"" + std::to_string(indx_cat) + "\": ";
catnm_long = conf_cat_desc((enum PARM_CAT)indx_cat, false);
catnm_short = conf_cat_desc((enum PARM_CAT)indx_cat, true);
catnm_long = webua->app->conf->cat_desc((enum PARM_CAT)indx_cat, false);
catnm_short = webua->app->conf->cat_desc((enum PARM_CAT)indx_cat, true);
webua->resp_page += "{\"name\":\"" + catnm_short + "\",\"display\":\"" + catnm_long + "\"}";

4
src/webu_json.hpp
View File

@@ -27,8 +27,8 @@
ctx_motapp *app;
cls_webu *webu;
cls_webu_ans *webua;
void parms_item(ctx_config *conf, int indx_parm);
void parms_one(ctx_config *conf);
void parms_item(cls_config *conf, int indx_parm);
void parms_one(cls_config *conf);
void parms_all();
void cameras_list();
void categories_list();

10
src/webu_post.cpp
View File

@@ -464,7 +464,7 @@ void cls_webu_post::write_config()
}
}
conf_parms_write(app);
app->conf->parms_write(app);
}
@@ -521,12 +521,12 @@ void cls_webu_post::config()
if (config_parms[indx2].parm_name != "") {
if (config_parms[indx2].parm_cat == PARM_CAT_00) {
conf_edit_set(app->conf
, config_parms[indx2].parm_name
app->conf->edit_set(
config_parms[indx2].parm_name
, post_info[indx].key_val);
} else {
conf_edit_set(app->cam_list[webua->camindx]->conf
, config_parms[indx2].parm_name
app->cam_list[webua->camindx]->conf->edit_set(
config_parms[indx2].parm_name
, post_info[indx].key_val);
}
}