From 2d25d53561fcc3fd8381eb234e2e439a399b1bbf Mon Sep 17 00:00:00 2001 From: Mr-Dave Date: Tue, 31 Jan 2023 21:14:56 -0700 Subject: [PATCH] Revise MOTION_LOG to MOTPLS_LOG --- src/alg.cpp | 4 +- src/alg_sec.cpp | 62 +++--- src/conf.cpp | 482 ++++++++++++++++++++--------------------- src/dbse.cpp | 82 +++---- src/draw.cpp | 4 +- src/event.cpp | 70 +++--- src/jpegutils.cpp | 10 +- src/libcam.cpp | 58 ++--- src/logger.cpp | 16 +- src/logger.hpp | 1 - src/motion_loop.cpp | 48 ++-- src/motionplus.cpp | 94 ++++---- src/movie.cpp | 152 ++++++------- src/netcam.cpp | 216 +++++++++--------- src/picture.cpp | 58 ++--- src/rotate.cpp | 2 +- src/sound.cpp | 114 +++++----- src/util.cpp | 52 ++--- src/video_common.cpp | 6 +- src/video_loopback.cpp | 72 +++--- src/video_v4l2.cpp | 186 ++++++++-------- src/webu.cpp | 76 +++---- src/webu_file.cpp | 4 +- src/webu_html.cpp | 2 +- src/webu_json.cpp | 2 +- src/webu_post.cpp | 62 +++--- src/webu_stream.cpp | 10 +- 27 files changed, 972 insertions(+), 973 deletions(-) diff --git a/src/alg.cpp b/src/alg.cpp index 9e7c1f4f..f6dd036a 100644 --- a/src/alg.cpp +++ b/src/alg.cpp @@ -891,7 +891,7 @@ static void alg_lightswitch(ctx_dev *cam) if (cam->conf->lightswitch_percent >= 1 && !cam->lost_connection) { if (cam->current_image->diffs > (cam->imgs.motionsize * cam->conf->lightswitch_percent / 100)) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, _("Lightswitch detected")); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, _("Lightswitch detected")); if (cam->frame_skip < (unsigned int)cam->conf->lightswitch_frames) { cam->frame_skip = (unsigned int)cam->conf->lightswitch_frames; } @@ -1161,7 +1161,7 @@ void alg_stddev(ctx_dev *cam) { /* - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO, "dev_x %d dev_y %d dev_xy %d, diff %d ratio %d" + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO, "dev_x %d dev_y %d dev_xy %d, diff %d ratio %d" , cam->current_image->location.stddev_x , cam->current_image->location.stddev_y , cam->current_image->location.stddev_xy diff --git a/src/alg_sec.cpp b/src/alg_sec.cpp index 81ef9e84..a91b5059 100644 --- a/src/alg_sec.cpp +++ b/src/alg_sec.cpp @@ -54,7 +54,7 @@ static void algsec_image_show(ctx_dev *cam, Mat &mat_dst) if ((cam->motapp->conf->log_level >= DBG) && (algmdl->isdetected == true)) { - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO, "Saved detected image: %s%s%s%s" + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO, "Saved detected image: %s%s%s%s" , cam->conf->target_dir.c_str() , "/detect_" , algmdl->method.c_str() @@ -92,7 +92,7 @@ static void algsec_image_label(ctx_dev *cam, Mat &mat_dst if (cam->motapp->conf->log_level >= DBG) { imwrite(cam->conf->target_dir + "/src_" + algmdl->method + ".jpg" , mat_dst); - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO, "Saved source image: %s%s%s%s" + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO, "Saved source image: %s%s%s%s" , cam->conf->target_dir.c_str() , "/src_" , algmdl->method.c_str() @@ -132,8 +132,8 @@ static void algsec_image_label(ctx_dev *cam, Mat &mat_dst } catch ( cv::Exception& e ) { const char* err_msg = e.what(); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Disabling secondary detection")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Disabling secondary detection")); algmdl->method = "none"; } @@ -151,7 +151,7 @@ static void algsec_image_label(ctx_dev *cam, Mat &mat_dst if (cam->motapp->conf->log_level >= DBG) { imwrite(cam->conf->target_dir + "/src_" + algmdl->method + ".jpg" , mat_dst); - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO, "Saved source image: %s%s%s%s" + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO, "Saved source image: %s%s%s%s" , cam->conf->target_dir.c_str() , "/src_" , algmdl->method.c_str() @@ -176,8 +176,8 @@ static void algsec_image_label(ctx_dev *cam, Mat &mat_dst } catch ( cv::Exception& e ) { const char* err_msg = e.what(); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Disabling secondary detection")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Disabling secondary detection")); algmdl->method = "none"; } @@ -205,17 +205,17 @@ static void algsec_image_roi(ctx_dev *cam, Mat &mat_src, Mat &mat_dst) roi.width = width; roi.height = height; - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Base %d %d (%dx%d) img(%dx%d)" + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Base %d %d (%dx%d) img(%dx%d)" ,cam->current_image->location.minx ,cam->current_image->location.miny ,cam->current_image->location.width ,cam->current_image->location.height ,cam->imgs.width ,cam->imgs.height); - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Set %d %d %d %d" + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Set %d %d %d %d" ,x,y,width,height); - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Opencv %d %d %d %d" + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Opencv %d %d %d %d" ,roi.x,roi.y,roi.width,roi.height); mat_dst = mat_src(roi); @@ -276,8 +276,8 @@ static void algsec_detect_hog(ctx_dev *cam) } catch ( cv::Exception& e ) { const char* err_msg = e.what(); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Disabling secondary detection")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Disabling secondary detection")); algmdl->method = "none"; } } @@ -307,8 +307,8 @@ static void algsec_detect_haar(ctx_dev *cam) } catch ( cv::Exception& e ) { const char* err_msg = e.what(); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Disabling secondary detection")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Disabling secondary detection")); algmdl->method = "none"; } } @@ -344,8 +344,8 @@ static void algsec_detect_dnn(ctx_dev *cam) } catch ( cv::Exception& e ) { const char* err_msg = e.what(); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Disabling secondary detection")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Disabling secondary detection")); algmdl->method = "none"; } } @@ -356,19 +356,19 @@ static void algsec_load_haar(ctx_dev *cam) try { if (algmdl->model_file == "") { algmdl->method = "none"; - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("No secondary model specified.")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("No secondary model specified.")); return; } if (algmdl->haar_cascade.load(algmdl->model_file) == false) { /* Loading failed, reset method*/ algmdl->method = "none"; - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Failed loading model %s") + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Failed loading model %s") ,algmdl->model_file.c_str()); }; } catch ( cv::Exception& e ) { const char* err_msg = e.what(); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Failed loading model %s") + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Failed loading model %s") , algmdl->model_file.c_str()); algmdl->method = "none"; } @@ -383,7 +383,7 @@ static void algsec_load_dnn(ctx_dev *cam) try { if (algmdl->model_file == "") { algmdl->method = "none"; - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("No secondary model specified.")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("No secondary model specified.")); return; } algmdl->net = readNet( @@ -396,7 +396,7 @@ static void algsec_load_dnn(ctx_dev *cam) ifs.open(algmdl->dnn_classes_file.c_str()); if (ifs.is_open() == false) { algmdl->method = "none"; - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Classes file not found: %s") ,algmdl->dnn_classes_file.c_str()); return; @@ -408,8 +408,8 @@ static void algsec_load_dnn(ctx_dev *cam) } catch ( cv::Exception& e ) { const char* err_msg = e.what(); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Failed loading model %s") + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Error %s"),err_msg); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("Failed loading model %s") , algmdl->model_file.c_str()); algmdl->method = "none"; } @@ -607,7 +607,7 @@ static void *algsec_handler(void *arg) ctx_dev *cam = (ctx_dev*)arg; long interval; - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("Starting.")); + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("Starting.")); cam->algsec->closing = false; cam->algsec->thread_running = true; @@ -633,7 +633,7 @@ static void *algsec_handler(void *arg) } } cam->algsec->closing = false; - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("Exiting.")); + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("Exiting.")); cam->algsec->thread_running = false; pthread_exit(NULL); @@ -653,7 +653,7 @@ static void algsec_start_handler(ctx_dev *cam) pthread_attr_setdetachstate(&handler_attribute, PTHREAD_CREATE_DETACHED); retcd = pthread_create(&cam->algsec->threadid, &handler_attribute, &algsec_handler, cam); if (retcd < 0) { - MOTION_LOG(ALR, TYPE_NETCAM, SHOW_ERRNO + MOTPLS_LOG(ALR, TYPE_NETCAM, SHOW_ERRNO ,_("Error starting algsec handler thread")); cam->algsec->models.method = "none"; } @@ -697,7 +697,7 @@ void algsec_deinit(ctx_dev *cam) } } if (waitcnt == 1000){ - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("Graceful shutdown of secondary detector thread failed")); } } @@ -746,12 +746,12 @@ void algsec_detect(ctx_dev *cam) cam->algsec->frame_cnt = cam->algsec->models.frame_interval; if (cam->algsec->frame_missed >10){ if (cam->algsec->too_slow == 0) { - MOTION_LOG(WRN, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_NETCAM, NO_ERRNO ,_("Your computer is too slow for these settings.")); } else if (cam->algsec->too_slow == 10){ - MOTION_LOG(WRN, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_NETCAM, NO_ERRNO ,_("Missed many frames for secondary detection.")); - MOTION_LOG(WRN, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_NETCAM, NO_ERRNO ,_("Your computer is too slow.")); } cam->algsec->too_slow++; diff --git a/src/conf.cpp b/src/conf.cpp index fac051c4..263c3567 100644 --- a/src/conf.cpp +++ b/src/conf.cpp @@ -466,7 +466,7 @@ static void conf_edit_daemon(ctx_config *conf, std::string &parm, enum PARM_ACT conf_edit_get_bool(parm, conf->daemon); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","daemon",_("daemon")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","daemon",_("daemon")); } static void conf_edit_setup_mode(ctx_config *conf, std::string &parm, int pact) @@ -479,7 +479,7 @@ static void conf_edit_setup_mode(ctx_config *conf, std::string &parm, int pact) conf_edit_get_bool(parm, conf->setup_mode); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","setup_mode",_("setup_mode")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","setup_mode",_("setup_mode")); } static void conf_edit_conf_filename(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -492,7 +492,7 @@ static void conf_edit_conf_filename(ctx_config *conf, std::string &parm, enum PA parm = conf->conf_filename; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","log_file",_("log_file")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","log_file",_("log_file")); } static void conf_edit_pid_file(ctx_config *conf, std::string &parm, int pact) @@ -505,7 +505,7 @@ static void conf_edit_pid_file(ctx_config *conf, std::string &parm, int pact) parm = conf->pid_file; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","pid_file",_("pid_file")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","pid_file",_("pid_file")); } static void conf_edit_log_file(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -525,7 +525,7 @@ static void conf_edit_log_file(ctx_config *conf, std::string &parm, enum PARM_AC parm = conf->log_file; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","log_file",_("log_file")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","log_file",_("log_file")); } static void conf_edit_log_level(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -536,7 +536,7 @@ static void conf_edit_log_level(ctx_config *conf, std::string &parm, enum PARM_A } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 9)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid log_level %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid log_level %d"),parm_in); } else { conf->log_level = parm_in; } @@ -550,7 +550,7 @@ static void conf_edit_log_level(ctx_config *conf, std::string &parm, enum PARM_A } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","log_level",_("log_level")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","log_level",_("log_level")); } static void conf_edit_log_type(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -565,7 +565,7 @@ static void conf_edit_log_type(ctx_config *conf, std::string &parm, enum PARM_AC (parm == "VID") || (parm == "ALL")) { conf->log_type_str = parm; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid log_type %s"),parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid log_type %s"),parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->log_type_str; @@ -576,7 +576,7 @@ static void conf_edit_log_type(ctx_config *conf, std::string &parm, enum PARM_AC parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","log_type",_("log_type")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","log_type",_("log_type")); } static void conf_edit_native_language(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -589,7 +589,7 @@ static void conf_edit_native_language(ctx_config *conf, std::string &parm, enum conf_edit_get_bool(parm, conf->native_language); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","native_language",_("native_language")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","native_language",_("native_language")); } static void conf_edit_camera(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -600,7 +600,7 @@ static void conf_edit_camera(ctx_config *conf, std::string &parm, enum PARM_ACT parm = conf->conf_filename; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","camera",_("camera")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","camera",_("camera")); } static void conf_edit_device_name(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -613,7 +613,7 @@ static void conf_edit_device_name(ctx_config *conf, std::string &parm, enum PARM parm = conf->device_name; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","device_name",_("device_name")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","device_name",_("device_name")); } static void conf_edit_device_id(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -625,9 +625,9 @@ static void conf_edit_device_id(ctx_config *conf, std::string &parm, enum PARM_A } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if (parm_in < 1) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid device_id %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid device_id %d"),parm_in); } else if (parm_in > 32000) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid device_id %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid device_id %d"),parm_in); } else { conf->device_id = parm_in; } @@ -635,7 +635,7 @@ static void conf_edit_device_id(ctx_config *conf, std::string &parm, enum PARM_A parm = std::to_string(conf->device_id); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","device_id",_("device_id")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","device_id",_("device_id")); } static void conf_edit_device_tmo(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -646,7 +646,7 @@ static void conf_edit_device_tmo(ctx_config *conf, std::string &parm, enum PARM_ } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if (parm_in < 1) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid device_tmo %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid device_tmo %d"),parm_in); } else { conf->device_tmo = parm_in; } @@ -654,7 +654,7 @@ static void conf_edit_device_tmo(ctx_config *conf, std::string &parm, enum PARM_ parm = std::to_string(conf->device_tmo); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","device_tmo",_("device_tmo")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","device_tmo",_("device_tmo")); } static void conf_edit_pause(ctx_config *conf, std::string &parm, int pact) @@ -667,7 +667,7 @@ static void conf_edit_pause(ctx_config *conf, std::string &parm, int pact) conf_edit_get_bool(parm, conf->pause); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","pause",_("pause")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","pause",_("pause")); } static void conf_edit_config_dir(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -680,7 +680,7 @@ static void conf_edit_config_dir(ctx_config *conf, std::string &parm, enum PARM_ parm = conf->config_dir; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","config_dir",_("config_dir")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","config_dir",_("config_dir")); } static void conf_edit_target_dir(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -689,7 +689,7 @@ static void conf_edit_target_dir(ctx_config *conf, std::string &parm, enum PARM_ conf->target_dir = "."; } else if (pact == PARM_ACT_SET) { if (parm.find("%", 0) != std::string::npos) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Invalid target_dir. Conversion specifiers not permitted. %s") , parm.c_str()); } else { @@ -699,7 +699,7 @@ static void conf_edit_target_dir(ctx_config *conf, std::string &parm, enum PARM_ parm = conf->target_dir; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","target_dir",_("target_dir")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","target_dir",_("target_dir")); } static void conf_edit_watchdog_tmo(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -710,7 +710,7 @@ static void conf_edit_watchdog_tmo(ctx_config *conf, std::string &parm, enum PAR } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if (parm_in < 1) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid watchdog timeout %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid watchdog timeout %d"),parm_in); } else { conf->watchdog_tmo = parm_in; } @@ -718,7 +718,7 @@ static void conf_edit_watchdog_tmo(ctx_config *conf, std::string &parm, enum PAR parm = std::to_string(conf->watchdog_tmo); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","watchdog_tmo",_("watchdog_tmo")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","watchdog_tmo",_("watchdog_tmo")); } static void conf_edit_watchdog_kill(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -729,7 +729,7 @@ static void conf_edit_watchdog_kill(ctx_config *conf, std::string &parm, enum PA } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if (parm_in < 1) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid watchdog kill timeout %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid watchdog kill timeout %d"),parm_in); } else { conf->watchdog_kill = parm_in; } @@ -737,7 +737,7 @@ static void conf_edit_watchdog_kill(ctx_config *conf, std::string &parm, enum PA parm = std::to_string(conf->watchdog_kill); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","watchdog_kill",_("watchdog_kill")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","watchdog_kill",_("watchdog_kill")); } static void conf_edit_v4l2_device(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -750,7 +750,7 @@ static void conf_edit_v4l2_device(ctx_config *conf, std::string &parm, enum PARM parm = conf->v4l2_device; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","v4l2_device",_("v4l2_device")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","v4l2_device",_("v4l2_device")); } static void conf_edit_v4l2_params(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -763,7 +763,7 @@ static void conf_edit_v4l2_params(ctx_config *conf, std::string &parm, enum PARM parm = conf->v4l2_params; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","v4l2_params",_("v4l2_params")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","v4l2_params",_("v4l2_params")); } static void conf_edit_netcam_url(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -776,7 +776,7 @@ static void conf_edit_netcam_url(ctx_config *conf, std::string &parm, enum PARM_ parm = conf->netcam_url; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_url",_("netcam_url")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_url",_("netcam_url")); } static void conf_edit_netcam_params(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -789,7 +789,7 @@ static void conf_edit_netcam_params(ctx_config *conf, std::string &parm, enum PA parm = conf->netcam_params; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_params",_("netcam_params")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_params",_("netcam_params")); } static void conf_edit_netcam_high_url(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -802,7 +802,7 @@ static void conf_edit_netcam_high_url(ctx_config *conf, std::string &parm, enum parm = conf->netcam_high_url; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_high_url",_("netcam_high_url")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_high_url",_("netcam_high_url")); } static void conf_edit_netcam_high_params(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -815,7 +815,7 @@ static void conf_edit_netcam_high_params(ctx_config *conf, std::string &parm, en parm = conf->netcam_high_params; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_high_params",_("netcam_high_params")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_high_params",_("netcam_high_params")); } static void conf_edit_netcam_userpass(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -828,7 +828,7 @@ static void conf_edit_netcam_userpass(ctx_config *conf, std::string &parm, enum parm = conf->netcam_userpass; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_userpass",_("netcam_userpass")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_userpass",_("netcam_userpass")); } static void conf_edit_libcam_device(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -841,7 +841,7 @@ static void conf_edit_libcam_device(ctx_config *conf, std::string &parm, enum PA parm = conf->libcam_device; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","libcam_device",_("libcam_device")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","libcam_device",_("libcam_device")); } static void conf_edit_libcam_params(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -854,7 +854,7 @@ static void conf_edit_libcam_params(ctx_config *conf, std::string &parm, enum PA parm = conf->libcam_params; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","libcam_params",_("libcam_params")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","libcam_params",_("libcam_params")); } static void conf_edit_width(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -865,12 +865,12 @@ static void conf_edit_width(ctx_config *conf, std::string &parm, enum PARM_ACT p } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 64) || (parm_in > 9999)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid width %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid width %d"),parm_in); } else if (parm_in % 8) { - MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(CRT, TYPE_NETCAM, NO_ERRNO ,_("Image width (%d) requested is not modulo 8."), parm_in); parm_in = parm_in - (parm_in % 8) + 8; - MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(CRT, TYPE_NETCAM, NO_ERRNO ,_("Adjusting width to next higher multiple of 8 (%d)."), parm_in); conf->width = parm_in; } else { @@ -880,7 +880,7 @@ static void conf_edit_width(ctx_config *conf, std::string &parm, enum PARM_ACT p parm = std::to_string(conf->width); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","width",_("width")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","width",_("width")); } static void conf_edit_height(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -891,12 +891,12 @@ static void conf_edit_height(ctx_config *conf, std::string &parm, enum PARM_ACT } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 64) || (parm_in > 9999)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid height %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid height %d"),parm_in); } else if (parm_in % 8) { - MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(CRT, TYPE_NETCAM, NO_ERRNO ,_("Image height (%d) requested is not modulo 8."), parm_in); parm_in = parm_in - (parm_in % 8) + 8; - MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(CRT, TYPE_NETCAM, NO_ERRNO ,_("Adjusting height to next higher multiple of 8 (%d)."), parm_in); conf->height = parm_in; } else { @@ -906,7 +906,7 @@ static void conf_edit_height(ctx_config *conf, std::string &parm, enum PARM_ACT parm = std::to_string(conf->height); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","height",_("height")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","height",_("height")); } static void conf_edit_framerate(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -917,7 +917,7 @@ static void conf_edit_framerate(ctx_config *conf, std::string &parm, enum PARM_A } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 2) || (parm_in > 100)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid framerate %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid framerate %d"),parm_in); } else { conf->framerate = parm_in; } @@ -925,7 +925,7 @@ static void conf_edit_framerate(ctx_config *conf, std::string &parm, enum PARM_A parm = std::to_string(conf->framerate); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","framerate",_("framerate")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","framerate",_("framerate")); } static void conf_edit_rotate(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -937,7 +937,7 @@ static void conf_edit_rotate(ctx_config *conf, std::string &parm, enum PARM_ACT parm_in = atoi(parm.c_str()); if ((parm_in != 0) && (parm_in != 90) && (parm_in != 180) && (parm_in != 270) ) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid rotate %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid rotate %d"),parm_in); } else { conf->rotate = parm_in; } @@ -947,7 +947,7 @@ static void conf_edit_rotate(ctx_config *conf, std::string &parm, enum PARM_ACT parm = "[\"0\",\"90\",\"180\",\"270\"]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","rotate",_("rotate")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","rotate",_("rotate")); } static void conf_edit_flip_axis(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -960,7 +960,7 @@ static void conf_edit_flip_axis(ctx_config *conf, std::string &parm, enum PARM_A } else if (parm == "") { conf->flip_axis = "none"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid flip_axis %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid flip_axis %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->flip_axis; @@ -969,7 +969,7 @@ static void conf_edit_flip_axis(ctx_config *conf, std::string &parm, enum PARM_A } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","flip_axis",_("flip_axis")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","flip_axis",_("flip_axis")); } static void conf_edit_locate_motion_mode(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -982,7 +982,7 @@ static void conf_edit_locate_motion_mode(ctx_config *conf, std::string &parm, en } else if (parm == "") { conf->locate_motion_mode = "off"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid locate_motion_mode %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid locate_motion_mode %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->locate_motion_mode; @@ -990,7 +990,7 @@ static void conf_edit_locate_motion_mode(ctx_config *conf, std::string &parm, en parm = "[\"off\",\"on\",\"preview\"]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","locate_motion_mode",_("locate_motion_mode")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","locate_motion_mode",_("locate_motion_mode")); } static void conf_edit_locate_motion_style(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1004,7 +1004,7 @@ static void conf_edit_locate_motion_style(ctx_config *conf, std::string &parm, e } else if (parm == "") { conf->locate_motion_style = "box"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid locate_motion_style %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid locate_motion_style %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->locate_motion_style; @@ -1012,7 +1012,7 @@ static void conf_edit_locate_motion_style(ctx_config *conf, std::string &parm, e parm = "[\"box\",\"redbox\",\"cross\",\"redcross\"]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","locate_motion_style",_("locate_motion_style")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","locate_motion_style",_("locate_motion_style")); } static void conf_edit_text_left(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1025,7 +1025,7 @@ static void conf_edit_text_left(ctx_config *conf, std::string &parm, enum PARM_A parm = conf->text_left; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","text_left",_("text_left")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","text_left",_("text_left")); } static void conf_edit_text_right(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1038,7 +1038,7 @@ static void conf_edit_text_right(ctx_config *conf, std::string &parm, enum PARM_ parm = conf->text_right; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","text_right",_("text_right")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","text_right",_("text_right")); } static void conf_edit_text_changes(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1051,7 +1051,7 @@ static void conf_edit_text_changes(ctx_config *conf, std::string &parm, enum PAR conf_edit_get_bool(parm, conf->text_changes); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","text_changes",_("text_changes")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","text_changes",_("text_changes")); } static void conf_edit_text_scale(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1062,7 +1062,7 @@ static void conf_edit_text_scale(ctx_config *conf, std::string &parm, enum PARM_ } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 10)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid text_scale %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid text_scale %d"),parm_in); } else { conf->text_scale = parm_in; } @@ -1075,7 +1075,7 @@ static void conf_edit_text_scale(ctx_config *conf, std::string &parm, enum PARM_ parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","text_scale",_("text_scale")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","text_scale",_("text_scale")); } static void conf_edit_text_event(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1088,7 +1088,7 @@ static void conf_edit_text_event(ctx_config *conf, std::string &parm, enum PARM_ parm = conf->text_event; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","text_event",_("text_event")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","text_event",_("text_event")); } static void conf_edit_emulate_motion(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1101,7 +1101,7 @@ static void conf_edit_emulate_motion(ctx_config *conf, std::string &parm, enum P conf_edit_get_bool(parm, conf->emulate_motion); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","emulate_motion",_("emulate_motion")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","emulate_motion",_("emulate_motion")); } static void conf_edit_threshold(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1112,7 +1112,7 @@ static void conf_edit_threshold(ctx_config *conf, std::string &parm, enum PARM_A } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 2147483647)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold %d"),parm_in); } else { conf->threshold = parm_in; } @@ -1120,7 +1120,7 @@ static void conf_edit_threshold(ctx_config *conf, std::string &parm, enum PARM_A parm = std::to_string(conf->threshold); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold",_("threshold")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold",_("threshold")); } static void conf_edit_threshold_maximum(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1131,7 +1131,7 @@ static void conf_edit_threshold_maximum(ctx_config *conf, std::string &parm, enu } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) ) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_maximum %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_maximum %d"),parm_in); } else { conf->threshold_maximum = parm_in; } @@ -1139,7 +1139,7 @@ static void conf_edit_threshold_maximum(ctx_config *conf, std::string &parm, enu parm = std::to_string(conf->threshold_maximum); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_maximum",_("threshold_maximum")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_maximum",_("threshold_maximum")); } static void conf_edit_threshold_sdevx(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1150,7 +1150,7 @@ static void conf_edit_threshold_sdevx(ctx_config *conf, std::string &parm, enum } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) ) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_sdevx %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_sdevx %d"),parm_in); } else { conf->threshold_sdevx = parm_in; } @@ -1158,7 +1158,7 @@ static void conf_edit_threshold_sdevx(ctx_config *conf, std::string &parm, enum parm = std::to_string(conf->threshold_sdevx); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_sdevx",_("threshold_sdevx")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_sdevx",_("threshold_sdevx")); } static void conf_edit_threshold_sdevy(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1169,7 +1169,7 @@ static void conf_edit_threshold_sdevy(ctx_config *conf, std::string &parm, enum } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) ) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_sdevy %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_sdevy %d"),parm_in); } else { conf->threshold_sdevy = parm_in; } @@ -1177,7 +1177,7 @@ static void conf_edit_threshold_sdevy(ctx_config *conf, std::string &parm, enum parm = std::to_string(conf->threshold_sdevy); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_sdevy",_("threshold_sdevy")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_sdevy",_("threshold_sdevy")); } static void conf_edit_threshold_sdevxy(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1188,7 +1188,7 @@ static void conf_edit_threshold_sdevxy(ctx_config *conf, std::string &parm, enum } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) ) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_sdevxy %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_sdevxy %d"),parm_in); } else { conf->threshold_sdevxy = parm_in; } @@ -1196,7 +1196,7 @@ static void conf_edit_threshold_sdevxy(ctx_config *conf, std::string &parm, enum parm = std::to_string(conf->threshold_sdevxy); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_sdevxy",_("threshold_sdevxy")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_sdevxy",_("threshold_sdevxy")); } static void conf_edit_threshold_ratio(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1207,7 +1207,7 @@ static void conf_edit_threshold_ratio(ctx_config *conf, std::string &parm, enum } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 100) ) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_ratio %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_ratio %d"),parm_in); } else { conf->threshold_ratio = parm_in; } @@ -1215,7 +1215,7 @@ static void conf_edit_threshold_ratio(ctx_config *conf, std::string &parm, enum parm = std::to_string(conf->threshold_ratio); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_ratio",_("threshold_ratio")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_ratio",_("threshold_ratio")); } static void conf_edit_threshold_ratio_change(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1226,7 +1226,7 @@ static void conf_edit_threshold_ratio_change(ctx_config *conf, std::string &parm } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 255) ) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_ratio_change %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid threshold_ratio_change %d"),parm_in); } else { conf->threshold_ratio_change = parm_in; } @@ -1234,7 +1234,7 @@ static void conf_edit_threshold_ratio_change(ctx_config *conf, std::string &parm parm = std::to_string(conf->threshold_ratio_change); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_ratio_change",_("threshold_ratio_change")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_ratio_change",_("threshold_ratio_change")); } static void conf_edit_threshold_tune(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1247,7 +1247,7 @@ static void conf_edit_threshold_tune(ctx_config *conf, std::string &parm, enum P conf_edit_get_bool(parm, conf->threshold_tune); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_tune",_("threshold_tune")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","threshold_tune",_("threshold_tune")); } static void conf_edit_secondary_method(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1261,7 +1261,7 @@ static void conf_edit_secondary_method(ctx_config *conf, std::string &parm, enum } else if (parm == "") { conf->secondary_method = "none"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid secondary_method %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid secondary_method %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->secondary_method; @@ -1269,7 +1269,7 @@ static void conf_edit_secondary_method(ctx_config *conf, std::string &parm, enum parm = "[\"none\",\"haar\",\"hog\",\"dnn\"]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","secondary_method",_("secondary_method")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","secondary_method",_("secondary_method")); } static void conf_edit_secondary_params(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1282,7 +1282,7 @@ static void conf_edit_secondary_params(ctx_config *conf, std::string &parm, enum parm = conf->secondary_params; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","secondary_params",_("secondary_params")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","secondary_params",_("secondary_params")); } static void conf_edit_noise_level(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1293,7 +1293,7 @@ static void conf_edit_noise_level(ctx_config *conf, std::string &parm, enum PARM } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 255)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid noise_level %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid noise_level %d"),parm_in); } else { conf->noise_level = parm_in; } @@ -1301,7 +1301,7 @@ static void conf_edit_noise_level(ctx_config *conf, std::string &parm, enum PARM parm = std::to_string(conf->noise_level); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","noise_level",_("noise_level")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","noise_level",_("noise_level")); } static void conf_edit_noise_tune(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1314,7 +1314,7 @@ static void conf_edit_noise_tune(ctx_config *conf, std::string &parm, enum PARM_ conf_edit_get_bool(parm, conf->noise_tune); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","noise_tune",_("noise_tune")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","noise_tune",_("noise_tune")); } static void conf_edit_despeckle_filter(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1327,7 +1327,7 @@ static void conf_edit_despeckle_filter(ctx_config *conf, std::string &parm, enum parm = conf->despeckle_filter; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","despeckle_filter",_("despeckle_filter")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","despeckle_filter",_("despeckle_filter")); } static void conf_edit_area_detect(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1340,7 +1340,7 @@ static void conf_edit_area_detect(ctx_config *conf, std::string &parm, enum PARM parm = conf->area_detect; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","area_detect",_("area_detect")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","area_detect",_("area_detect")); } static void conf_edit_mask_file(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1353,7 +1353,7 @@ static void conf_edit_mask_file(ctx_config *conf, std::string &parm, enum PARM_A parm = conf->mask_file; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","mask_file",_("mask_file")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","mask_file",_("mask_file")); } static void conf_edit_mask_privacy(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1366,7 +1366,7 @@ static void conf_edit_mask_privacy(ctx_config *conf, std::string &parm, enum PAR parm = conf->mask_privacy; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","mask_privacy",_("mask_privacy")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","mask_privacy",_("mask_privacy")); } static void conf_edit_smart_mask_speed(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1377,7 +1377,7 @@ static void conf_edit_smart_mask_speed(ctx_config *conf, std::string &parm, enum } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 10)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid smart_mask_speed %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid smart_mask_speed %d"),parm_in); } else { conf->smart_mask_speed = parm_in; } @@ -1390,7 +1390,7 @@ static void conf_edit_smart_mask_speed(ctx_config *conf, std::string &parm, enum parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","smart_mask_speed",_("smart_mask_speed")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","smart_mask_speed",_("smart_mask_speed")); } static void conf_edit_lightswitch_percent(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1401,7 +1401,7 @@ static void conf_edit_lightswitch_percent(ctx_config *conf, std::string &parm, e } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 100)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid lightswitch_percent %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid lightswitch_percent %d"),parm_in); } else { conf->lightswitch_percent = parm_in; } @@ -1409,7 +1409,7 @@ static void conf_edit_lightswitch_percent(ctx_config *conf, std::string &parm, e parm = std::to_string(conf->lightswitch_percent); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","lightswitch_percent",_("lightswitch_percent")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","lightswitch_percent",_("lightswitch_percent")); } static void conf_edit_lightswitch_frames(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1420,7 +1420,7 @@ static void conf_edit_lightswitch_frames(ctx_config *conf, std::string &parm, en } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 1000)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid lightswitch_frames %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid lightswitch_frames %d"),parm_in); } else { conf->lightswitch_frames = parm_in; } @@ -1428,7 +1428,7 @@ static void conf_edit_lightswitch_frames(ctx_config *conf, std::string &parm, en parm = std::to_string(conf->lightswitch_frames); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","lightswitch_frames",_("lightswitch_frames")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","lightswitch_frames",_("lightswitch_frames")); } static void conf_edit_minimum_motion_frames(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1439,7 +1439,7 @@ static void conf_edit_minimum_motion_frames(ctx_config *conf, std::string &parm, } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 10000)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid minimum_motion_frames %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid minimum_motion_frames %d"),parm_in); } else { conf->minimum_motion_frames = parm_in; } @@ -1447,7 +1447,7 @@ static void conf_edit_minimum_motion_frames(ctx_config *conf, std::string &parm, parm = std::to_string(conf->minimum_motion_frames); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","minimum_motion_frames",_("minimum_motion_frames")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","minimum_motion_frames",_("minimum_motion_frames")); } static void conf_edit_static_object_time(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1458,7 +1458,7 @@ static void conf_edit_static_object_time(ctx_config *conf, std::string &parm, en } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if (parm_in < 1) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid static_object_time %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid static_object_time %d"),parm_in); } else { conf->static_object_time = parm_in; } @@ -1466,7 +1466,7 @@ static void conf_edit_static_object_time(ctx_config *conf, std::string &parm, en parm = std::to_string(conf->static_object_time); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","static_object_time",_("static_object_time")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","static_object_time",_("static_object_time")); } static void conf_edit_event_gap(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1477,7 +1477,7 @@ static void conf_edit_event_gap(ctx_config *conf, std::string &parm, enum PARM_A } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 2147483647)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid event_gap %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid event_gap %d"),parm_in); } else { conf->event_gap = parm_in; } @@ -1485,7 +1485,7 @@ static void conf_edit_event_gap(ctx_config *conf, std::string &parm, enum PARM_A parm = std::to_string(conf->event_gap); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","event_gap",_("event_gap")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","event_gap",_("event_gap")); } static void conf_edit_pre_capture(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1496,7 +1496,7 @@ static void conf_edit_pre_capture(ctx_config *conf, std::string &parm, enum PARM } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 1000)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid pre_capture %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid pre_capture %d"),parm_in); } else { conf->pre_capture = parm_in; } @@ -1504,7 +1504,7 @@ static void conf_edit_pre_capture(ctx_config *conf, std::string &parm, enum PARM parm = std::to_string(conf->pre_capture); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","pre_capture",_("pre_capture")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","pre_capture",_("pre_capture")); } static void conf_edit_post_capture(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1515,7 +1515,7 @@ static void conf_edit_post_capture(ctx_config *conf, std::string &parm, enum PAR } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 2147483647)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid post_capture %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid post_capture %d"),parm_in); } else { conf->post_capture = parm_in; } @@ -1523,7 +1523,7 @@ static void conf_edit_post_capture(ctx_config *conf, std::string &parm, enum PAR parm = std::to_string(conf->post_capture); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","post_capture",_("post_capture")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","post_capture",_("post_capture")); } static void conf_edit_on_event_start(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1536,7 +1536,7 @@ static void conf_edit_on_event_start(ctx_config *conf, std::string &parm, enum P parm = conf->on_event_start; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_event_start",_("on_event_start")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_event_start",_("on_event_start")); } static void conf_edit_on_event_end(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1549,7 +1549,7 @@ static void conf_edit_on_event_end(ctx_config *conf, std::string &parm, enum PAR parm = conf->on_event_end; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_event_end",_("on_event_end")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_event_end",_("on_event_end")); } static void conf_edit_on_picture_save(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1562,7 +1562,7 @@ static void conf_edit_on_picture_save(ctx_config *conf, std::string &parm, enum parm = conf->on_picture_save; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_picture_save",_("on_picture_save")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_picture_save",_("on_picture_save")); } static void conf_edit_on_area_detected(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1575,7 +1575,7 @@ static void conf_edit_on_area_detected(ctx_config *conf, std::string &parm, enum parm = conf->on_area_detected; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_area_detected",_("on_area_detected")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_area_detected",_("on_area_detected")); } static void conf_edit_on_motion_detected(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1588,7 +1588,7 @@ static void conf_edit_on_motion_detected(ctx_config *conf, std::string &parm, en parm = conf->on_motion_detected; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_motion_detected",_("on_motion_detected")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_motion_detected",_("on_motion_detected")); } static void conf_edit_on_movie_start(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1601,7 +1601,7 @@ static void conf_edit_on_movie_start(ctx_config *conf, std::string &parm, enum P parm = conf->on_movie_start; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_movie_start",_("on_movie_start")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_movie_start",_("on_movie_start")); } static void conf_edit_on_movie_end(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1614,7 +1614,7 @@ static void conf_edit_on_movie_end(ctx_config *conf, std::string &parm, enum PAR parm = conf->on_movie_end; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_movie_end",_("on_movie_end")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_movie_end",_("on_movie_end")); } static void conf_edit_on_camera_lost(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1627,7 +1627,7 @@ static void conf_edit_on_camera_lost(ctx_config *conf, std::string &parm, enum P parm = conf->on_camera_lost; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_camera_lost",_("on_camera_lost")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_camera_lost",_("on_camera_lost")); } static void conf_edit_on_camera_found(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1640,7 +1640,7 @@ static void conf_edit_on_camera_found(ctx_config *conf, std::string &parm, enum parm = conf->on_camera_found; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_camera_found",_("on_camera_found")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_camera_found",_("on_camera_found")); } static void conf_edit_on_secondary_detect(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1653,7 +1653,7 @@ static void conf_edit_on_secondary_detect(ctx_config *conf, std::string &parm, e parm = conf->on_secondary_detect; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_secondary_detect",_("on_secondary_detect")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_secondary_detect",_("on_secondary_detect")); } static void conf_edit_on_action_user(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1666,7 +1666,7 @@ static void conf_edit_on_action_user(ctx_config *conf, std::string &parm, enum P parm = conf->on_action_user; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_action_user",_("on_action_user")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_action_user",_("on_action_user")); } static void conf_edit_on_sound_alert(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1679,7 +1679,7 @@ static void conf_edit_on_sound_alert(ctx_config *conf, std::string &parm, enum P parm = conf->on_sound_alert; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_sound_alert",_("on_sound_alert")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","on_sound_alert",_("on_sound_alert")); } static void conf_edit_picture_output(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1693,7 +1693,7 @@ static void conf_edit_picture_output(ctx_config *conf, std::string &parm, enum P } else if (parm == "") { conf->picture_output = "off"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid picture_output %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid picture_output %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->picture_output; @@ -1703,7 +1703,7 @@ static void conf_edit_picture_output(ctx_config *conf, std::string &parm, enum P parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_output",_("picture_output")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_output",_("picture_output")); } static void conf_edit_picture_output_motion(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1716,7 +1716,7 @@ static void conf_edit_picture_output_motion(ctx_config *conf, std::string &parm, } else if (parm == "") { conf->picture_output_motion = "off"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid picture_output_motion %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid picture_output_motion %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->picture_output_motion; @@ -1726,7 +1726,7 @@ static void conf_edit_picture_output_motion(ctx_config *conf, std::string &parm, parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_output_motion",_("picture_output_motion")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_output_motion",_("picture_output_motion")); } static void conf_edit_picture_type(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1739,7 +1739,7 @@ static void conf_edit_picture_type(ctx_config *conf, std::string &parm, enum PAR } else if (parm == "") { conf->picture_type = "jpeg"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid picture_type %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid picture_type %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->picture_type; @@ -1749,7 +1749,7 @@ static void conf_edit_picture_type(ctx_config *conf, std::string &parm, enum PAR parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_type",_("picture_type")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_type",_("picture_type")); } static void conf_edit_picture_quality(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1760,7 +1760,7 @@ static void conf_edit_picture_quality(ctx_config *conf, std::string &parm, enum } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 100)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid picture_quality %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid picture_quality %d"),parm_in); } else { conf->picture_quality = parm_in; } @@ -1768,7 +1768,7 @@ static void conf_edit_picture_quality(ctx_config *conf, std::string &parm, enum parm = std::to_string(conf->picture_quality); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_quality",_("picture_quality")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_quality",_("picture_quality")); } static void conf_edit_picture_exif(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1781,7 +1781,7 @@ static void conf_edit_picture_exif(ctx_config *conf, std::string &parm, enum PAR parm = conf->picture_exif; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_exif",_("picture_exif")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_exif",_("picture_exif")); } static void conf_edit_picture_filename(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1794,7 +1794,7 @@ static void conf_edit_picture_filename(ctx_config *conf, std::string &parm, enum parm = conf->picture_filename; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_filename",_("picture_filename")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","picture_filename",_("picture_filename")); } static void conf_edit_snapshot_interval(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1805,7 +1805,7 @@ static void conf_edit_snapshot_interval(ctx_config *conf, std::string &parm, enu } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 2147483647)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid snapshot_interval %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid snapshot_interval %d"),parm_in); } else { conf->snapshot_interval = parm_in; } @@ -1813,7 +1813,7 @@ static void conf_edit_snapshot_interval(ctx_config *conf, std::string &parm, enu parm = std::to_string(conf->snapshot_interval); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snapshot_interval",_("snapshot_interval")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snapshot_interval",_("snapshot_interval")); } static void conf_edit_snapshot_filename(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1826,7 +1826,7 @@ static void conf_edit_snapshot_filename(ctx_config *conf, std::string &parm, enu parm = conf->snapshot_filename; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snapshot_filename",_("snapshot_filename")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snapshot_filename",_("snapshot_filename")); } static void conf_edit_movie_output(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1839,7 +1839,7 @@ static void conf_edit_movie_output(ctx_config *conf, std::string &parm, enum PAR conf_edit_get_bool(parm, conf->movie_output); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_output",_("movie_output")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_output",_("movie_output")); } static void conf_edit_movie_output_motion(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1852,7 +1852,7 @@ static void conf_edit_movie_output_motion(ctx_config *conf, std::string &parm, e conf_edit_get_bool(parm, conf->movie_output_motion); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_output_motion",_("movie_output_motion")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_output_motion",_("movie_output_motion")); } static void conf_edit_movie_max_time(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1863,7 +1863,7 @@ static void conf_edit_movie_max_time(ctx_config *conf, std::string &parm, enum P } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 2147483647)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid movie_max_time %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid movie_max_time %d"),parm_in); } else { conf->movie_max_time = parm_in; } @@ -1871,7 +1871,7 @@ static void conf_edit_movie_max_time(ctx_config *conf, std::string &parm, enum P parm = std::to_string(conf->movie_max_time); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_max_time",_("movie_max_time")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_max_time",_("movie_max_time")); } static void conf_edit_movie_bps(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1882,7 +1882,7 @@ static void conf_edit_movie_bps(ctx_config *conf, std::string &parm, enum PARM_A } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 9999999)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid movie_bps %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid movie_bps %d"),parm_in); } else { conf->movie_bps = parm_in; } @@ -1890,7 +1890,7 @@ static void conf_edit_movie_bps(ctx_config *conf, std::string &parm, enum PARM_A parm = std::to_string(conf->movie_bps); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_bps",_("movie_bps")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_bps",_("movie_bps")); } static void conf_edit_movie_quality(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1901,7 +1901,7 @@ static void conf_edit_movie_quality(ctx_config *conf, std::string &parm, enum PA } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 100)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid movie_quality %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid movie_quality %d"),parm_in); } else { conf->movie_quality = parm_in; } @@ -1909,7 +1909,7 @@ static void conf_edit_movie_quality(ctx_config *conf, std::string &parm, enum PA parm = std::to_string(conf->movie_quality); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_quality",_("movie_quality")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_quality",_("movie_quality")); } static void conf_edit_movie_container(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1922,7 +1922,7 @@ static void conf_edit_movie_container(ctx_config *conf, std::string &parm, enum parm = conf->movie_container; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_container",_("movie_container")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_container",_("movie_container")); } static void conf_edit_movie_passthrough(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1935,7 +1935,7 @@ static void conf_edit_movie_passthrough(ctx_config *conf, std::string &parm, enu conf_edit_get_bool(parm, conf->movie_passthrough); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_passthrough",_("movie_passthrough")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_passthrough",_("movie_passthrough")); } static void conf_edit_movie_filename(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1948,7 +1948,7 @@ static void conf_edit_movie_filename(ctx_config *conf, std::string &parm, enum P parm = conf->movie_filename; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_filename",_("movie_filename")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_filename",_("movie_filename")); } static void conf_edit_movie_retain(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1961,7 +1961,7 @@ static void conf_edit_movie_retain(ctx_config *conf, std::string &parm, enum PAR } else if (parm == "") { conf->movie_retain = "all"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid movie_retain %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid movie_retain %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->movie_retain; @@ -1971,7 +1971,7 @@ static void conf_edit_movie_retain(ctx_config *conf, std::string &parm, enum PAR parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_retain",_("movie_retain")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_retain",_("movie_retain")); } static void conf_edit_movie_extpipe_use(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1984,7 +1984,7 @@ static void conf_edit_movie_extpipe_use(ctx_config *conf, std::string &parm, enu conf_edit_get_bool(parm, conf->movie_extpipe_use); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_extpipe_use",_("movie_extpipe_use")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_extpipe_use",_("movie_extpipe_use")); } static void conf_edit_movie_extpipe(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -1997,7 +1997,7 @@ static void conf_edit_movie_extpipe(ctx_config *conf, std::string &parm, enum PA parm = conf->movie_extpipe; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_extpipe",_("movie_extpipe")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","movie_extpipe",_("movie_extpipe")); } static void conf_edit_timelapse_interval(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2008,7 +2008,7 @@ static void conf_edit_timelapse_interval(ctx_config *conf, std::string &parm, en } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 2147483647)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid timelapse_interval %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid timelapse_interval %d"),parm_in); } else { conf->timelapse_interval = parm_in; } @@ -2016,7 +2016,7 @@ static void conf_edit_timelapse_interval(ctx_config *conf, std::string &parm, en parm = std::to_string(conf->timelapse_interval); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","timelapse_interval",_("timelapse_interval")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","timelapse_interval",_("timelapse_interval")); } static void conf_edit_timelapse_mode(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2031,7 +2031,7 @@ static void conf_edit_timelapse_mode(ctx_config *conf, std::string &parm, enum P } else if (parm == "") { conf->timelapse_mode = "daily"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid timelapse_mode %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid timelapse_mode %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->timelapse_mode; @@ -2042,7 +2042,7 @@ static void conf_edit_timelapse_mode(ctx_config *conf, std::string &parm, enum P parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","timelapse_mode",_("timelapse_mode")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","timelapse_mode",_("timelapse_mode")); } static void conf_edit_timelapse_fps(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2053,7 +2053,7 @@ static void conf_edit_timelapse_fps(ctx_config *conf, std::string &parm, enum PA } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 2) || (parm_in > 100)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid timelapse_fps %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid timelapse_fps %d"),parm_in); } else { conf->timelapse_fps = parm_in; } @@ -2061,7 +2061,7 @@ static void conf_edit_timelapse_fps(ctx_config *conf, std::string &parm, enum PA parm = std::to_string(conf->timelapse_fps); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","timelapse_fps",_("timelapse_fps")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","timelapse_fps",_("timelapse_fps")); } static void conf_edit_timelapse_container(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2074,7 +2074,7 @@ static void conf_edit_timelapse_container(ctx_config *conf, std::string &parm, e } else if (parm == "") { conf->timelapse_container = "mpg"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid timelapse_container %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid timelapse_container %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->timelapse_container; @@ -2084,7 +2084,7 @@ static void conf_edit_timelapse_container(ctx_config *conf, std::string &parm, e parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","timelapse_container",_("timelapse_container")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","timelapse_container",_("timelapse_container")); } static void conf_edit_timelapse_filename(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2097,7 +2097,7 @@ static void conf_edit_timelapse_filename(ctx_config *conf, std::string &parm, en parm = conf->timelapse_filename; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","timelapse_filename",_("timelapse_filename")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","timelapse_filename",_("timelapse_filename")); } static void conf_edit_video_pipe(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2110,7 +2110,7 @@ static void conf_edit_video_pipe(ctx_config *conf, std::string &parm, enum PARM_ parm = conf->video_pipe; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","video_pipe",_("video_pipe")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","video_pipe",_("video_pipe")); } static void conf_edit_video_pipe_motion(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2123,7 +2123,7 @@ static void conf_edit_video_pipe_motion(ctx_config *conf, std::string &parm, enu parm = conf->video_pipe_motion; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","video_pipe_motion",_("video_pipe_motion")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","video_pipe_motion",_("video_pipe_motion")); } static void conf_edit_webcontrol_port(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2134,7 +2134,7 @@ static void conf_edit_webcontrol_port(ctx_config *conf, std::string &parm, enum } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 65535)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_port %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_port %d"),parm_in); } else { conf->webcontrol_port = parm_in; } @@ -2142,7 +2142,7 @@ static void conf_edit_webcontrol_port(ctx_config *conf, std::string &parm, enum parm = std::to_string(conf->webcontrol_port); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_port",_("webcontrol_port")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_port",_("webcontrol_port")); } static void conf_edit_webcontrol_base_path(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2151,12 +2151,12 @@ static void conf_edit_webcontrol_base_path(ctx_config *conf, std::string &parm, conf->webcontrol_base_path = ""; } else if (pact == PARM_ACT_SET) { if (parm == "/") { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Invalid webcontrol_base_path: Use blank instead of single / ")); conf->webcontrol_base_path = ""; } else if (parm.length() >= 1) { if (parm.substr(0, 1) != "/") { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Invalid webcontrol_base_path: Must start with a / ")); conf->webcontrol_base_path = "/" + parm; } else { @@ -2169,7 +2169,7 @@ static void conf_edit_webcontrol_base_path(ctx_config *conf, std::string &parm, parm = conf->webcontrol_base_path; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_base_path",_("webcontrol_base_path")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_base_path",_("webcontrol_base_path")); } static void conf_edit_webcontrol_ipv6(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2182,7 +2182,7 @@ static void conf_edit_webcontrol_ipv6(ctx_config *conf, std::string &parm, enum conf_edit_get_bool(parm, conf->webcontrol_ipv6); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_ipv6",_("webcontrol_ipv6")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_ipv6",_("webcontrol_ipv6")); } static void conf_edit_webcontrol_localhost(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2195,7 +2195,7 @@ static void conf_edit_webcontrol_localhost(ctx_config *conf, std::string &parm, conf_edit_get_bool(parm, conf->webcontrol_localhost); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_localhost",_("webcontrol_localhost")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_localhost",_("webcontrol_localhost")); } static void conf_edit_webcontrol_parms(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2206,7 +2206,7 @@ static void conf_edit_webcontrol_parms(ctx_config *conf, std::string &parm, enum } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 3)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_parms %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_parms %d"),parm_in); } else { conf->webcontrol_parms = parm_in; } @@ -2218,7 +2218,7 @@ static void conf_edit_webcontrol_parms(ctx_config *conf, std::string &parm, enum parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_parms",_("webcontrol_parms")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_parms",_("webcontrol_parms")); } static void conf_edit_webcontrol_interface(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2231,7 +2231,7 @@ static void conf_edit_webcontrol_interface(ctx_config *conf, std::string &parm, } else if (parm == "") { conf->webcontrol_interface = "default"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_interface %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_interface %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->webcontrol_interface; @@ -2241,7 +2241,7 @@ static void conf_edit_webcontrol_interface(ctx_config *conf, std::string &parm, parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_interface",_("webcontrol_interface")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_interface",_("webcontrol_interface")); } static void conf_edit_webcontrol_auth_method(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2254,7 +2254,7 @@ static void conf_edit_webcontrol_auth_method(ctx_config *conf, std::string &parm } else if (parm == "") { conf->webcontrol_auth_method = "none"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_auth_method %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_auth_method %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->webcontrol_auth_method; @@ -2264,7 +2264,7 @@ static void conf_edit_webcontrol_auth_method(ctx_config *conf, std::string &parm parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_auth_method",_("webcontrol_auth_method")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_auth_method",_("webcontrol_auth_method")); } static void conf_edit_webcontrol_authentication(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2277,7 +2277,7 @@ static void conf_edit_webcontrol_authentication(ctx_config *conf, std::string &p parm = conf->webcontrol_authentication; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_authentication",_("webcontrol_authentication")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_authentication",_("webcontrol_authentication")); } static void conf_edit_webcontrol_tls(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2290,7 +2290,7 @@ static void conf_edit_webcontrol_tls(ctx_config *conf, std::string &parm, enum P conf_edit_get_bool(parm, conf->webcontrol_tls); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_tls",_("webcontrol_tls")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_tls",_("webcontrol_tls")); } static void conf_edit_webcontrol_cert(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2303,7 +2303,7 @@ static void conf_edit_webcontrol_cert(ctx_config *conf, std::string &parm, enum parm = conf->webcontrol_cert; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_cert",_("webcontrol_cert")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_cert",_("webcontrol_cert")); } static void conf_edit_webcontrol_key(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2316,7 +2316,7 @@ static void conf_edit_webcontrol_key(ctx_config *conf, std::string &parm, enum P parm = conf->webcontrol_key; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_key",_("webcontrol_key")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_key",_("webcontrol_key")); } static void conf_edit_webcontrol_headers(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2329,7 +2329,7 @@ static void conf_edit_webcontrol_headers(ctx_config *conf, std::string &parm, en parm = conf->webcontrol_headers; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_headers",_("webcontrol_headers")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_headers",_("webcontrol_headers")); } static void conf_edit_webcontrol_html(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2342,7 +2342,7 @@ static void conf_edit_webcontrol_html(ctx_config *conf, std::string &parm, enum parm = conf->webcontrol_html; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_html",_("webcontrol_html")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_html",_("webcontrol_html")); } static void conf_edit_webcontrol_actions(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2355,7 +2355,7 @@ static void conf_edit_webcontrol_actions(ctx_config *conf, std::string &parm, en parm = conf->webcontrol_actions; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_actions",_("webcontrol_actions")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_actions",_("webcontrol_actions")); } static void conf_edit_webcontrol_lock_minutes(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2366,7 +2366,7 @@ static void conf_edit_webcontrol_lock_minutes(ctx_config *conf, std::string &par } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if (parm_in < 0) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_lock_minutes %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_lock_minutes %d"),parm_in); } else { conf->webcontrol_lock_minutes = parm_in; } @@ -2374,7 +2374,7 @@ static void conf_edit_webcontrol_lock_minutes(ctx_config *conf, std::string &par parm = std::to_string(conf->webcontrol_lock_minutes); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_lock_minutes",_("webcontrol_lock_minutes")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_lock_minutes",_("webcontrol_lock_minutes")); } static void conf_edit_webcontrol_lock_attempts(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2385,7 +2385,7 @@ static void conf_edit_webcontrol_lock_attempts(ctx_config *conf, std::string &pa } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if (parm_in < 0) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_lock_attempts %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid webcontrol_lock_attempts %d"),parm_in); } else { conf->webcontrol_lock_attempts = parm_in; } @@ -2393,7 +2393,7 @@ static void conf_edit_webcontrol_lock_attempts(ctx_config *conf, std::string &pa parm = std::to_string(conf->webcontrol_lock_attempts); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_lock_attempts",_("webcontrol_lock_attempts")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","webcontrol_lock_attempts",_("webcontrol_lock_attempts")); } static void conf_edit_stream_preview_scale(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2404,7 +2404,7 @@ static void conf_edit_stream_preview_scale(ctx_config *conf, std::string &parm, } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 1000)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_preview_scale %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_preview_scale %d"),parm_in); } else { conf->stream_preview_scale = parm_in; } @@ -2412,7 +2412,7 @@ static void conf_edit_stream_preview_scale(ctx_config *conf, std::string &parm, parm = std::to_string(conf->stream_preview_scale); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_preview_scale",_("stream_preview_scale")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_preview_scale",_("stream_preview_scale")); } static void conf_edit_stream_preview_newline(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2425,7 +2425,7 @@ static void conf_edit_stream_preview_newline(ctx_config *conf, std::string &parm conf_edit_get_bool(parm, conf->stream_preview_newline); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_preview_newline",_("stream_preview_newline")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_preview_newline",_("stream_preview_newline")); } static void conf_edit_stream_preview_method(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2438,7 +2438,7 @@ static void conf_edit_stream_preview_method(ctx_config *conf, std::string &parm, } else if (parm == "") { conf->stream_preview_method = "mjpg"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_preview_method %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_preview_method %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->stream_preview_method; @@ -2448,7 +2448,7 @@ static void conf_edit_stream_preview_method(ctx_config *conf, std::string &parm, parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_preview_method",_("stream_preview_method")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_preview_method",_("stream_preview_method")); } static void conf_edit_stream_preview_ptz(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2461,7 +2461,7 @@ static void conf_edit_stream_preview_ptz(ctx_config *conf, std::string &parm, en conf_edit_get_bool(parm, conf->stream_preview_ptz); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_preview_ptz",_("stream_preview_ptz")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_preview_ptz",_("stream_preview_ptz")); } static void conf_edit_stream_quality(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2472,7 +2472,7 @@ static void conf_edit_stream_quality(ctx_config *conf, std::string &parm, enum P } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 100)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_quality %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_quality %d"),parm_in); } else { conf->stream_quality = parm_in; } @@ -2480,7 +2480,7 @@ static void conf_edit_stream_quality(ctx_config *conf, std::string &parm, enum P parm = std::to_string(conf->stream_quality); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_quality",_("stream_quality")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_quality",_("stream_quality")); } static void conf_edit_stream_grey(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2493,7 +2493,7 @@ static void conf_edit_stream_grey(ctx_config *conf, std::string &parm, enum PARM conf_edit_get_bool(parm, conf->stream_grey); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_grey",_("stream_grey")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_grey",_("stream_grey")); } static void conf_edit_stream_motion(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2506,7 +2506,7 @@ static void conf_edit_stream_motion(ctx_config *conf, std::string &parm, enum PA conf_edit_get_bool(parm, conf->stream_motion); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_motion",_("stream_motion")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_motion",_("stream_motion")); } static void conf_edit_stream_maxrate(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2517,7 +2517,7 @@ static void conf_edit_stream_maxrate(ctx_config *conf, std::string &parm, enum P } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 100)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_maxrate %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_maxrate %d"),parm_in); } else { conf->stream_maxrate = parm_in; } @@ -2525,7 +2525,7 @@ static void conf_edit_stream_maxrate(ctx_config *conf, std::string &parm, enum P parm = std::to_string(conf->stream_maxrate); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_maxrate",_("stream_maxrate")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_maxrate",_("stream_maxrate")); } static void conf_edit_stream_scan_time(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2536,7 +2536,7 @@ static void conf_edit_stream_scan_time(ctx_config *conf, std::string &parm, enum } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 600)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_scan_time %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_scan_time %d"),parm_in); } else { conf->stream_scan_time = parm_in; } @@ -2544,7 +2544,7 @@ static void conf_edit_stream_scan_time(ctx_config *conf, std::string &parm, enum parm = std::to_string(conf->stream_scan_time); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_scan_time",_("stream_scan_time")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_scan_time",_("stream_scan_time")); } static void conf_edit_stream_scan_scale(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2555,7 +2555,7 @@ static void conf_edit_stream_scan_scale(ctx_config *conf, std::string &parm, enu } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 1) || (parm_in > 1000)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_scan_scale %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid stream_scan_scale %d"),parm_in); } else { conf->stream_scan_scale = parm_in; } @@ -2563,7 +2563,7 @@ static void conf_edit_stream_scan_scale(ctx_config *conf, std::string &parm, enu parm = std::to_string(conf->stream_scan_scale); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_scan_scale",_("stream_scan_scale")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","stream_scan_scale",_("stream_scan_scale")); } static void conf_edit_database_type(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2575,7 +2575,7 @@ static void conf_edit_database_type(ctx_config *conf, std::string &parm, enum PA (parm == "postgresql") || (parm == "sqlite3")) { conf->database_type = parm; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid database_type %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid database_type %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->database_type; @@ -2585,7 +2585,7 @@ static void conf_edit_database_type(ctx_config *conf, std::string &parm, enum PA parm = parm + "]"; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_type",_("database_type")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_type",_("database_type")); } static void conf_edit_database_dbname(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2598,7 +2598,7 @@ static void conf_edit_database_dbname(ctx_config *conf, std::string &parm, enum parm = conf->database_dbname; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_dbname",_("database_dbname")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_dbname",_("database_dbname")); } static void conf_edit_database_host(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2611,7 +2611,7 @@ static void conf_edit_database_host(ctx_config *conf, std::string &parm, enum PA parm = conf->database_host; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_host",_("database_host")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_host",_("database_host")); } static void conf_edit_database_port(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2622,7 +2622,7 @@ static void conf_edit_database_port(ctx_config *conf, std::string &parm, enum PA } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 65535)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid database_port %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid database_port %d"),parm_in); } else { conf->database_port = parm_in; } @@ -2630,7 +2630,7 @@ static void conf_edit_database_port(ctx_config *conf, std::string &parm, enum PA parm = std::to_string(conf->database_port); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_port",_("database_port")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_port",_("database_port")); } static void conf_edit_database_user(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2643,7 +2643,7 @@ static void conf_edit_database_user(ctx_config *conf, std::string &parm, enum PA parm = conf->database_user; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_user",_("database_user")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_user",_("database_user")); } static void conf_edit_database_password(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2656,7 +2656,7 @@ static void conf_edit_database_password(ctx_config *conf, std::string &parm, enu parm = conf->database_password; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_password",_("database_password")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_password",_("database_password")); } static void conf_edit_database_busy_timeout(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2667,7 +2667,7 @@ static void conf_edit_database_busy_timeout(ctx_config *conf, std::string &parm, } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 10000)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid database_busy_timeout %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid database_busy_timeout %d"),parm_in); } else { conf->database_busy_timeout = parm_in; } @@ -2675,7 +2675,7 @@ static void conf_edit_database_busy_timeout(ctx_config *conf, std::string &parm, parm = std::to_string(conf->database_busy_timeout); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_busy_timeout",_("database_busy_timeout")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","database_busy_timeout",_("database_busy_timeout")); } static void conf_edit_sql_event_start(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2688,7 +2688,7 @@ static void conf_edit_sql_event_start(ctx_config *conf, std::string &parm, enum parm = conf->sql_event_start; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_event_start",_("sql_event_start")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_event_start",_("sql_event_start")); } static void conf_edit_sql_event_end(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2701,7 +2701,7 @@ static void conf_edit_sql_event_end(ctx_config *conf, std::string &parm, enum PA parm = conf->sql_event_end; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_event_end",_("sql_event_end")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_event_end",_("sql_event_end")); } static void conf_edit_sql_movie_start(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2714,7 +2714,7 @@ static void conf_edit_sql_movie_start(ctx_config *conf, std::string &parm, enum parm = conf->sql_movie_start; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_movie_start",_("sql_movie_start")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_movie_start",_("sql_movie_start")); } static void conf_edit_sql_movie_end(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2727,7 +2727,7 @@ static void conf_edit_sql_movie_end(ctx_config *conf, std::string &parm, enum PA parm = conf->sql_movie_end; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_movie_end",_("sql_movie_end")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_movie_end",_("sql_movie_end")); } static void conf_edit_sql_pic_save(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2740,7 +2740,7 @@ static void conf_edit_sql_pic_save(ctx_config *conf, std::string &parm, enum PAR parm = conf->sql_pic_save; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_pic_save",_("sql_pic_save")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_pic_save",_("sql_pic_save")); } static void conf_edit_ptz_auto_track(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2753,7 +2753,7 @@ static void conf_edit_ptz_auto_track(ctx_config *conf, std::string &parm, enum P conf_edit_get_bool(parm, conf->ptz_auto_track); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_auto_track",_("ptz_auto_track")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_auto_track",_("ptz_auto_track")); } static void conf_edit_ptz_wait(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2764,7 +2764,7 @@ static void conf_edit_ptz_wait(ctx_config *conf, std::string &parm, enum PARM_AC } else if (pact == PARM_ACT_SET) { parm_in = atoi(parm.c_str()); if ((parm_in < 0) || (parm_in > 2147483647)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid ptz_wait %d"),parm_in); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid ptz_wait %d"),parm_in); } else { conf->ptz_wait = parm_in; } @@ -2772,7 +2772,7 @@ static void conf_edit_ptz_wait(ctx_config *conf, std::string &parm, enum PARM_AC parm = std::to_string(conf->ptz_wait); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_wait",_("ptz_wait")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_wait",_("ptz_wait")); } static void conf_edit_ptz_move_track(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2785,7 +2785,7 @@ static void conf_edit_ptz_move_track(ctx_config *conf, std::string &parm, enum P parm = conf->ptz_move_track; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_move_track",_("ptz_move_track")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_move_track",_("ptz_move_track")); } static void conf_edit_ptz_pan_left(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2798,7 +2798,7 @@ static void conf_edit_ptz_pan_left(ctx_config *conf, std::string &parm, enum PAR parm = conf->ptz_pan_left; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_pan_left",_("ptz_pan_left")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_pan_left",_("ptz_pan_left")); } static void conf_edit_ptz_pan_right(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2811,7 +2811,7 @@ static void conf_edit_ptz_pan_right(ctx_config *conf, std::string &parm, enum PA parm = conf->ptz_pan_right; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_pan_right",_("ptz_pan_right")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_pan_right",_("ptz_pan_right")); } static void conf_edit_ptz_tilt_up(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2824,7 +2824,7 @@ static void conf_edit_ptz_tilt_up(ctx_config *conf, std::string &parm, enum PARM parm = conf->ptz_tilt_up; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_tilt_up",_("ptz_tilt_up")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_tilt_up",_("ptz_tilt_up")); } static void conf_edit_ptz_tilt_down(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2837,7 +2837,7 @@ static void conf_edit_ptz_tilt_down(ctx_config *conf, std::string &parm, enum PA parm = conf->ptz_tilt_down; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_tilt_down",_("ptz_tilt_down")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_tilt_down",_("ptz_tilt_down")); } static void conf_edit_ptz_zoom_in(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2850,7 +2850,7 @@ static void conf_edit_ptz_zoom_in(ctx_config *conf, std::string &parm, enum PARM parm = conf->ptz_zoom_in; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_zoom_in",_("ptz_zoom_in")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_zoom_in",_("ptz_zoom_in")); } static void conf_edit_ptz_zoom_out(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2863,7 +2863,7 @@ static void conf_edit_ptz_zoom_out(ctx_config *conf, std::string &parm, enum PAR parm = conf->ptz_zoom_out; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_zoom_out",_("ptz_zoom_out")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_zoom_out",_("ptz_zoom_out")); } static void conf_edit_snd_device(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2876,7 +2876,7 @@ static void conf_edit_snd_device(ctx_config *conf, std::string &parm, enum PARM_ parm = conf->snd_device; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_device",_("snd_device")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_device",_("snd_device")); } static void conf_edit_snd_params(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2889,7 +2889,7 @@ static void conf_edit_snd_params(ctx_config *conf, std::string &parm, enum PARM_ parm = conf->snd_params; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_params",_("snd_params")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_params",_("snd_params")); } static void conf_edit_snd_alerts(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2908,7 +2908,7 @@ static void conf_edit_snd_alerts(ctx_config *conf, std::string &parm, enum PARM_ } conf->snd_alerts.push_back(parm); /* Add to the end of list*/ for (it= conf->snd_alerts.begin(); it != conf->snd_alerts.end(); it++) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,"%s:%s" + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,"%s:%s" ,"snd_alerts", it->c_str()); } } else if (pact == PARM_ACT_GET) { @@ -2919,7 +2919,7 @@ static void conf_edit_snd_alerts(ctx_config *conf, std::string &parm, enum PARM_ } } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_alerts",_("snd_alerts")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_alerts",_("snd_alerts")); } static void conf_edit_snd_alerts(ctx_config *conf, std::list &parm, enum PARM_ACT pact) @@ -2933,7 +2933,7 @@ static void conf_edit_snd_alerts(ctx_config *conf, std::list &parm, parm = conf->snd_alerts; } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_alerts",_("snd_alerts")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_alerts",_("snd_alerts")); } static void conf_edit_snd_window(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2946,7 +2946,7 @@ static void conf_edit_snd_window(ctx_config *conf, std::string &parm, enum PARM_ } else if (parm == "") { conf->snd_window = "hamming"; } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid snd_window %s"), parm.c_str()); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid snd_window %s"), parm.c_str()); } } else if (pact == PARM_ACT_GET) { parm = conf->snd_window; @@ -2955,7 +2955,7 @@ static void conf_edit_snd_window(ctx_config *conf, std::string &parm, enum PARM_ } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_window",_("snd_window")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_window",_("snd_window")); } static void conf_edit_snd_show(ctx_config *conf, std::string &parm, enum PARM_ACT pact) @@ -2968,7 +2968,7 @@ static void conf_edit_snd_show(ctx_config *conf, std::string &parm, enum PARM_AC conf_edit_get_bool(parm, conf->snd_show); } return; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_show",_("snd_show")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","snd_show",_("snd_show")); } /* Application level parameters */ @@ -3388,7 +3388,7 @@ static int conf_edit_set_depr(ctx_config *conf, std::string &parm_nm indx = 0; while (config_parms_depr[indx].parm_name != "") { if (parm_nm == config_parms_depr[indx].parm_name) { - MOTION_LOG(ALR, TYPE_ALL, NO_ERRNO, "%s after version %s" + MOTPLS_LOG(ALR, TYPE_ALL, NO_ERRNO, "%s after version %s" , config_parms_depr[indx].info.c_str() , config_parms_depr[indx].last_version.c_str()); @@ -3438,7 +3438,7 @@ void conf_edit_set(ctx_config *conf, std::string parm_nm return; } - MOTION_LOG(ALR, TYPE_ALL, NO_ERRNO, _("Unknown config option \"%s\""), parm_nm.c_str()); + MOTPLS_LOG(ALR, TYPE_ALL, NO_ERRNO, _("Unknown config option \"%s\""), parm_nm.c_str()); } /* Get list of valid values for items only permitting a set*/ @@ -3652,7 +3652,7 @@ static void conf_camera_parm(ctx_motapp *motapp, std::string filename) struct stat statbuf; if (stat(filename.c_str(), &statbuf) != 0) { - MOTION_LOG(ALR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ALR, TYPE_ALL, SHOW_ERRNO ,_("Camera config file %s not found"), filename.c_str()); return; } @@ -3742,7 +3742,7 @@ static void conf_sound_parm(ctx_motapp *motapp, std::string filename) struct stat statbuf; if (stat(filename.c_str(), &statbuf) != 0) { - MOTION_LOG(ALR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ALR, TYPE_ALL, SHOW_ERRNO ,_("Sound config file %s not found"), filename.c_str()); return; } @@ -3766,7 +3766,7 @@ static void conf_parm_config_dir(ctx_motapp *motapp, std::string confdir) conf_file.assign(ep->d_name); if (conf_file.find_first_of(".conf") != std::string::npos) { conf_file = confdir + "/" + conf_file; - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("Processing config file %s"), conf_file.c_str() ); conf_camera_parm(motapp, conf_file); motapp->cam_list[motapp->cam_cnt-1]->conf->from_conf_dir = true; @@ -3788,13 +3788,13 @@ void conf_process(ctx_motapp *motapp, ctx_config *conf) ifs.open(conf->conf_filename); if (ifs.is_open() == false) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("params_file not found: %s") , conf->conf_filename.c_str()); return; } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Processing config file %s") , conf->conf_filename.c_str()); @@ -3827,7 +3827,7 @@ void conf_process(ctx_motapp *motapp, ctx_config *conf) (line.substr(0, 1) != ";") && (line.substr(0, 1) != "#") && (stpos != std::string::npos) ) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Unable to parse line: %s"), line.c_str()); } } @@ -3871,7 +3871,7 @@ void conf_parms_log(ctx_motapp *motapp) enum PARM_CAT parm_ct; enum PARM_TYP parm_typ; - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO ,_("Logging configuration parameters from all files")); motpls_log(INF, TYPE_ALL, NO_ERRNO,0, _("Config file: %s") @@ -3994,7 +3994,7 @@ void conf_parms_write_app(ctx_motapp *motapp) conffile = myfopen(motapp->conf->conf_filename.c_str(), "we"); if (conffile == NULL) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Failed to write configuration to %s") , motapp->conf->conf_filename); return; @@ -4051,7 +4051,7 @@ void conf_parms_write_app(ctx_motapp *motapp) fprintf(conffile, "\n"); myfclose(conffile); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Configuration written to %s") , motapp->conf->conf_filename.c_str()); @@ -4074,7 +4074,7 @@ void conf_parms_write_cam(ctx_motapp *motapp) for (indx=0; indxcam_cnt; indx++) { conffile = myfopen(motapp->cam_list[indx]->conf->conf_filename.c_str(), "we"); if (conffile == NULL) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Failed to write configuration to %s") , motapp->cam_list[indx]->conf->conf_filename.c_str()); return; @@ -4110,7 +4110,7 @@ void conf_parms_write_cam(ctx_motapp *motapp) fprintf(conffile, "\n"); myfclose(conffile); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Configuration written to %s") , motapp->cam_list[indx]->conf->conf_filename.c_str()); } @@ -4134,7 +4134,7 @@ void conf_parms_write_snd(ctx_motapp *motapp) for (indx=0; indxsnd_cnt; indx++) { conffile = myfopen(motapp->snd_list[indx]->conf->conf_filename.c_str(), "we"); if (conffile == NULL) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Failed to write configuration to %s") , motapp->snd_list[indx]->conf->conf_filename.c_str()); return; @@ -4170,7 +4170,7 @@ void conf_parms_write_snd(ctx_motapp *motapp) fprintf(conffile, "\n"); myfclose(conffile); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Configuration written to %s") , motapp->snd_list[indx]->conf->conf_filename.c_str()); } @@ -4206,7 +4206,7 @@ void conf_init(ctx_motapp *motapp) if (filename == "") { if (getcwd(path, sizeof(path)) == NULL) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Error getcwd")); + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Error getcwd")); exit(-1); } filename = path + std::string("/motionplus.conf"); @@ -4230,7 +4230,7 @@ void conf_init(ctx_motapp *motapp) } if (filename == "") { - MOTION_LOG(ALR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ALR, TYPE_ALL, SHOW_ERRNO ,_("Could not open configuration file")); exit(-1); } diff --git a/src/dbse.cpp b/src/dbse.cpp index aa4f3aec..07433000 100644 --- a/src/dbse.cpp +++ b/src/dbse.cpp @@ -32,27 +32,27 @@ static int dbse_edits(ctx_motapp *motapp) int retcd = 0; if (motapp->dbse->database_dbname == "") { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Invalid database name")); retcd = -1; } if (((motapp->dbse->database_type == "mariadb") || (motapp->dbse->database_type == "pgsql")) && (motapp->dbse->database_port == 0)) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO ,_("Must specify database port for mariadb/pgsql")); retcd = -1; } if ((motapp->dbse->database_type == "sqlite3") && (motapp->dbse->database_dbname == "")) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO ,_("Must specify database name for sqlite3")); retcd = -1; } if (retcd == -1) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO ,_("Database functionality disabled.")); motapp->dbse->database_type = ""; } @@ -383,16 +383,16 @@ static void dbse_sqlite3_exec(ctx_motapp *motapp, const char *sqlquery) return; }; - MOTION_LOG(DBG, TYPE_DB, NO_ERRNO, "Executing query"); + MOTPLS_LOG(DBG, TYPE_DB, NO_ERRNO, "Executing query"); retcd = sqlite3_exec( motapp->dbse->database_sqlite3 , sqlquery, NULL, 0, &errmsg); if (retcd != SQLITE_OK ) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("SQLite error was %s"), errmsg); sqlite3_free(errmsg); } - MOTION_LOG(DBG, TYPE_DB, NO_ERRNO, "Finished query"); + MOTPLS_LOG(DBG, TYPE_DB, NO_ERRNO, "Finished query"); } static int dbse_sqlite3_cb ( @@ -453,7 +453,7 @@ static void dbse_sqlite3_cols(ctx_motapp *motapp) retcd = sqlite3_exec(motapp->dbse->database_sqlite3 , sql.c_str(), dbse_sqlite3_cb, motapp, &errmsg); if (retcd != SQLITE_OK ) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Error retrieving table columns: %s"), errmsg); sqlite3_free(errmsg); return; @@ -486,7 +486,7 @@ static void dbse_sqlite3_init(ctx_motapp *motapp) return; } - MOTION_LOG(NTC, TYPE_DB, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_DB, NO_ERRNO , _("SQLite3 Database filename %s") , motapp->dbse->database_dbname.c_str()); retcd = sqlite3_open( @@ -494,18 +494,18 @@ static void dbse_sqlite3_init(ctx_motapp *motapp) , &motapp->dbse->database_sqlite3); if (retcd != SQLITE_OK) { err_open =sqlite3_errmsg(motapp->dbse->database_sqlite3); - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Can't open database %s : %s") , motapp->dbse->database_dbname.c_str() , err_open); sqlite3_close(motapp->dbse->database_sqlite3); - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Could not initialize database %s") , motapp->dbse->database_dbname.c_str()); motapp->dbse->database_type = ""; motapp->dbse->database_sqlite3 = NULL; } else { - MOTION_LOG(NTC, TYPE_DB, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_DB, NO_ERRNO , _("database_busy_timeout %d msec") , motapp->dbse->database_busy_timeout); retcd = sqlite3_busy_timeout( @@ -514,7 +514,7 @@ static void dbse_sqlite3_init(ctx_motapp *motapp) if (retcd != SQLITE_OK) { err_open = sqlite3_errmsg( motapp->dbse->database_sqlite3); - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("database_busy_timeout failed %s"), err_open); } } @@ -526,7 +526,7 @@ static void dbse_sqlite3_init(ctx_motapp *motapp) motapp->dbse->database_sqlite3 , sql.c_str(), dbse_sqlite3_cb, motapp, &err_qry); if (retcd != SQLITE_OK ) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Error checking table: %s"), err_qry); sqlite3_free(err_qry); return; @@ -538,7 +538,7 @@ static void dbse_sqlite3_init(ctx_motapp *motapp) retcd = sqlite3_exec(motapp->dbse->database_sqlite3 , sql.c_str(), 0, 0, &err_qry); if (retcd != SQLITE_OK ) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Error creating table: %s"), err_qry); sqlite3_free(err_qry); return; @@ -561,7 +561,7 @@ static void dbse_sqlite3_movlst(ctx_motapp *motapp, int device_id) motapp->dbse->database_sqlite3 , sql.c_str(), dbse_sqlite3_cb, motapp, &errmsg); if (retcd != SQLITE_OK ) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Error counting table: %s"), errmsg); sqlite3_free(errmsg); return; @@ -578,7 +578,7 @@ static void dbse_sqlite3_movlst(ctx_motapp *motapp, int device_id) motapp->dbse->database_sqlite3 , sql.c_str(), dbse_sqlite3_cb, motapp, &errmsg); if (retcd != SQLITE_OK ) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Error retrieving table: %s"), errmsg); sqlite3_free(errmsg); return; @@ -617,11 +617,11 @@ static void dbse_mariadb_exec (ctx_motapp *motapp, const char *sqlquery) return; } - MOTION_LOG(DBG, TYPE_DB, NO_ERRNO, "Executing MariaDB query"); + MOTPLS_LOG(DBG, TYPE_DB, NO_ERRNO, "Executing MariaDB query"); retcd = mysql_query(motapp->dbse->database_mariadb, sqlquery); if (retcd != 0) { retcd = mysql_errno(motapp->dbse->database_mariadb); - MOTION_LOG(ERR, TYPE_DB, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, SHOW_ERRNO , _("MariaDB query '%s' failed. %s error code %d") , sqlquery, mysql_error(motapp->dbse->database_mariadb) , retcd); @@ -638,7 +638,7 @@ static void dbse_mariadb_exec (ctx_motapp *motapp, const char *sqlquery) , motapp->dbse->database_password.c_str() , motapp->dbse->database_dbname.c_str() , motapp->dbse->database_port, NULL, 0) == NULL) { - MOTION_LOG(ALR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ALR, TYPE_DB, NO_ERRNO , _("Cannot reconnect to MariaDB database %s" " on host %s with user %s MariaDB error was %s") , motapp->dbse->database_dbname.c_str() @@ -646,13 +646,13 @@ static void dbse_mariadb_exec (ctx_motapp *motapp, const char *sqlquery) , motapp->dbse->database_user.c_str() , mysql_error(motapp->dbse->database_mariadb)); } else { - MOTION_LOG(INF, TYPE_DB, NO_ERRNO + MOTPLS_LOG(INF, TYPE_DB, NO_ERRNO , _("Re-Connection to MariaDB database '%s' Succeed") , motapp->dbse->database_dbname.c_str()); retcd = mysql_query(motapp->dbse->database_mariadb, sqlquery); if (retcd != 0) { retcd = mysql_errno(motapp->dbse->database_mariadb); - MOTION_LOG(ERR, TYPE_DB, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, SHOW_ERRNO , _("after re-connection MariaDB query failed %s" " error code %d") , mysql_error(motapp->dbse->database_mariadb), retcd); @@ -674,7 +674,7 @@ static void dbse_mariadb_recs (ctx_motapp *motapp, const char *sqlquery) retcd = mysql_query(motapp->dbse->database_mariadb, sqlquery); if (retcd != 0){ - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Query error: %s"),sqlquery); dbse_close(motapp); motapp->dbse->database_type = ""; @@ -683,7 +683,7 @@ static void dbse_mariadb_recs (ctx_motapp *motapp, const char *sqlquery) qry_result = mysql_store_result(motapp->dbse->database_mariadb); if (qry_result == NULL) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Query store error: %s"),sqlquery); dbse_close(motapp); motapp->dbse->database_type = ""; @@ -796,7 +796,7 @@ static void dbse_mariadb_setup(ctx_motapp *motapp) dbse_mariadb_recs(motapp, sql.c_str()); if (motapp->dbse->table_ok == false) { - MOTION_LOG(INF, TYPE_DB, NO_ERRNO + MOTPLS_LOG(INF, TYPE_DB, NO_ERRNO , _("Creating motionplus table")); motapp->dbse->dbse_action = DBSE_TBL_CREATE; dbse_sql_motpls(motapp->dbse, sql); @@ -818,7 +818,7 @@ static void dbse_mariadb_init(ctx_motapp *motapp) } if (mysql_library_init(0, NULL, NULL)) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Could not initialize database %s") , motapp->dbse->database_type.c_str()); motapp->dbse->database_type = ""; @@ -836,15 +836,15 @@ static void dbse_mariadb_init(ctx_motapp *motapp) , motapp->dbse->database_dbname.c_str() , motapp->dbse->database_port, NULL, 0) == NULL) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Cannot connect to MariaDB database %s on host %s with user %s") , motapp->dbse->database_dbname.c_str() , motapp->dbse->database_host.c_str() , motapp->dbse->database_user.c_str()); - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("MariaDB error was %s") , mysql_error(motapp->dbse->database_mariadb)); - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Disabling database functionality")); dbse_close(motapp); motapp->dbse->database_type = ""; @@ -855,7 +855,7 @@ static void dbse_mariadb_init(ctx_motapp *motapp) dbse_mariadb_setup(motapp); - MOTION_LOG(INF, TYPE_DB, NO_ERRNO + MOTPLS_LOG(INF, TYPE_DB, NO_ERRNO , _("%s database opened") , motapp->dbse->database_dbname.c_str() ); } @@ -907,16 +907,16 @@ static void dbse_pgsql_exec(ctx_motapp *motapp, const char *sqlquery) return; } - MOTION_LOG(DBG, TYPE_DB, NO_ERRNO, "Executing postgresql query"); + MOTPLS_LOG(DBG, TYPE_DB, NO_ERRNO, "Executing postgresql query"); res = PQexec(motapp->dbse->database_pgsql, sqlquery); if (PQstatus(motapp->dbse->database_pgsql) == CONNECTION_BAD) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Connection to PostgreSQL database '%s' failed: %s") , motapp->dbse->database_dbname.c_str() , PQerrorMessage(motapp->dbse->database_pgsql)); PQreset(motapp->dbse->database_pgsql); if (PQstatus(motapp->dbse->database_pgsql) == CONNECTION_BAD) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Re-Connection to PostgreSQL database '%s' failed: %s") , motapp->dbse->database_dbname.c_str() , PQerrorMessage(motapp->dbse->database_pgsql)); @@ -925,12 +925,12 @@ static void dbse_pgsql_exec(ctx_motapp *motapp, const char *sqlquery) motapp->dbse->database_type = ""; return; } else { - MOTION_LOG(INF, TYPE_DB, NO_ERRNO + MOTPLS_LOG(INF, TYPE_DB, NO_ERRNO , _("Re-Connection to PostgreSQL database '%s' Succeed") , motapp->dbse->database_dbname.c_str()); } } else if (!(PQresultStatus(res) == PGRES_COMMAND_OK || PQresultStatus(res) == PGRES_TUPLES_OK)) { - MOTION_LOG(ERR, TYPE_DB, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, SHOW_ERRNO , "PGSQL query failed: [%s] %s %s" , sqlquery , PQresStatus(PQresultStatus(res)) @@ -1070,7 +1070,7 @@ static void dbse_pgsql_setup(ctx_motapp *motapp) dbse_pgsql_recs(motapp,sql.c_str()); if (motapp->dbse->table_ok == false) { - MOTION_LOG(INF, TYPE_DB, NO_ERRNO + MOTPLS_LOG(INF, TYPE_DB, NO_ERRNO , _("Creating motionplus table")); motapp->dbse->dbse_action = DBSE_TBL_CREATE; dbse_sql_motpls(motapp->dbse, sql); @@ -1098,11 +1098,11 @@ static void dbse_pgsql_init(ctx_motapp *motapp) constr += " port="+std::to_string(motapp->dbse->database_port) + " "; motapp->dbse->database_pgsql = PQconnectdb(constr.c_str()); if (PQstatus(motapp->dbse->database_pgsql) == CONNECTION_BAD) { - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO , _("Connection to PostgreSQL database '%s' failed: %s") , motapp->dbse->database_dbname.c_str() , PQerrorMessage(motapp->dbse->database_pgsql)); - MOTION_LOG(ERR, TYPE_DB, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO ,_("Disabling database functionality")); dbse_close(motapp); motapp->dbse->database_type = ""; @@ -1111,7 +1111,7 @@ static void dbse_pgsql_init(ctx_motapp *motapp) dbse_pgsql_setup(motapp); - MOTION_LOG(INF, TYPE_DB, NO_ERRNO + MOTPLS_LOG(INF, TYPE_DB, NO_ERRNO , _("%s database opened") , motapp->dbse->database_dbname.c_str() ); } @@ -1162,7 +1162,7 @@ void dbse_init(ctx_motapp *motapp) if (dbse_edits(motapp) == -1) { return; } - MOTION_LOG(DBG, TYPE_DB, NO_ERRNO,_("Initializing database")); + MOTPLS_LOG(DBG, TYPE_DB, NO_ERRNO,_("Initializing database")); pthread_mutex_lock(&motapp->dbse->mutex_dbse); #ifdef HAVE_MARIADB if (motapp->dbse->database_type == "mariadb") { @@ -1316,7 +1316,7 @@ void dbse_exec(ctx_dev *cam, char *filename if (strlen(sqlquery) <= 0) { return; } - MOTION_LOG(DBG, TYPE_DB, NO_ERRNO, "%s query: %s", cmd, sqlquery); + MOTPLS_LOG(DBG, TYPE_DB, NO_ERRNO, "%s query: %s", cmd, sqlquery); dbse_exec_sql(cam->motapp, sqlquery); diff --git a/src/draw.cpp b/src/draw.cpp index 0cbd1524..cd49103e 100644 --- a/src/draw.cpp +++ b/src/draw.cpp @@ -1237,7 +1237,7 @@ void draw_init_scale(ctx_dev *cam) if (cam->text_scale <= 0) { cam->text_scale = 1; } - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO ,_("Invalid text scale. Adjusted to %d"), cam->text_scale); } @@ -1246,7 +1246,7 @@ void draw_init_scale(ctx_dev *cam) if (cam->text_scale <= 0) { cam->text_scale = 1; } - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO ,_("Invalid text scale. Adjusted to %d"), cam->text_scale); } diff --git a/src/event.cpp b/src/event.cpp index 0a7f4290..4e6e9090 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -65,7 +65,7 @@ static void event_newfile(ctx_dev *cam, motion_event evnt (void)ts1; (void)ftype; - MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_EVENTS, NO_ERRNO ,_("File saved to: %s"), fname); } @@ -181,7 +181,7 @@ static void event_vlp_putpipe(ctx_dev *cam, motion_event evnt if (*(int *)ftype >= 0) { if (vlp_putpipe(*(int *)ftype, img_data->image_norm, cam->imgs.size_norm) == -1) { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO ,_("Failed to put image into video pipe")); } } @@ -211,7 +211,7 @@ static void event_image_detect(ctx_dev *cam, motion_event evnt retcd = snprintf(fullfilename, PATH_MAX, "%s/%s.%s" , cam->conf->target_dir.c_str(), filename, imageext(cam)); if ((retcd < 0) || (retcd >= PATH_MAX)) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("Error creating image file name")); return; } @@ -244,7 +244,7 @@ static void event_imagem_detect(ctx_dev *cam, motion_event evnt retcd = snprintf(fullfilename, PATH_MAX, "%s/%sm.%s" , cam->conf->target_dir.c_str(), filename, imageext(cam)); if ((retcd < 0) || (retcd >= PATH_MAX)) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("Error creating image motion file name")); return; } @@ -256,7 +256,7 @@ static void event_imagem_detect(ctx_dev *cam, motion_event evnt retcd = snprintf(fullfilename, PATH_MAX, "%s/%sr.%s" , cam->conf->target_dir.c_str(), filename, imageext(cam)); if ((retcd < 0) || (retcd >= PATH_MAX)) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("Error creating image motion roi file name")); return; } @@ -289,12 +289,12 @@ static void event_image_snapshot(ctx_dev *cam, motion_event evnt mystrftime(cam, filepath, sizeof(filepath), cam->conf->snapshot_filename.c_str(), ts1, NULL, 0); retcd = snprintf(filename, PATH_MAX, "%s.%s", filepath, imageext(cam)); if (retcd <0) { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO, _("Error option")); + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO, _("Error option")); } retcd =snprintf(fullfilename, PATH_MAX, "%s/%s", cam->conf->target_dir.c_str(), filename); if (retcd <0) { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO, _("Error option")); + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO, _("Error option")); } pic_save_norm(cam, fullfilename, img_data->image_norm, FTYPE_IMAGE_SNAPSHOT); @@ -305,7 +305,7 @@ static void event_image_snapshot(ctx_dev *cam, motion_event evnt snprintf(linkpath, PATH_MAX, "%s/lastsnap.%s", cam->conf->target_dir.c_str(), imageext(cam)); remove(linkpath); if (symlink(filename, linkpath)) { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO ,_("Could not create symbolic link [%s]"), filename); return; } @@ -313,12 +313,12 @@ static void event_image_snapshot(ctx_dev *cam, motion_event evnt mystrftime(cam, filepath, sizeof(filepath), cam->conf->snapshot_filename.c_str(), ts1, NULL, 0); retcd = snprintf(filename, PATH_MAX, "%s.%s", filepath, imageext(cam)); if (retcd <0) { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO, _("Error option")); + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO, _("Error option")); } retcd = snprintf(fullfilename, PATH_MAX, "%s/%s", cam->conf->target_dir.c_str(), filename); if (retcd <0) { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO, _("Error option")); + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO, _("Error option")); } remove(fullfilename); @@ -353,7 +353,7 @@ static void event_image_preview(ctx_dev *cam, motion_event evnt retcd = snprintf(previewname, PATH_MAX, "%s/%s.%s" , cam->conf->target_dir.c_str(), filename, imageext(cam)); if ((retcd < 0) || (retcd >= PATH_MAX)) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("Error creating preview file name")); return; } @@ -396,7 +396,7 @@ static void event_secondary_detect(ctx_dev *cam, motion_event evnt (void)ftype; (void)ts1; - MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO,_("Event secondary detect")); + MOTPLS_LOG(NTC, TYPE_EVENTS, NO_ERRNO,_("Event secondary detect")); if (cam->conf->on_secondary_detect != "") { util_exec_command(cam, cam->conf->on_secondary_detect.c_str(), NULL, 0); @@ -446,17 +446,17 @@ static void event_extpipe_end(ctx_dev *cam, motion_event evnt if (cam->extpipe_open) { cam->extpipe_open = 0; fflush(cam->extpipe); - MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_EVENTS, NO_ERRNO ,_("CLOSING: extpipe file desc %d, error state %d") ,fileno(cam->extpipe), ferror(cam->extpipe)); - MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, "pclose return: %d", + MOTPLS_LOG(NTC, TYPE_EVENTS, NO_ERRNO, "pclose return: %d", pclose(cam->extpipe)); if ((cam->conf->movie_retain == "secondary") && (cam->algsec_inuse)) { if (cam->algsec->isdetected == false) { retcd = remove(cam->extpipefilename); if (retcd != 0) { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO , _("Unable to remove file %s"), cam->extpipefilename); } } else { @@ -488,25 +488,25 @@ static void event_extpipe_start(ctx_dev *cam, motion_event evnt retcd = snprintf(cam->extpipefilename, PATH_MAX - 4, "%s/%s" , cam->conf->target_dir.c_str(), stamp); if (retcd <0) { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO, _("Error option")); + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO, _("Error option")); } if (access(cam->conf->target_dir.c_str(), W_OK)!= 0) { /* Permission denied */ if (errno == EACCES) { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO ,_("no write access to target directory %s"), cam->conf->target_dir.c_str()); return ; /* Path not found - create it */ } else if (errno == ENOENT) { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO ,_("path not found, trying to create it %s ..."), cam->conf->target_dir.c_str()); if (mycreate_path(cam->extpipefilename) == -1) { return ; } } else { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO ,_("error accesing path %s"), cam->conf->target_dir.c_str()); return ; } @@ -522,20 +522,20 @@ static void event_extpipe_start(ctx_dev *cam, motion_event evnt retcd = snprintf(cam->extpipecmdline, PATH_MAX, "%s", stamp); if ((retcd < 0 ) || (retcd >= PATH_MAX)) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO , _("Error specifying command line: %s"), cam->extpipecmdline); return; } - MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("pipe: %s"), cam->extpipecmdline); + MOTPLS_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("pipe: %s"), cam->extpipecmdline); - MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, "cam->moviefps: %d", cam->movie_fps); + MOTPLS_LOG(NTC, TYPE_EVENTS, NO_ERRNO, "cam->moviefps: %d", cam->movie_fps); event(cam, EVENT_FILECREATE, NULL, cam->extpipefilename, (void *)FTYPE_MOVIE, ts1); dbse_exec(cam, cam->extpipefilename, FTYPE_MOVIE, ts1, "movie_start"); cam->extpipe = popen(cam->extpipecmdline, "we"); if (cam->extpipe == NULL) { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO, _("popen failed")); + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO, _("popen failed")); return; } @@ -557,23 +557,23 @@ static void event_extpipe_put(ctx_dev *cam, motion_event evnt /* Check use_extpipe enabled and ext_pipe not NULL */ if ((cam->conf->movie_extpipe_use) && (cam->extpipe != NULL)) { - MOTION_LOG(DBG, TYPE_EVENTS, NO_ERRNO, _("Using extpipe")); + MOTPLS_LOG(DBG, TYPE_EVENTS, NO_ERRNO, _("Using extpipe")); passthrough = mycheck_passthrough(cam); /* Check that is open */ if ((cam->extpipe_open) && (fileno(cam->extpipe) > 0)) { if ((cam->imgs.size_high > 0) && (!passthrough)) { if (!fwrite(img_data->image_high, cam->imgs.size_high, 1, cam->extpipe)) { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO ,_("Error writing in pipe , state error %d"), ferror(cam->extpipe)); } } else { if (!fwrite(img_data->image_norm, cam->imgs.size_norm, 1, cam->extpipe)) { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO ,_("Error writing in pipe , state error %d"), ferror(cam->extpipe)); } } } else { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("pipe %s not created or closed already "), cam->extpipecmdline); } } @@ -601,7 +601,7 @@ static void event_movie_start(ctx_dev *cam, motion_event evnt if (cam->conf->movie_output) { retcd = movie_init_norm(cam, ts1); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("Error opening ctx_dev for movie output.")); myfree(&cam->movie_norm); return; @@ -613,7 +613,7 @@ static void event_movie_start(ctx_dev *cam, motion_event evnt if (cam->conf->movie_output_motion) { retcd = movie_init_motion(cam, ts1); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("Error creating motion file [%s]"), cam->movie_motion->full_nm); myfree(&cam->movie_motion); return; @@ -631,12 +631,12 @@ static void event_movie_put(ctx_dev *cam, motion_event evnt if (cam->movie_norm) { if (movie_put_image(cam->movie_norm, img_data, ts1) == -1) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO, _("Error encoding image")); + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO, _("Error encoding image")); } } if (cam->movie_motion) { if (movie_put_image(cam->movie_motion, &cam->imgs.image_motion, ts1) == -1) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO, _("Error encoding image")); + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO, _("Error encoding image")); } } } @@ -656,7 +656,7 @@ static void event_movie_end(ctx_dev *cam, motion_event evnt if (cam->algsec->isdetected == false) { retcd = remove(cam->movie_norm->full_nm); if (retcd != 0) { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO , _("Unable to remove file %s") , cam->movie_norm->full_nm); } @@ -684,7 +684,7 @@ static void event_movie_end(ctx_dev *cam, motion_event evnt if (cam->algsec->isdetected == false) { retcd = remove(cam->movie_motion->full_nm); if (retcd != 0) { - MOTION_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO , _("Unable to remove file %s") , cam->movie_motion->full_nm); } @@ -722,7 +722,7 @@ static void event_tlapse_start(ctx_dev *cam, motion_event evnt if (!cam->movie_timelapse) { retcd = movie_init_timelapse(cam, ts1); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("Error creating timelapse file [%s]"), cam->movie_timelapse->full_nm); myfree(&cam->movie_timelapse); return; @@ -734,7 +734,7 @@ static void event_tlapse_start(ctx_dev *cam, motion_event evnt } if (movie_put_image(cam->movie_timelapse, img_data, ts1) == -1) { - MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO, _("Error encoding image")); + MOTPLS_LOG(ERR, TYPE_EVENTS, NO_ERRNO, _("Error encoding image")); } } diff --git a/src/jpegutils.cpp b/src/jpegutils.cpp index 64671274..cd4ab25a 100644 --- a/src/jpegutils.cpp +++ b/src/jpegutils.cpp @@ -88,7 +88,7 @@ static void add_huff_table(j_decompress_ptr dinfo, JHUFF_TBL **htblptr, const UI nsymbols += bits[len]; if (nsymbols < 1 || nsymbols > 256) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("%s: Given jpeg buffer was too small")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("%s: Given jpeg buffer was too small")); } memcpy((*htblptr)->huffval, val, nsymbols * sizeof(UINT8)); @@ -290,7 +290,7 @@ static void jpgutl_error_exit(j_common_ptr cinfo) */ (*cinfo->err->format_message) (cinfo, buffer); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, "%s", buffer); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, "%s", buffer); /* Return control to the setjmp point. */ longjmp (myerr->setjmp_buffer, 1); @@ -319,7 +319,7 @@ static void jpgutl_emit_message(j_common_ptr cinfo, int msg_level) if ((cinfo->err->msg_code != JWRN_EXTRANEOUS_DATA) && (msg_level < 0) ) { myerr->warning_seen++ ; (*cinfo->err->format_message) (cinfo, buffer); - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "msg_level: %d, %s", msg_level, buffer); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "msg_level: %d, %s", msg_level, buffer); } } @@ -462,13 +462,13 @@ int jpgutl_decode_jpeg (unsigned char *jpeg_data_in, int jpeg_data_len, jpeg_start_decompress (&dinfo); if ((dinfo.output_width == 0) || (dinfo.output_height == 0)) { - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO,_("Invalid JPEG image dimensions")); + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO,_("Invalid JPEG image dimensions")); jpeg_destroy_decompress(&dinfo); return -1; } if ((dinfo.output_width != width) || (dinfo.output_height != height)) { - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO ,_("JPEG image size %dx%d, JPEG was %dx%d") ,width, height, dinfo.output_width, dinfo.output_height); jpeg_destroy_decompress(&dinfo); diff --git a/src/libcam.cpp b/src/libcam.cpp index 1d843f91..12d6fe80 100644 --- a/src/libcam.cpp +++ b/src/libcam.cpp @@ -50,7 +50,7 @@ void cls_libcam::cam_start_params(ctx_dev *ptr) { int indx; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting."); camctx = ptr; @@ -59,12 +59,12 @@ void cls_libcam::cam_start_params(ctx_dev *ptr) util_parms_parse(camctx->libcam->params, camctx->conf->libcam_params); for (indx = 0; indx < camctx->libcam->params->params_count; indx++) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "%s : %s" + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "%s : %s" ,camctx->libcam->params->params_array[indx].param_name ,camctx->libcam->params->params_array[indx].param_value ); } - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Finished."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Finished."); } @@ -74,23 +74,23 @@ int cls_libcam::cam_start_mgr() std::string camid; libcamera::Size picsz; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting."); cam_mgr = std::make_unique(); retcd = cam_mgr->start(); if (retcd != 0) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , "Error starting camera manager. Return code: %d",retcd); return retcd; } started_mgr = true; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "cam_mgr started."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "cam_mgr started."); if (camctx->conf->libcam_device == "camera0"){ camid = cam_mgr->cameras()[0]->id(); } else { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , "Invalid libcam_device '%s'. The only name supported is 'camera0' " ,camctx->conf->libcam_device.c_str()); return -1; @@ -99,7 +99,7 @@ int cls_libcam::cam_start_mgr() camera->acquire(); started_aqr = true; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Finished."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Finished."); return 0; } @@ -109,7 +109,7 @@ int cls_libcam::cam_start_config() int retcd; libcamera::Size picsz; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting."); config = camera->generateConfiguration({ StreamRole::Viewfinder }); config->at(0).pixelFormat = PixelFormat::fromString("YUV420"); @@ -121,20 +121,20 @@ int cls_libcam::cam_start_config() retcd = config->validate(); if (retcd == CameraConfiguration::Adjusted) { if (config->at(0).pixelFormat != PixelFormat::fromString("YUV420")) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO , "Pixel format was adjusted to %s." , config->at(0).pixelFormat.toString().c_str()); return -1; } } else if (retcd == CameraConfiguration::Invalid) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , "Error setting configuration"); return -1; } if ((config->at(0).size.width != (unsigned int)camctx->conf->width) || (config->at(0).size.height != (unsigned int)camctx->conf->height)) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO , "Image size adjusted from %d x %d to %d x %d" , camctx->conf->width , camctx->conf->height @@ -149,7 +149,7 @@ int cls_libcam::cam_start_config() camera->configure(config.get()); - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Finished."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Finished."); return 0; } @@ -165,21 +165,21 @@ int cls_libcam::cam_start_req() { int retcd, bytes; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting."); camera->requestCompleted.connect(this, &cls_libcam::req_complete); frmbuf = std::make_unique(camera); retcd = frmbuf->allocate(config->at(0).stream()); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , "Buffer allocation error."); return -1; } std::unique_ptr request = camera->createRequest(); if (!request) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , "Create request error."); return -1; } @@ -191,7 +191,7 @@ int cls_libcam::cam_start_req() retcd = request->addBuffer(stream, buffer.get()); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , "Add buffer for request error."); return -1; } @@ -207,7 +207,7 @@ int cls_libcam::cam_start_req() bytes += plane2.length; } if (bytes > camctx->imgs.size_norm){ - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , "Image size error. Usual size is %d but planes size is %d" ,camctx->imgs.size_norm, bytes); return -1; @@ -220,7 +220,7 @@ int cls_libcam::cam_start_req() requests.push_back(std::move(request)); started_req = true; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Finished."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Finished."); return 0; } @@ -229,11 +229,11 @@ int cls_libcam::cam_start_capture() { int retcd; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting."); retcd = camera->start(&this->controls); if (retcd) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , "Failed to start capture."); return -1; } @@ -242,7 +242,7 @@ int cls_libcam::cam_start_capture() for (std::unique_ptr &request : requests) { retcd = req_add(request.get()); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , "Failed to queue request."); if (started_cam) { camera->stop(); @@ -250,7 +250,7 @@ int cls_libcam::cam_start_capture() return -1; } } - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Finished."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Finished."); return 0; } @@ -298,7 +298,7 @@ int cls_libcam::cam_start(ctx_dev *cam) started_cam = true; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Started all."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Started all."); return 0; } @@ -333,7 +333,7 @@ void cls_libcam::cam_stop() cam_mgr->stop(); cam_mgr.reset(); } - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Stopped."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Stopped."); } /* get the image from libcam */ @@ -386,13 +386,13 @@ void libcam_start(ctx_dev *cam) { #ifdef HAVE_LIBCAM int retcd; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening libcam")); - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting experimental libcamera ."); - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "EXPECT crashes and hung processes!!!"); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening libcam")); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "Starting experimental libcamera ."); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "EXPECT crashes and hung processes!!!"); cam->libcam = new cls_libcam; retcd = cam->libcam->cam_start(cam); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO,_("libcam failed to open")); + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO,_("libcam failed to open")); libcam_cleanup(cam); } else { cam->device_status = STATUS_OPENED; diff --git a/src/logger.cpp b/src/logger.cpp index 68ac74c1..55dce968 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -265,7 +265,7 @@ void log_init(ctx_motapp *motapp) if ((motapp->conf->log_level > ALL) || (motapp->conf->log_level == 0)) { motapp->conf->log_level = LEVEL_DEFAULT; - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("Using default log level (%s) (%d)") ,log_level_str[motapp->conf->log_level] ,motapp->conf->log_level); @@ -278,27 +278,27 @@ void log_init(ctx_motapp *motapp) log_set_logfile(motapp->conf->log_file.c_str()); if (logfile) { log_set_mode(LOGMODE_SYSLOG); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Logging to file (%s)") , motapp->conf->log_file.c_str()); log_set_mode(LOGMODE_FILE); } else { - MOTION_LOG(EMG, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(EMG, TYPE_ALL, SHOW_ERRNO , _("Exit motion, cannot create log file %s") , motapp->conf->log_file.c_str()); exit(0); } } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Logging to syslog")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Logging to syslog")); } } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Logging to syslog")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Logging to syslog")); } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "MotionPlus %s started",VERSION); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, "MotionPlus %s started",VERSION); motapp->conf->log_type = log_get_type(motapp->conf->log_type_str.c_str()); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Using log type (%s) log level (%s)") , log_type_str[motapp->conf->log_type] , log_level_str[motapp->conf->log_level]); @@ -312,7 +312,7 @@ void log_deinit(ctx_motapp *motapp) { if (logfile != NULL) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Closing logfile (%s).") , motapp->conf->log_file.c_str()); myfclose(logfile); diff --git a/src/logger.hpp b/src/logger.hpp index 4ec2b81c..633c5e93 100644 --- a/src/logger.hpp +++ b/src/logger.hpp @@ -53,7 +53,6 @@ #define TYPE_DEFAULT TYPE_ALL /* Default type */ #define TYPE_DEFAULT_STR "ALL" /* Default name logs */ - #define MOTION_LOG(x, y, z, format, args...) motpls_log(x, y, z, 1, format, __FUNCTION__, ##args) #define MOTPLS_LOG(x, y, z, format, args...) motpls_log(x, y, z, 1, format, __FUNCTION__, ##args) void motpls_log(int loglevel, int logtype, int errno_flag,int fncname, const char *fmt, ...); diff --git a/src/motion_loop.cpp b/src/motion_loop.cpp index 276915bd..fd482162 100644 --- a/src/motion_loop.cpp +++ b/src/motion_loop.cpp @@ -51,7 +51,7 @@ static void mlp_ring_resize(ctx_dev *cam) new_size = 1; } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("Resizing buffer to %d items"), new_size); tmp =(ctx_image_data*) mymalloc(new_size * sizeof(ctx_image_data)); @@ -199,7 +199,7 @@ static void mlp_detected_trigger(ctx_dev *cam, ctx_image_data *img) sprintf(cam->eventid, "%05d", cam->device_id); strftime(cam->eventid+5, 15, "%Y%m%d%H%M%S", &evt_tm); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Motion detected - starting event %d"), + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Motion detected - starting event %d"), cam->event_nr); mystrftime(cam, cam->text_event_string, sizeof(cam->text_event_string), @@ -374,7 +374,7 @@ void mlp_cam_close(ctx_dev *cam) return; } - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO,_("No Camera device cleanup")); + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO,_("No Camera device cleanup")); return; } @@ -389,7 +389,7 @@ void mlp_cam_start(ctx_dev *cam) } else if (cam->camera_type == CAMERA_TYPE_V4L2) { v4l2_start(cam); } else { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO ,_("No Camera device specified")); cam->device_status = STATUS_CLOSED; } @@ -419,7 +419,7 @@ static void mlp_init_camera_type(ctx_dev *cam) } else if (cam->conf->v4l2_device != "") { cam->camera_type = CAMERA_TYPE_V4L2; } else { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Unable to determine camera type")); cam->camera_type = CAMERA_TYPE_UNKNOWN; cam->finish_dev = true; @@ -449,7 +449,7 @@ static void mlp_init_firstimage(ctx_dev *cam) } else { msg = "Error capturing first image"; } - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, "%s", msg); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, "%s", msg); for (indx = 0; indximgs.ring_size; indx++) { memset(cam->imgs.image_ring[indx].image_norm , 0x80, cam->imgs.size_norm); @@ -465,20 +465,20 @@ static void mlp_init_firstimage(ctx_dev *cam) static void mlp_check_szimg(ctx_dev *cam) { if ((cam->imgs.width % 8) || (cam->imgs.height % 8)) { - MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(CRT, TYPE_NETCAM, NO_ERRNO ,_("Image width (%d) or height(%d) requested is not modulo 8.") ,cam->imgs.width, cam->imgs.height); cam->device_status = STATUS_RESET; } if ((cam->imgs.width < 64) || (cam->imgs.height < 64)) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO ,_("Motion only supports width and height greater than or equal to 64 %dx%d") ,cam->imgs.width, cam->imgs.height); cam->device_status = STATUS_RESET; } /* Substream size notification*/ if ((cam->imgs.width % 16) || (cam->imgs.height % 16)) { - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("Substream not available. Image sizes not modulo 16.")); } @@ -560,7 +560,7 @@ static void mlp_init_values(ctx_dev *cam) cam->movie_passthrough = cam->conf->movie_passthrough; if ((cam->camera_type != CAMERA_TYPE_NETCAM) && (cam->movie_passthrough)) { - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Pass-through processing disabled.")); + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Pass-through processing disabled.")); cam->movie_passthrough = false; } if (cam->motapp->pause) { @@ -576,7 +576,7 @@ static void mlp_init_cam_start(ctx_dev *cam) mlp_cam_start(cam); if (cam->device_status == STATUS_CLOSED) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO,_("Failed to start camera.")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO,_("Failed to start camera.")); cam->imgs.width = cam->conf->width; cam->imgs.height = cam->conf->height; } @@ -669,7 +669,7 @@ static void mlp_init(ctx_dev *cam) mlp_cleanup(cam); } - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO,_("Initialize")); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO,_("Initialize")); mlp_init_values(cam); @@ -704,12 +704,12 @@ static void mlp_init(ctx_dev *cam) mlp_init_ref(cam); if (cam->device_status == STATUS_OPENED) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("Camera %d started: motion detection %s"), cam->device_id, cam->pause ? _("Disabled"):_("Enabled")); if (cam->conf->emulate_motion) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, _("Emulating motion")); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, _("Emulating motion")); } } } @@ -734,7 +734,7 @@ static void mlp_areadetect(ctx_dev *cam) cam->current_image->location.y < cam->area_maxy[z]) { event(cam, EVENT_AREA_DETECTED, NULL, NULL, NULL, &cam->current_image->imgts); cam->areadetect_eventnbr = cam->event_nr; /* Fire script only once per event */ - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO ,_("Motion in area %d detected."), z + 1); break; } @@ -805,7 +805,7 @@ static void mlp_retry(ctx_dev *cam) if ((cam->device_status == STATUS_CLOSED) && (cam->frame_curr_ts.tv_sec % 10 == 0) && (cam->shots == 0)) { - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO ,_("Retrying until successful connection with camera")); mlp_cam_start(cam); @@ -813,7 +813,7 @@ static void mlp_retry(ctx_dev *cam) mlp_check_szimg(cam); if (cam->imgs.width != cam->conf->width || cam->imgs.height != cam->conf->height) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Resetting image buffers")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Resetting image buffers")); cam->device_status = STATUS_RESET; } /* @@ -847,7 +847,7 @@ static int mlp_capture(ctx_dev *cam) cam->connectionlosttime.tv_sec = 0; if (cam->missing_frame_counter >= (cam->conf->device_tmo * cam->conf->framerate)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Video signal re-acquired")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Video signal re-acquired")); event(cam, EVENT_CAMERA_FOUND, NULL, NULL, NULL, NULL); } cam->missing_frame_counter = 0; @@ -882,14 +882,14 @@ static int mlp_capture(ctx_dev *cam) /* Write error message only once */ if (cam->missing_frame_counter == (cam->conf->device_tmo * cam->conf->framerate)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("Video signal lost - Adding grey image")); event(cam, EVENT_CAMERA_LOST, NULL, NULL, NULL, &cam->connectionlosttime); } if ((cam->device_status == STATUS_OPENED) && (cam->missing_frame_counter == ((cam->conf->device_tmo * 4) * cam->conf->framerate))) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO ,_("Video signal still lost - Trying to close video device")); mlp_cam_close(cam); } @@ -1114,7 +1114,7 @@ static void mlp_actions_event(ctx_dev *cam) cam->algsec->isdetected = false; } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("End of event %d"), cam->event_nr); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("End of event %d"), cam->event_nr); cam->postcap = 0; cam->event_nr++; @@ -1152,7 +1152,7 @@ static void mlp_actions(ctx_dev *cam) cam->info_sdev_max = cam->current_image->location.stddev_xy; } /* - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO , "dev_x %d dev_y %d dev_xy %d, diff %d ratio %d" , cam->current_image->location.stddev_x , cam->current_image->location.stddev_y @@ -1223,7 +1223,7 @@ static void mlp_setupmode(ctx_dev *cam) strcat(msg, part); } - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "%s", msg); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "%s", msg); } } @@ -1459,7 +1459,7 @@ void *mlp_main(void *arg) mlp_frametiming(cam); } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Exiting")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Exiting")); mlp_cleanup(cam); diff --git a/src/motionplus.cpp b/src/motionplus.cpp index 4a6fd9b8..a3102c47 100644 --- a/src/motionplus.cpp +++ b/src/motionplus.cpp @@ -170,11 +170,11 @@ static void motpls_pid_write(ctx_motapp *motapp) if (pidf) { (void)fprintf(pidf, "%d\n", getpid()); myfclose(pidf); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("Created process id file %s. Process ID is %d") ,motapp->conf->pid_file.c_str(), getpid()); } else { - MOTION_LOG(EMG, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(EMG, TYPE_ALL, SHOW_ERRNO , _("Cannot create process id file (pid file) %s") , motapp->conf->pid_file.c_str()); } @@ -188,9 +188,9 @@ static void motpls_pid_remove(ctx_motapp *motapp) if ((motapp->conf->pid_file != "") && (motapp->restart_all == false)) { if (!unlink(motapp->conf->pid_file.c_str())) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Removed process id file (pid file).")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Removed process id file (pid file).")); } else{ - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Error removing pid file")); + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Error removing pid file")); } } @@ -212,7 +212,7 @@ static void motpls_daemon() sigemptyset(&sig_ign_action.sa_mask); if (fork()) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("MotionPlus going to daemon mode")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("MotionPlus going to daemon mode")); exit(0); } @@ -221,7 +221,7 @@ static void motpls_daemon() * without having to stop MotionPlus */ if (chdir("/")) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Could not change directory")); + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Could not change directory")); } #if (defined(BSD) && !defined(__APPLE__)) @@ -314,8 +314,8 @@ static void motpls_device_ids(ctx_motapp *motapp) } if (invalid_ids) { - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Device IDs are not unique.")); - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Falling back to sequence numbers")); + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Device IDs are not unique.")); + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Falling back to sequence numbers")); for (indx=0; indxcam_cnt; indx++) { motapp->cam_list[indx]->device_id = indx + 1; } @@ -330,63 +330,63 @@ static void motpls_ntc(void) { #ifdef HAVE_V4L2 - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("v4l2 : available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("v4l2 : available")); #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("v4l2 : not available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("v4l2 : not available")); #endif #ifdef HAVE_WEBP - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("webp : available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("webp : available")); #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("webp : not available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("webp : not available")); #endif #ifdef HAVE_LIBCAM - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("libcam : available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("libcam : available")); #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("libcam : not available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("libcam : not available")); #endif #ifdef HAVE_MYSQL - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("mysql : available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("mysql : available")); #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("mysql : not available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("mysql : not available")); #endif #ifdef HAVE_MARIADB - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("MariaDB: available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("MariaDB: available")); #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("MariaDB: not available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("MariaDB: not available")); #endif #ifdef HAVE_SQLITE3 - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("sqlite3: available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("sqlite3: available")); #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("sqlite3: not available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("sqlite3: not available")); #endif #ifdef HAVE_PGSQL - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("pgsql : available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("pgsql : available")); #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("pgsql : not available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("pgsql : not available")); #endif #ifdef ENABLE_NLS - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("nls : available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("nls : available")); #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("nls : not available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("nls : not available")); #endif #ifdef HAVE_ALSA - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("alsa : available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("alsa : available")); #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("alsa : not available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("alsa : not available")); #endif #ifdef HAVE_FFTW3 - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("fftw3 : available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("fftw3 : available")); #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("fftw3 : not available")); + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("fftw3 : not available")); #endif } @@ -408,12 +408,12 @@ static void motpls_startup(ctx_motapp *motapp, int daemonize) if (daemonize) { if (motapp->conf->daemon && motapp->conf->setup_mode == 0) { motpls_daemon(); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("MotionPlus running as daemon process")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("MotionPlus running as daemon process")); } } if (motapp->conf->setup_mode) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,_("MotionPlus running in setup mode.")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,_("MotionPlus running in setup mode.")); } conf_parms_log(motapp); @@ -444,7 +444,7 @@ static void motpls_start_thread_cam(ctx_dev *cam) cam->restart_dev = true; retcd = pthread_create(&cam->thread_id, &thread_attr, &mlp_main, cam); if (retcd != 0) { - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Unable to start camera thread.")); + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Unable to start camera thread.")); } pthread_attr_destroy(&thread_attr); @@ -461,7 +461,7 @@ static void motpls_start_thread_snd(ctx_dev *snd) snd->restart_dev = true; retcd = pthread_create(&snd->thread_id, &thread_attr, &snd_loop, snd); if (retcd != 0) { - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Unable to start sound thread.")); + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Unable to start sound thread.")); } pthread_attr_destroy(&thread_attr); @@ -470,7 +470,7 @@ static void motpls_start_thread_snd(ctx_dev *snd) static void motpls_restart(ctx_motapp *motapp) { - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Restarting MotionPlus.")); + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO,_("Restarting MotionPlus.")); motpls_shutdown(motapp); @@ -478,7 +478,7 @@ static void motpls_restart(ctx_motapp *motapp) motpls_startup(motapp, false); - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO,_("MotionPlus restarted")); + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO,_("MotionPlus restarted")); motapp->restart_all = false; @@ -498,7 +498,7 @@ static void motpls_watchdog(ctx_motapp *motapp, int camindx) return; } - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Camera %d - Watchdog timeout.") , motapp->cam_list[camindx]->device_id); @@ -542,7 +542,7 @@ static void motpls_watchdog(ctx_motapp *motapp, int camindx) for (indx=0; indxcam_cnt; indx++) { if (motapp->cam_list[indx]->netcam != NULL) { if (motapp->cam_list[indx]->netcam->handler_finished == false) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Camera %d - Watchdog netcam kill.") , motapp->cam_list[indx]->device_id); pthread_kill(motapp->cam_list[indx]->netcam->thread_id, SIGVTALRM); @@ -550,14 +550,14 @@ static void motpls_watchdog(ctx_motapp *motapp, int camindx) } if (motapp->cam_list[indx]->netcam_high != NULL) { if (motapp->cam_list[indx]->netcam_high->handler_finished == false) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Camera %d - Watchdog netcam_high kill.") , motapp->cam_list[indx]->device_id); pthread_kill(motapp->cam_list[indx]->netcam_high->thread_id, SIGVTALRM); } } if (motapp->cam_list[indx]->running_dev == true) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Camera %d - Watchdog kill.") , motapp->cam_list[indx]->device_id); pthread_kill(motapp->cam_list[indx]->thread_id, SIGVTALRM); @@ -686,7 +686,7 @@ static void motpls_cam_delete(ctx_motapp *motapp) } if (motapp->cam_delete >= motapp->cam_cnt) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Invalid camera specified for deletion. %d"), motapp->cam_delete); motapp->cam_delete = -1; return; @@ -694,7 +694,7 @@ static void motpls_cam_delete(ctx_motapp *motapp) cam = motapp->cam_list[motapp->cam_delete]; - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO, _("Stopping %s device_id %d") + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO, _("Stopping %s device_id %d") , cam->conf->device_name.c_str(), cam->device_id); cam->restart_dev = false; cam->finish_dev = true; @@ -706,11 +706,11 @@ static void motpls_cam_delete(ctx_motapp *motapp) indx1++; } if (indx1 == maxcnt) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, "Error stopping camera. Timed out shutting down"); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, "Error stopping camera. Timed out shutting down"); motapp->cam_delete = -1; return; } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "Camera stopped"); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, "Camera stopped"); tmp = (ctx_dev **)mymalloc(sizeof(ctx_dev *) * (motapp->cam_cnt)); tmp[motapp->cam_cnt-1] = NULL; @@ -765,7 +765,7 @@ int main (int argc, char **argv) motpls_start_thread_snd(motapp->snd_list[indx]); } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("Motionplus pid: %d"), getpid()); while (true) { @@ -779,7 +779,7 @@ int main (int argc, char **argv) /* Check if threads wants to be restarted */ if ((motapp->cam_list[indx]->running_dev == false) && (motapp->cam_list[indx]->restart_dev == true)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("MotionPlus camera %d restart") , motapp->cam_list[indx]->device_id); motpls_start_thread_cam(motapp->cam_list[indx]); @@ -789,7 +789,7 @@ int main (int argc, char **argv) for (indx=0; indxsnd_cnt; indx++) { if ((motapp->snd_list[indx]->running_dev == false) && (motapp->snd_list[indx]->restart_dev == true)) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("MotionPlus sound %d restart") , motapp->snd_list[indx]->device_id); motpls_start_thread_snd(motapp->snd_list[indx]); @@ -810,7 +810,7 @@ int main (int argc, char **argv) motapp->finish_all = false; - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Motionplus devices finished")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Motionplus devices finished")); if (motapp->restart_all) { SLEEP(1, 0); /* Rest before restarting */ @@ -819,7 +819,7 @@ int main (int argc, char **argv) } } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("MotionPlus terminating")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("MotionPlus terminating")); movie_global_deinit(); diff --git a/src/movie.cpp b/src/movie.cpp index 7b8ec962..1178fa73 100644 --- a/src/movie.cpp +++ b/src/movie.cpp @@ -150,7 +150,7 @@ static int movie_get_oformat(ctx_movie *movie) memcpy(movie->full_nm + len_full, ".mpg", 4); memcpy(movie->movie_nm + len_nm, ".mpg", 4); if (movie->oc->oformat == NULL) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error setting timelapse append for container %s"), container_name); movie_free_context(movie); myfree(&container_name); @@ -205,7 +205,7 @@ static int movie_get_oformat(ctx_movie *movie) } if (movie->oc->oformat == NULL) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("container option value %s is not supported"), container_name); movie_free_context(movie); myfree(&container_name); @@ -213,7 +213,7 @@ static int movie_get_oformat(ctx_movie *movie) } if (movie->oc->oformat->video_codec == MY_CODEC_ID_NONE) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get the container")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get the container")); movie_free_context(movie); myfree(&container_name); return -1; @@ -235,7 +235,7 @@ static int movie_encode_video(ctx_movie *movie) retcd = avcodec_send_frame(movie->ctx_codec, movie->picture); if (retcd < 0 ) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error sending frame for encoding:%s"),errstr); return -1; } @@ -247,7 +247,7 @@ static int movie_encode_video(ctx_movie *movie) } if (retcd < 0 ) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error receiving encoded packet video:%s"),errstr); //Packet is freed upon failure of encoding return -1; @@ -268,7 +268,7 @@ static int movie_encode_video(ctx_movie *movie) retcd = avcodec_encode_video2(movie->ctx_codec, movie->pkt, movie->picture, &got_packet_ptr); if (retcd < 0 ) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error encoding video:%s"),errstr); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error encoding video:%s"),errstr); //Packet is freed upon failure of encoding return -1; } @@ -296,7 +296,7 @@ static int movie_encode_video(ctx_movie *movie) retcd = avcodec_encode_video(movie->strm_video->codec, video_outbuf, video_outbuf_size, movie->picture); if (retcd < 0 ) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error encoding video")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error encoding video")); movie_free_pkt(movie); return -1; } @@ -352,7 +352,7 @@ static int movie_set_pts(ctx_movie *movie, const struct timespec *ts1) movie->picture->pts = av_rescale_q(pts_interval,(AVRational){1, 1000000L},movie->strm_video->time_base) + movie->base_pts; if (movie->test_mode == true) { - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO ,_("PTS %" PRId64 " Base PTS %" PRId64 " ms interval %" PRId64 " timebase %d-%d") ,movie->picture->pts,movie->base_pts,pts_interval ,movie->strm_video->time_base.num,movie->strm_video->time_base.den); @@ -361,7 +361,7 @@ static int movie_set_pts(ctx_movie *movie, const struct timespec *ts1) if (movie->picture->pts <= movie->last_pts) { //We have a problem with our motion loop timing and sending frames or the rounding into the PTS. if (movie->test_mode == true) { - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, _("BAD TIMING!! Frame skipped.")); + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO, _("BAD TIMING!! Frame skipped.")); } return -1; } @@ -428,7 +428,7 @@ static int movie_set_quality(ctx_movie *movie) movie->ctx_codec->global_quality=movie->quality; } } - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO ,_("%s codec vbr/crf/bit_rate: %d"), movie->codec->name, movie->quality); return 0; @@ -479,7 +479,7 @@ static int movie_set_codec_preferred(ctx_movie *movie) if (movie->container_name[container_name_len]) { const char *blacklist_reason = movie_codec_is_blacklisted(&movie->container_name[container_name_len+1]); if (blacklist_reason) { - MOTION_LOG(WRN, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_ENCODER, NO_ERRNO ,_("Preferred codec %s has been blacklisted: %s") ,&movie->container_name[container_name_len+1], blacklist_reason); } else { @@ -490,7 +490,7 @@ static int movie_set_codec_preferred(ctx_movie *movie) movie->codec = avcodec_find_encoder(movie->oc->video_codec_id); } if (movie->codec == NULL) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("container %s not found"), movie->container_name); movie_free_context(movie); return -1; @@ -507,7 +507,7 @@ static int movie_set_codec_preferred(ctx_movie *movie) } if (movie->container_name[container_name_len]) { - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO,_("Using codec %s"), movie->codec->name); + MOTPLS_LOG(NTC, TYPE_ENCODER, NO_ERRNO,_("Using codec %s"), movie->codec->name); } return 0; @@ -529,20 +529,20 @@ static int movie_set_codec(ctx_movie *movie) #if (MYFFVER >= 57041) movie->strm_video = avformat_new_stream(movie->oc, movie->codec); if (!movie->strm_video) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc stream")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc stream")); movie_free_context(movie); return -1; } movie->ctx_codec = avcodec_alloc_context3(movie->codec); if (movie->ctx_codec == NULL) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Failed to allocate codec context!")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Failed to allocate codec context!")); movie_free_context(movie); return -1; } #else movie->strm_video = avformat_new_stream(movie->oc, movie->codec); if (!movie->strm_video) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc stream")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc stream")); movie_free_context(movie); return -1; } @@ -571,7 +571,7 @@ static int movie_set_codec(ctx_movie *movie) if (mystreq(movie->container_name, "flv") || mystreq(movie->container_name, "mp4") || mystreq(movie->container_name, "hevc")) { - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO, "Low fps. Encoding %d frames into a %d frames container.", movie->fps, 10); + MOTPLS_LOG(NTC, TYPE_ENCODER, NO_ERRNO, "Low fps. Encoding %d frames into a %d frames container.", movie->fps, 10); movie->fps = 10; } } @@ -606,7 +606,7 @@ static int movie_set_codec(ctx_movie *movie) retcd = movie_set_quality(movie); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Unable to set quality")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Unable to set quality")); return -1; } @@ -615,7 +615,7 @@ static int movie_set_codec(ctx_movie *movie) if (movie->codec->supported_framerates) { const AVRational *fps = movie->codec->supported_framerates; while (fps->num) { - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO ,_("Reported FPS Supported %d/%d"), fps->num, fps->den); fps++; } @@ -628,7 +628,7 @@ static int movie_set_codec(ctx_movie *movie) } if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not open codec %s"),errstr); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not open codec %s"),errstr); av_dict_free(&movie->opts); movie_free_context(movie); return -1; @@ -650,7 +650,7 @@ static int movie_set_stream(ctx_movie *movie) retcd = avcodec_parameters_from_context(movie->strm_video->codecpar,movie->ctx_codec); if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Failed to copy decoder parameters!: %s"), errstr); movie_free_context(movie); return -1; @@ -739,7 +739,7 @@ static int movie_set_picture(ctx_movie *movie) movie->picture = myframe_alloc(); if (!movie->picture) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("could not alloc frame")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("could not alloc frame")); movie_free_context(movie); return -1; } @@ -761,7 +761,7 @@ static int movie_set_picture(ctx_movie *movie) retcd = movie_alloc_video_buffer(movie->picture, 32); if (retcd) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("could not alloc buffers %s"), errstr); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("could not alloc buffers %s"), errstr); movie_free_context(movie); return -1; } @@ -777,7 +777,7 @@ static int movie_interrupt(void *ctx) clock_gettime(CLOCK_MONOTONIC, &movie->cb_cr_ts); if ((movie->cb_cr_ts.tv_sec - movie->cb_st_ts.tv_sec ) > movie->cb_dur) { - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO,_("Movie timed out")); + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO,_("Movie timed out")); return 1; } else{ return 0; @@ -794,7 +794,7 @@ static int movie_set_outputfile(ctx_movie *movie) #if (MYFFVER < 58000) retcd = snprintf(movie->oc->full_nm, sizeof(movie->oc->full_nm), "%s", movie->full_nm); if ((retcd < 0) || (retcd >= PATH_MAX)) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error setting file name")); return -1; } @@ -806,7 +806,7 @@ static int movie_set_outputfile(ctx_movie *movie) retcd = avio_open(&movie->oc->pb, movie->full_nm, MY_FLAG_WRITE|AVIO_FLAG_NONBLOCK); if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO ,_("avio_open: %s File %s") , errstr, movie->full_nm); if (errno == ENOENT) { @@ -818,14 +818,14 @@ static int movie_set_outputfile(ctx_movie *movie) retcd = avio_open(&movie->oc->pb, movie->full_nm, MY_FLAG_WRITE| AVIO_FLAG_NONBLOCK); if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO ,_("error %s opening file %s") , errstr, movie->full_nm); movie_free_context(movie); return -1; } } else { - MOTION_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO ,_("Error opening file %s") , movie->full_nm); movie_free_context(movie); @@ -837,7 +837,7 @@ static int movie_set_outputfile(ctx_movie *movie) retcd = avformat_write_header(movie->oc, NULL); if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Could not write movie header %s"),errstr); movie_free_context(movie); return -1; @@ -873,7 +873,7 @@ static int movie_flush_codec(ctx_movie *movie) retcd = avcodec_send_frame(movie->ctx_codec, NULL); if (retcd < 0 ) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error entering draining mode:%s"),errstr); return -1; } @@ -883,7 +883,7 @@ static int movie_flush_codec(ctx_movie *movie) if (recv_cd != AVERROR_EOF) { if (recv_cd < 0) { av_strerror(recv_cd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error draining codec:%s"),errstr); movie_free_pkt(movie); return -1; @@ -896,7 +896,7 @@ static int movie_flush_codec(ctx_movie *movie) } retcd = av_write_frame(movie->oc, movie->pkt); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error writing draining video frame")); return -1; } @@ -928,7 +928,7 @@ static int movie_put_frame(ctx_movie *movie, const struct timespec *ts1) retcd = movie_encode_video(movie); if (retcd != 0) { if (retcd != -2) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error while encoding picture")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error while encoding picture")); } movie_free_pkt(movie); return retcd; @@ -942,7 +942,7 @@ static int movie_put_frame(ctx_movie *movie, const struct timespec *ts1) movie_free_pkt(movie); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error while writing video frame")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error while writing video frame")); return -1; } return retcd; @@ -1004,7 +1004,7 @@ static int movie_passthru_pktpts(ctx_movie *movie) , movie->netcam_data->transfer_format->streams[indx]->time_base, tmpbase); /* - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO ,_("base PTS %" PRId64 " new PTS %" PRId64 " srcbase %d-%d newbase %d-%d") ,ts_interval, movie->pkt->duration ,movie->netcam_data->transfer_format->streams[indx]->time_base.num @@ -1027,7 +1027,7 @@ static void movie_passthru_write(ctx_movie *movie, int indx) retcd = mycopy_packet(movie->pkt, movie->netcam_data->pktarray[indx].packet); if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, "av_copy_packet: %s",errstr); + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO, "av_copy_packet: %s",errstr); movie_free_pkt(movie); return; } @@ -1042,7 +1042,7 @@ static void movie_passthru_write(ctx_movie *movie, int indx) movie_free_pkt(movie); if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error while writing video frame: %s"),errstr); return; } @@ -1190,13 +1190,13 @@ static int movie_passthru_streams_video(ctx_movie *movie, AVStream *stream_in) movie->strm_video = avformat_new_stream(movie->oc, NULL); if (!movie->strm_video) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc video stream")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc video stream")); return -1; } retcd = avcodec_parameters_copy(movie->strm_video->codecpar, stream_in->codecpar); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Unable to copy video codec parameters")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Unable to copy video codec parameters")); return -1; } @@ -1204,7 +1204,7 @@ static int movie_passthru_streams_video(ctx_movie *movie, AVStream *stream_in) movie->strm_video->time_base = stream_in->time_base; movie->strm_video->avg_frame_rate = stream_in->avg_frame_rate; - MOTION_LOG(DBG, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_ENCODER, NO_ERRNO , _("video timebase %d/%d fps %d/%d") , movie->strm_video->time_base.num , movie->strm_video->time_base.den @@ -1220,13 +1220,13 @@ static int movie_passthru_streams_audio(ctx_movie *movie, AVStream *stream_in) movie->strm_audio = avformat_new_stream(movie->oc, NULL); if (!movie->strm_audio) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc audio stream")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc audio stream")); return -1; } retcd = avcodec_parameters_copy(movie->strm_audio->codecpar, stream_in->codecpar); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Unable to copy audio codec parameters")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Unable to copy audio codec parameters")); return -1; } @@ -1238,7 +1238,7 @@ static int movie_passthru_streams_audio(ctx_movie *movie, AVStream *stream_in) movie->strm_audio->codecpar->sample_rate = stream_in->codecpar->sample_rate; movie->strm_audio->avg_frame_rate = stream_in->avg_frame_rate; - MOTION_LOG(DBG, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_ENCODER, NO_ERRNO , _("audio timebase %d/%d") , movie->strm_audio->time_base.num , movie->strm_audio->time_base.den); @@ -1273,7 +1273,7 @@ static int movie_passthru_streams(ctx_movie *movie) return 0; #else /* This is disabled in the check_passthrough but we need it here for compiling */ - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, _("Pass-through disabled. ffmpeg too old")); + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO, _("Pass-through disabled. ffmpeg too old")); return -1; #endif } @@ -1282,13 +1282,13 @@ static int movie_passthru_check(ctx_movie *movie) { if ((movie->netcam_data->status == NETCAM_NOTCONNECTED ) || (movie->netcam_data->status == NETCAM_RECONNECTING )) { - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ENCODER, NO_ERRNO ,_("rtsp camera not ready for pass-through.")); return -1; } if (movie->netcam_data == NULL) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("RTSP context not available.")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("RTSP context not available.")); return -1; } @@ -1308,7 +1308,7 @@ static int movie_passthru_open(ctx_movie *movie) movie->oc = avformat_alloc_context(); if (!movie->oc) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not allocate output context")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not allocate output context")); movie_free_context(movie); return -1; } @@ -1317,7 +1317,7 @@ static int movie_passthru_open(ctx_movie *movie) movie->cb_dur = 3; if (mystrne(movie->container_name, "mp4") && mystrne(movie->container_name, "mkv")) { - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ENCODER, NO_ERRNO ,_("Changing to MP4 container for pass-through.")); movie->container_name = "mp4"; } @@ -1326,24 +1326,24 @@ static int movie_passthru_open(ctx_movie *movie) retcd = movie_get_oformat(movie); if (retcd < 0 ) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get output format!")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get output format!")); return -1; } retcd = movie_passthru_streams(movie); if (retcd < 0 ) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get streams!")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get streams!")); return -1; } retcd = movie_set_outputfile(movie); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the output file")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the output file")); return -1; } if (movie->strm_audio != NULL) { - MOTION_LOG(DBG, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_ENCODER, NO_ERRNO , _("Timebase after open audio: %d/%d video: %d/%d") , movie->strm_audio->time_base.num , movie->strm_audio->time_base.den @@ -1351,7 +1351,7 @@ static int movie_passthru_open(ctx_movie *movie) , movie->strm_video->time_base.den); } - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, "Pass-through stream opened"); + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO, "Pass-through stream opened"); return 0; } @@ -1376,14 +1376,14 @@ void movie_avcodec_log(void *ignoreme, int errno_flag, const char *fmt, va_list if (errno_flag <= AV_LOG_WARNING) { retcd = vsnprintf(buf, sizeof(buf), fmt, vl); if (retcd >=1024) { - MOTION_LOG(DBG, TYPE_ENCODER, NO_ERRNO, "av message truncated %d bytes",(retcd - 1024)); + MOTPLS_LOG(DBG, TYPE_ENCODER, NO_ERRNO, "av message truncated %d bytes",(retcd - 1024)); } end = buf + strlen(buf); if (end > buf && end[-1] == '\n') { *--end = 0; } if (strstr(buf, "Will reconnect at") == NULL) { - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, "%s", buf); + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO, "%s", buf); } } @@ -1436,9 +1436,9 @@ static void movie_put_pix_yuv420(ctx_movie *movie, ctx_image_data *img_data) void movie_global_init(void) { - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO, _("libavcodec version %d.%d.%d") + MOTPLS_LOG(NTC, TYPE_ENCODER, NO_ERRNO, _("libavcodec version %d.%d.%d") , LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO); - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO, _("libavformat version %d.%d.%d") + MOTPLS_LOG(NTC, TYPE_ENCODER, NO_ERRNO, _("libavformat version %d.%d.%d") , LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO); #if (MYFFVER < 58000) @@ -1460,7 +1460,7 @@ void movie_global_deinit(void) #if (MYFFVER < 58000) /* TODO Determine if this is even needed for old versions */ if (av_lockmgr_register(NULL) < 0) { - MOTION_LOG(EMG, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(EMG, TYPE_ALL, SHOW_ERRNO ,_("av_lockmgr_register reset failed on cleanup")); } #endif @@ -1475,7 +1475,7 @@ int movie_open(ctx_movie *movie) if (movie->passthrough) { retcd = movie_passthru_open(movie); if (retcd < 0 ) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not setup passthrough!")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not setup passthrough!")); movie_free_context(movie); return -1; } @@ -1484,7 +1484,7 @@ int movie_open(ctx_movie *movie) movie->oc = avformat_alloc_context(); if (!movie->oc) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not allocate output context")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not allocate output context")); movie_free_context(movie); return -1; } @@ -1495,32 +1495,32 @@ int movie_open(ctx_movie *movie) retcd = movie_get_oformat(movie); if (retcd < 0 ) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get codec!")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get codec!")); movie_free_context(movie); return -1; } retcd = movie_set_codec(movie); if (retcd < 0 ) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Failed to allocate codec!")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Failed to allocate codec!")); return -1; } retcd = movie_set_stream(movie); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the stream")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the stream")); return -1; } retcd = movie_set_picture(movie); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the stream")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the stream")); return -1; } retcd = movie_set_outputfile(movie); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the stream")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the stream")); return -1; } @@ -1552,7 +1552,7 @@ void movie_close(ctx_movie *movie) clock_gettime(CLOCK_MONOTONIC, &movie->cb_st_ts); if (movie_flush_codec(movie) < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error flushing codec")); + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error flushing codec")); } if (movie->oc != NULL) { if (movie->oc->pb != NULL) { @@ -1611,7 +1611,7 @@ int movie_put_image(ctx_movie *movie, ctx_image_data *img_data, const struct tim retcd = movie_put_frame(movie, ts1); cnt++; if (cnt > 50) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Excessive attempts to clear buffered packet")); retcd = -1; } @@ -1619,7 +1619,7 @@ int movie_put_image(ctx_movie *movie, ctx_image_data *img_data, const struct tim //non timelapse buffered is ok if (retcd == -2) { retcd = 0; - MOTION_LOG(DBG, TYPE_ENCODER, NO_ERRNO, _("Buffered packet")); + MOTPLS_LOG(DBG, TYPE_ENCODER, NO_ERRNO, _("Buffered packet")); } } @@ -1655,7 +1655,7 @@ static const char* movie_init_container(ctx_dev *cam) int codenbr; if (cam->conf->movie_container == "test") { - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO, "Running test of the various output formats."); + MOTPLS_LOG(NTC, TYPE_ENCODER, NO_ERRNO, "Running test of the various output formats."); codenbr = cam->event_nr % 10; if (codenbr == 1) { return "flv"; @@ -1718,7 +1718,7 @@ int movie_init_norm(ctx_dev *cam, struct timespec *ts1) retcd = snprintf(cam->movie_norm->movie_nm, len, "%s", tmp); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error setting file name")); return -1; } @@ -1791,7 +1791,7 @@ int movie_init_motion(ctx_dev *cam, struct timespec *ts1) retcd = snprintf(cam->movie_norm->movie_nm, len, "%s", tmp); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error setting file name")); return -1; } @@ -1852,7 +1852,7 @@ int movie_init_timelapse(ctx_dev *cam, struct timespec *ts1) retcd = snprintf(cam->movie_norm->movie_nm, len, "%s", tmp); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Error setting timelapse file name %s"), tmp); } @@ -1880,15 +1880,15 @@ int movie_init_timelapse(ctx_dev *cam, struct timespec *ts1) cam->movie_timelapse->netcam_data = NULL; if (cam->conf->timelapse_container == "mpg") { - MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Timelapse using mpg container.")); - MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Events will be appended to file")); + MOTPLS_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Timelapse using mpg container.")); + MOTPLS_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Events will be appended to file")); cam->movie_timelapse->tlapse = TIMELAPSE_APPEND; cam->movie_timelapse->container_name = container_mpg; retcd = movie_open(cam->movie_timelapse); } else { - MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Timelapse using mkv container.")); - MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Events will be trigger new files")); + MOTPLS_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Timelapse using mkv container.")); + MOTPLS_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Events will be trigger new files")); cam->movie_timelapse->tlapse = TIMELAPSE_NEW; cam->movie_timelapse->container_name = container_mkv; diff --git a/src/netcam.cpp b/src/netcam.cpp index 6373e87f..d740d3e2 100644 --- a/src/netcam.cpp +++ b/src/netcam.cpp @@ -123,7 +123,7 @@ static char *netcam_url_match(regmatch_t m, const char *input) static void netcam_url_invalid(ctx_url *parse_url) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO,_("Invalid URL. Can not parse values.")); + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO,_("Invalid URL. Can not parse values.")); parse_url->host =(char*) malloc(5); parse_url->service =(char*) malloc(5); @@ -170,7 +170,7 @@ static void netcam_url_parse(ctx_url *parse_url, const char *text_url) * it is needed */ - //MOTION_LOG(DBG, TYPE_NETCAM, NO_ERRNO, "Entry netcam_url_parse data %s",text_url); + //MOTPLS_LOG(DBG, TYPE_NETCAM, NO_ERRNO, "Entry netcam_url_parse data %s",text_url); memset(parse_url, 0, sizeof(ctx_url)); /* @@ -184,7 +184,7 @@ static void netcam_url_parse(ctx_url *parse_url, const char *text_url) if (regexec(&pattbuf, text_url, 10, matches, 0) != REG_NOMATCH) { for (i = 0; i < 10; i++) { if ((s = netcam_url_match(matches[i], text_url)) != NULL) { - //MOTION_LOG(DBG, TYPE_NETCAM, NO_ERRNO, "Parse case %d data %s", i, s); + //MOTPLS_LOG(DBG, TYPE_NETCAM, NO_ERRNO, "Parse case %d data %s", i, s); switch (i) { case 1: parse_url->service = s; @@ -226,7 +226,7 @@ static void netcam_url_parse(ctx_url *parse_url, const char *text_url) } else if (mystreq(parse_url->service, "rtsp")) { parse_url->port = 554; } - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO, _("Using port number %d"),parse_url->port); + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO, _("Using port number %d"),parse_url->port); } regfree(&pattbuf); @@ -385,7 +385,7 @@ static void netcam_pktarray_resize(ctx_dev *cam, bool is_highres) netcam->pktarray = tmp; netcam->pktarray_size = newsize; - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Resized packet array to %d"), netcam->cameratype,newsize); } pthread_mutex_unlock(&netcam->mutex_pktarray); @@ -422,7 +422,7 @@ static void netcam_pktarray_add(ctx_netcam *netcam) retcd = mycopy_packet(netcam->pktarray[indx_next].packet, netcam->packet_recv); if ((netcam->interrupted) || (retcd < 0)) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: av_copy_packet: %s ,Interrupt: %s") ,netcam->cameratype ,errstr, netcam->interrupted ? _("true"):_("false")); @@ -453,13 +453,13 @@ static int netcam_decode_sw(ctx_netcam *netcam) if (retcd == AVERROR(EAGAIN)) { retcd = 0; } else if (retcd == AVERROR_INVALIDDATA) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Ignoring packet with invalid data") ,netcam->cameratype); retcd = 0; } else if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Rec frame error: %s") ,netcam->cameratype, errstr); retcd = -1; @@ -490,13 +490,13 @@ static int netcam_decode_vaapi(ctx_netcam *netcam) if (retcd == AVERROR(EAGAIN)) { retcd = 0; } else if (retcd == AVERROR_INVALIDDATA) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Ignoring packet with invalid data") ,netcam->cameratype); retcd = 0; } else if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Rec frame error: %s") ,netcam->cameratype, errstr); retcd = -1; @@ -509,7 +509,7 @@ static int netcam_decode_vaapi(ctx_netcam *netcam) netcam->frame->format=AV_PIX_FMT_YUV420P; retcd = av_hwframe_transfer_data(netcam->frame, hw_frame, 0); if (retcd < 0) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Error transferring HW decoded to system memory") ,netcam->cameratype); return -1; @@ -548,20 +548,20 @@ static int netcam_decode_video(ctx_netcam *netcam) retcd = avcodec_send_packet(netcam->codec_context, netcam->packet_recv); if ((netcam->interrupted) || (netcam->finish)) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Interrupted or finish on send") ,netcam->cameratype); return -1; } if (retcd == AVERROR_INVALIDDATA) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Send ignoring packet with invalid data") ,netcam->cameratype); return 0; } if (retcd < 0 && retcd != AVERROR_EOF) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Error sending packet to codec: %s") ,netcam->cameratype, errstr); return -1; @@ -592,13 +592,13 @@ static int netcam_decode_video(ctx_netcam *netcam) return -1; } if (retcd == AVERROR_INVALIDDATA) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO, _("Ignoring packet with invalid data")); + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO, _("Ignoring packet with invalid data")); return 0; } if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO, _("Error decoding packet: %s"),errstr); + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO, _("Error decoding packet: %s"),errstr); return -1; } @@ -621,7 +621,7 @@ static int netcam_decode_packet(ctx_netcam *netcam) } if (netcam->packet_recv->stream_index == netcam->audio_stream_index) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Error decoding video packet...it is audio") ,netcam->cameratype); } @@ -644,7 +644,7 @@ static int netcam_decode_packet(ctx_netcam *netcam) ,netcam->frame->height ,frame_size); if ((retcd < 0) || (netcam->interrupted)) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Error decoding video packet: Copying to buffer") ,netcam->cameratype); return -1; @@ -663,17 +663,17 @@ static void netcam_hwdecoders(ctx_netcam *netcam) return; } if ((netcam->hw_type == AV_HWDEVICE_TYPE_NONE) && (netcam->first_image)) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: HW Devices: ") , netcam->cameratype); while((netcam->hw_type = av_hwdevice_iterate_types(netcam->hw_type)) != AV_HWDEVICE_TYPE_NONE){ if (netcam->hw_type == AV_HWDEVICE_TYPE_VAAPI) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: %s (available)") , netcam->cameratype , av_hwdevice_get_type_name(netcam->hw_type)); } else { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: %s (not implemented)") , netcam->cameratype , av_hwdevice_get_type_name(netcam->hw_type)); @@ -700,7 +700,7 @@ static enum AVPixelFormat netcam_getfmt_vaapi(AVCodecContext *avctx, const enum } } - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO,_("Failed to get vaapi pix format")); + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO,_("Failed to get vaapi pix format")); return AV_PIX_FMT_NONE; #else (void)avctx; @@ -715,24 +715,24 @@ static void netcam_decoder_error(ctx_netcam *netcam, int retcd, const char* fnc_ int indx; if (netcam->interrupted) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Interrupted"),netcam->cameratype); } else { if (retcd < 0) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: %s: %s"),netcam->cameratype,fnc_nm, errstr); } else { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: %s: Failed"), netcam->cameratype,fnc_nm); } } if (mystrne(netcam->decoder_nm,"NULL")) { - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("%s: Decoder %s did not work.") ,netcam->cameratype, netcam->decoder_nm); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("%s: Ignoring and removing the user requested decoder %s") ,netcam->cameratype, netcam->decoder_nm); @@ -763,12 +763,12 @@ static int netcam_init_vaapi(ctx_netcam *netcam) #if ( MYFFVER >= 57083) int retcd; - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Initializing vaapi decoder"),netcam->cameratype); netcam->hw_type = av_hwdevice_find_type_by_name("vaapi"); if (netcam->hw_type == AV_HWDEVICE_TYPE_NONE) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO,_("%s: Unable to find vaapi hw device") + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO,_("%s: Unable to find vaapi hw device") , netcam->cameratype); netcam_decoder_error(netcam, 0, "av_hwdevice"); return -1; @@ -814,7 +814,7 @@ static int netcam_init_swdecoder(ctx_netcam *netcam) #if ( MYFFVER >= 57041) int retcd; - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Initializing decoder"),netcam->cameratype); if (mystrne(netcam->decoder_nm,"NULL")) { @@ -822,7 +822,7 @@ static int netcam_init_swdecoder(ctx_netcam *netcam) if (netcam->decoder == NULL) { netcam_decoder_error(netcam, 0, "avcodec_find_decoder_by_name"); } else { - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO,_("%s: Using decoder %s") + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO,_("%s: Using decoder %s") ,netcam->cameratype, netcam->decoder_nm); } } @@ -913,7 +913,7 @@ static int netcam_open_codec(ctx_netcam *netcam) return -1; } - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Decoder opened"),netcam->cameratype); return 0; @@ -972,7 +972,7 @@ static int netcam_interrupt(void *ctx) } else if (netcam->status == NETCAM_READINGIMAGE) { clock_gettime(CLOCK_MONOTONIC, &netcam->interruptcurrenttime); if ((netcam->interruptcurrenttime.tv_sec - netcam->interruptstarttime.tv_sec ) > netcam->interruptduration){ - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Camera reading (%s) timed out") , netcam->cameratype, netcam->camera_name); netcam->interrupted = true; @@ -988,7 +988,7 @@ static int netcam_interrupt(void *ctx) */ clock_gettime(CLOCK_MONOTONIC, &netcam->interruptcurrenttime); if ((netcam->interruptcurrenttime.tv_sec - netcam->interruptstarttime.tv_sec ) > netcam->interruptduration){ - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Camera (%s) timed out") , netcam->cameratype, netcam->camera_name); netcam->interrupted = true; @@ -1012,7 +1012,7 @@ static int netcam_open_sws(ctx_netcam *netcam) netcam->swsframe_in = myframe_alloc(); if (netcam->swsframe_in == NULL) { if (netcam->status == NETCAM_NOTCONNECTED) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO , _("%s: Unable to allocate swsframe_in.") , netcam->cameratype); } @@ -1023,7 +1023,7 @@ static int netcam_open_sws(ctx_netcam *netcam) netcam->swsframe_out = myframe_alloc(); if (netcam->swsframe_out == NULL) { if (netcam->status == NETCAM_NOTCONNECTED) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO , _("%s: Unable to allocate swsframe_out.") , netcam->cameratype); } @@ -1036,7 +1036,7 @@ static int netcam_open_sws(ctx_netcam *netcam) * also if the format sent by the camera is not YUV420. */ if (netcam_check_pixfmt(netcam) != 0) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO , _("%s: Pixel format %d will be converted.") , netcam->cameratype, netcam->frame->format); } @@ -1051,7 +1051,7 @@ static int netcam_open_sws(ctx_netcam *netcam) ,SWS_BICUBIC,NULL,NULL,NULL); if (netcam->swsctx == NULL) { if (netcam->status == NETCAM_NOTCONNECTED) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO , _("%s: Unable to allocate scaling context.") , netcam->cameratype); } @@ -1065,7 +1065,7 @@ static int netcam_open_sws(ctx_netcam *netcam) ,netcam->imgsize.height); if (netcam->swsframe_size <= 0) { if (netcam->status == NETCAM_NOTCONNECTED) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO , _("%s: Error determining size of frame out") , netcam->cameratype); } @@ -1107,7 +1107,7 @@ static int netcam_resize(ctx_netcam *netcam) if (retcd < 0) { if (netcam->status == NETCAM_NOTCONNECTED) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Error allocating picture in: %s") , netcam->cameratype, errstr); } @@ -1126,7 +1126,7 @@ static int netcam_resize(ctx_netcam *netcam) if (retcd < 0) { if (netcam->status == NETCAM_NOTCONNECTED) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Error allocating picture out: %s") , netcam->cameratype, errstr); } @@ -1145,7 +1145,7 @@ static int netcam_resize(ctx_netcam *netcam) if (retcd < 0) { if (netcam->status == NETCAM_NOTCONNECTED) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Error resizing/reformatting: %s") , netcam->cameratype, errstr); } @@ -1163,7 +1163,7 @@ static int netcam_resize(ctx_netcam *netcam) if (retcd < 0) { if (netcam->status == NETCAM_NOTCONNECTED) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Error putting frame into output buffer: %s") , netcam->cameratype, errstr); } @@ -1210,12 +1210,12 @@ static int netcam_read_image(ctx_netcam *netcam) } if ((netcam->interrupted) || (errcnt > 1)) { if (netcam->interrupted) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Interrupted") ,netcam->cameratype); } else { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: av_read_frame: %s" ) ,netcam->cameratype,errstr); } @@ -1303,7 +1303,7 @@ static int netcam_read_image(ctx_netcam *netcam) if (netcam->capture_rate < 1) { netcam->capture_rate = netcam->src_fps + 1; if (netcam->pts_adj == false) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: capture_rate not specified in netcam_params. Using %d") ,netcam->cameratype,netcam->capture_rate); } @@ -1312,7 +1312,7 @@ static int netcam_read_image(ctx_netcam *netcam) if (netcam->capture_rate < 1) { netcam->capture_rate = netcam->conf->framerate; if (netcam->pts_adj == false) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: capture_rate not specified in netcam_params. Using framerate %d") ,netcam->cameratype, netcam->capture_rate); } @@ -1336,16 +1336,16 @@ static int netcam_ntc(ctx_netcam *netcam) if ((netcam->imgsize.width != netcam->frame->width) || (netcam->imgsize.height != netcam->frame->height)) { - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO, ""); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO, "******************************************************"); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO, _("The network camera is sending pictures at %dx%d") + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO, ""); + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO, "******************************************************"); + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO, _("The network camera is sending pictures at %dx%d") , netcam->frame->width,netcam->frame->height); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO, _("resolution but config is %dx%d. If possible change") + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO, _("resolution but config is %dx%d. If possible change") , netcam->imgsize.width,netcam->imgsize.height); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO, _("the netcam or config so that the image height and")); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO, _("width are the same to lower the CPU usage.")); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO, "******************************************************"); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO, ""); + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO, _("the netcam or config so that the image height and")); + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO, _("width are the same to lower the CPU usage.")); + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO, "******************************************************"); + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO, ""); } return 0; @@ -1368,14 +1368,14 @@ static void netcam_set_options(ctx_netcam *netcam) if (mystreq(netcam->service, "rtsp") || mystreq(netcam->service, "rtsps") || mystreq(netcam->service, "rtmp")) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("%s: Setting rtsp/rtmp") + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("%s: Setting rtsp/rtmp") ,netcam->cameratype); util_parms_add_default(netcam->params,"rtsp_transport","tcp"); //util_parms_add_default(netcam->params,"allowed_media_types", "video"); } else if (mystreq(netcam->service, "http") || mystreq(netcam->service, "https")) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Setting input_format mjpeg"),netcam->cameratype); netcam->format_context->iformat = av_find_input_format("mjpeg"); util_parms_add_default(netcam->params,"reconnect_on_network_error","1"); @@ -1385,7 +1385,7 @@ static void netcam_set_options(ctx_netcam *netcam) util_parms_add_default(netcam->params,"reconnect_streamed","1"); } else if (mystreq(netcam->service, "v4l2")) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Setting input_format video4linux2"),netcam->cameratype); netcam->format_context->iformat = av_find_input_format("video4linux2"); @@ -1400,11 +1400,11 @@ static void netcam_set_options(ctx_netcam *netcam) netcam->interruptduration = 55; } else if (mystreq(netcam->service, "file")) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Setting up movie file"),netcam->cameratype); } else { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("%s: Setting up %s") + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("%s: Setting up %s") ,netcam->cameratype, netcam->service); } @@ -1419,7 +1419,7 @@ static void netcam_set_options(ctx_netcam *netcam) , netcam->params->params_array[indx].param_value , 0); if (netcam->status == NETCAM_NOTCONNECTED) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("%s: option: %s = %s") + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("%s: option: %s = %s") ,netcam->cameratype ,netcam->params->params_array[indx].param_name ,netcam->params->params_array[indx].param_value @@ -1453,22 +1453,22 @@ static void netcam_set_path (ctx_dev *cam, ctx_netcam *netcam ) } else if (url.userpass != NULL) { retcd = snprintf(userpass,PATH_MAX,"%s",url.userpass); if ((retcd <0) || (retcd>=PATH_MAX)) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("Error getting userpass")); + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO,_("Error getting userpass")); } } if (mystreq(url.service, "v4l2")) { netcam->path =(char*) mymalloc(strlen(url.path) + 1); sprintf(netcam->path, "%s",url.path); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("Setting up v4l2")); } else if (mystreq(url.service, "file")) { netcam->path =(char*) mymalloc(strlen(url.path) + 1); sprintf(netcam->path, "%s",url.path); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("Setting up file")); } else { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("Setting up %s "),url.service); if (userpass != NULL) { netcam->path =(char*) mymalloc(strlen(url.service) + 3 + strlen(userpass) @@ -1517,7 +1517,7 @@ static void netcam_set_parms (ctx_dev *cam, ctx_netcam *netcam ) util_parms_parse(netcam->params, cam->conf->netcam_params); } - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Setting up camera."),netcam->cameratype); netcam->status = NETCAM_NOTCONNECTED; @@ -1594,19 +1594,19 @@ static void netcam_set_dimensions (ctx_dev *cam) cam->imgs.size_high = 0; if (cam->conf->width % 8) { - MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(CRT, TYPE_NETCAM, NO_ERRNO ,_("Image width (%d) requested is not modulo 8.") , cam->conf->width); cam->conf->width = cam->conf->width - (cam->conf->width % 8) + 8; - MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(CRT, TYPE_NETCAM, NO_ERRNO ,_("%s: Adjusting width to next higher multiple of 8 (%d).") , cam->conf->width); } if (cam->conf->height % 8) { - MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(CRT, TYPE_NETCAM, NO_ERRNO ,_("Image height (%d) requested is not modulo 8."), cam->conf->height); cam->conf->height = cam->conf->height - (cam->conf->height % 8) + 8; - MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(CRT, TYPE_NETCAM, NO_ERRNO ,_("Adjusting height to next higher multiple of 8 (%d)."), cam->conf->height); } @@ -1637,7 +1637,7 @@ static int netcam_copy_stream(ctx_netcam *netcam) stream_in = netcam->format_context->streams[indx]; retcd = avcodec_parameters_copy(transfer_stream->codecpar, stream_in->codecpar); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Unable to copy codec parameters") , netcam->cameratype); pthread_mutex_unlock(&netcam->mutex_transfer); @@ -1649,12 +1649,12 @@ static int netcam_copy_stream(ctx_netcam *netcam) } pthread_mutex_unlock(&netcam->mutex_transfer); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO, _("Stream copied for pass-through")); + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO, _("Stream copied for pass-through")); return 0; #else /* This is disabled in the mycheck_passthrough but we need it here for compiling */ if (netcam != NULL) { - MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, _("ffmpeg too old")); + MOTPLS_LOG(INF, TYPE_ENCODER, NO_ERRNO, _("ffmpeg too old")); } return -1; #endif @@ -1673,7 +1673,7 @@ static int netcam_open_context(ctx_netcam *netcam) if (netcam->path == NULL) { if (netcam->status == NETCAM_NOTCONNECTED) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, _("Null path passed to connect")); + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO, _("Null path passed to connect")); } return -1; } @@ -1694,7 +1694,7 @@ static int netcam_open_context(ctx_netcam *netcam) if ((retcd < 0) || (netcam->interrupted) || (netcam->finish) ) { if (netcam->status == NETCAM_NOTCONNECTED) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Unable to open camera(%s): %s") , netcam->cameratype, netcam->camera_name, errstr); } @@ -1703,7 +1703,7 @@ static int netcam_open_context(ctx_netcam *netcam) return -1; } av_dict_free(&netcam->opts); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Opened camera(%s)"), netcam->cameratype, netcam->camera_name); @@ -1712,7 +1712,7 @@ static int netcam_open_context(ctx_netcam *netcam) if ((retcd < 0) || (netcam->interrupted) || (netcam->finish) ) { if (netcam->status == NETCAM_NOTCONNECTED) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Unable to find stream info: %s") ,netcam->cameratype, errstr); } @@ -1731,12 +1731,12 @@ static int netcam_open_context(ctx_netcam *netcam) if ((retcd < 0) || (netcam->interrupted) || (netcam->finish) ) { if (netcam->status == NETCAM_NOTCONNECTED) { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Unable to open codec context: %s") ,netcam->cameratype, errstr); } else { av_strerror(retcd, errstr, sizeof(errstr)); - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Connected and unable to open codec context: %s") ,netcam->cameratype, errstr); } @@ -1746,7 +1746,7 @@ static int netcam_open_context(ctx_netcam *netcam) if (netcam->codec_context->width <= 0 || netcam->codec_context->height <= 0) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Camera image size is invalid"),netcam->cameratype); netcam_close_context(netcam); return -1; @@ -1760,7 +1760,7 @@ static int netcam_open_context(ctx_netcam *netcam) netcam->frame = myframe_alloc(); if (netcam->frame == NULL) { if (netcam->status == NETCAM_NOTCONNECTED) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Unable to allocate frame."),netcam->cameratype); } netcam_close_context(netcam); @@ -1771,7 +1771,7 @@ static int netcam_open_context(ctx_netcam *netcam) retcd = netcam_copy_stream(netcam); if ((retcd < 0) || (netcam->interrupted)) { if (netcam->status == NETCAM_NOTCONNECTED) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Failed to copy stream for pass-through.") ,netcam->cameratype); } @@ -1783,7 +1783,7 @@ static int netcam_open_context(ctx_netcam *netcam) retcd = netcam_read_image(netcam); if ((retcd < 0) || (netcam->interrupted)) { if (netcam->status == NETCAM_NOTCONNECTED) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Failed to read first image"),netcam->cameratype); } netcam_close_context(netcam); @@ -1820,29 +1820,29 @@ static int netcam_connect(ctx_netcam *netcam) if (!netcam->first_image) { netcam->status = NETCAM_CONNECTED; - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("%s: Camera (%s) connected") , netcam->cameratype,netcam->camera_name); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO , _("%s: Netcam capture FPS is %d.") , netcam->cameratype, netcam->capture_rate); if (netcam->src_fps > 0) { - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO , _("%s: Camera source is %d FPS") , netcam->cameratype, netcam->src_fps); } else { - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO , _("%s: Unable to determine the camera source FPS.") , netcam->cameratype); } if (netcam->capture_rate < netcam->src_fps) { - MOTION_LOG(WRN, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_NETCAM, NO_ERRNO , _("%s: Capture FPS less than camera FPS. Decoding errors will occur.") , netcam->cameratype); - MOTION_LOG(WRN, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_NETCAM, NO_ERRNO , _("%s: Capture FPS should be greater than camera FPS.") , netcam->cameratype); } @@ -1853,7 +1853,7 @@ static int netcam_connect(ctx_netcam *netcam) * for the audio stream. The technically correct process is that our wait timer in * the handler is only triggered when the last packet is a video stream */ - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: An audio stream was detected. Capture_rate increased to compensate.") ,netcam->cameratype); } @@ -1944,7 +1944,7 @@ static void netcam_handler_reconnect(ctx_netcam *netcam) if ((netcam->status == NETCAM_CONNECTED) || (netcam->status == NETCAM_READINGIMAGE)) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: Reconnecting with camera...."),netcam->cameratype); } netcam->status = NETCAM_RECONNECTING; @@ -1973,16 +1973,16 @@ static void netcam_handler_reconnect(ctx_netcam *netcam) if (netcam->reconnect_count < 100) { netcam->reconnect_count++; } else if ((netcam->reconnect_count >= 100) && (netcam->reconnect_count <= 199)) { - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("%s: Camera did not reconnect."), netcam->cameratype); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("%s: Checking for camera every 10 seconds."),netcam->cameratype); netcam->reconnect_count++; SLEEP(10,0); } else if (netcam->reconnect_count >= 200) { - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("%s: Camera did not reconnect."), netcam->cameratype); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("%s: Checking for camera every 10 minutes."),netcam->cameratype); SLEEP(600,0); } else { @@ -2006,7 +2006,7 @@ static void *netcam_handler(void *arg) pthread_setspecific(tls_key_threadnr, (void *)((unsigned long)netcam->threadnbr)); - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("%s: Camera handler thread [%d] started") ,netcam->cameratype, netcam->threadnbr); @@ -2029,7 +2029,7 @@ static void *netcam_handler(void *arg) } } - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Loop finished."),netcam->cameratype); netcam_shutdown(netcam); @@ -2038,7 +2038,7 @@ static void *netcam_handler(void *arg) netcam->motapp->threads_running--; pthread_mutex_unlock(&netcam->motapp->global_lock); - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Exiting"),netcam->cameratype); netcam->handler_finished = true; @@ -2060,7 +2060,7 @@ static int netcam_start_handler(ctx_netcam *netcam) retcd = pthread_create(&netcam->thread_id, &handler_attribute, &netcam_handler, netcam); if (retcd < 0) { - MOTION_LOG(ALR, TYPE_NETCAM, SHOW_ERRNO + MOTPLS_LOG(ALR, TYPE_NETCAM, SHOW_ERRNO ,_("%s: Error starting handler thread"),netcam->cameratype); pthread_attr_destroy(&handler_attribute); return -1; @@ -2081,7 +2081,7 @@ static int netcam_start_handler(ctx_netcam *netcam) pthread_mutex_unlock(&netcam->mutex); if (wait_counter > 0 ) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Waiting for first image from the handler."),netcam->cameratype); SLEEP(0,5000000); wait_counter--; @@ -2113,7 +2113,7 @@ void netcam_cleanup(ctx_dev *cam) } if (netcam) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("%s: Shutting down network camera."),netcam->cameratype); netcam->finish = true; netcam->interruptduration = 0; @@ -2123,7 +2123,7 @@ void netcam_cleanup(ctx_dev *cam) wait_counter++; } if (!netcam->handler_finished) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("%s: No response from handler thread."),netcam->cameratype); /* Last resort. Kill the thread.*/ pthread_cancel(netcam->thread_id); @@ -2141,10 +2141,10 @@ void netcam_cleanup(ctx_dev *cam) myfree(&netcam); if (indx_cam == 1) { - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("Norm: Shut down complete.")); } else { - MOTION_LOG(NTC, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_NETCAM, NO_ERRNO ,_("High: Shut down complete.")); } } @@ -2161,7 +2161,7 @@ void netcam_start(ctx_dev *cam) int indx_cam, indx_max; ctx_netcam *netcam; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening Netcam")); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening Netcam")); cam->netcam = NULL; cam->netcam_high = NULL; @@ -2180,7 +2180,7 @@ void netcam_start(ctx_dev *cam) if (indx_cam == 1) { cam->netcam = netcam_new_context(); if (cam->netcam == NULL) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("unable to create rtsp context")); netcam_cleanup(cam); return; @@ -2190,7 +2190,7 @@ void netcam_start(ctx_dev *cam) } else { cam->netcam_high = netcam_new_context(); if (cam->netcam_high == NULL) { - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_NETCAM, NO_ERRNO ,_("unable to create rtsp high context")); netcam_cleanup(cam); return; @@ -2206,7 +2206,7 @@ void netcam_start(ctx_dev *cam) return; } if (netcam_read_image(netcam) != 0) { - MOTION_LOG(CRT, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(CRT, TYPE_NETCAM, NO_ERRNO ,_("Failed trying to read first image")); netcam->status = NETCAM_NOTCONNECTED; netcam_cleanup(cam); diff --git a/src/picture.cpp b/src/picture.cpp index 2d6235eb..8710720c 100644 --- a/src/picture.cpp +++ b/src/picture.cpp @@ -53,7 +53,7 @@ static void pic_webp_exif(WebPMux* webp_mux, ctx_dev *cam, WebPMuxError err = WebPMuxSetChunk(webp_mux, "EXIF", &webp_exif, 1); if (err != WEBP_MUX_OK) { - MOTION_LOG(ERR, TYPE_CORE, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_CORE, NO_ERRNO , _("Unable to set set EXIF to webp chunk")); } free(exif); @@ -71,14 +71,14 @@ static void pic_save_webp(FILE *fp, unsigned char *image, int width, int height, /* Create a config present and check for compatible library version */ WebPConfig webp_config; if (!WebPConfigPreset(&webp_config, WEBP_PRESET_DEFAULT, (float) quality)) { - MOTION_LOG(ERR, TYPE_CORE, NO_ERRNO, _("libwebp version error")); + MOTPLS_LOG(ERR, TYPE_CORE, NO_ERRNO, _("libwebp version error")); return; } /* Create the input data structure and check for compatible library version */ WebPPicture webp_image; if (!WebPPictureInit(&webp_image)) { - MOTION_LOG(ERR, TYPE_CORE, NO_ERRNO,_("libwebp version error")); + MOTPLS_LOG(ERR, TYPE_CORE, NO_ERRNO,_("libwebp version error")); return; } @@ -86,7 +86,7 @@ static void pic_save_webp(FILE *fp, unsigned char *image, int width, int height, webp_image.width = width; webp_image.height = height; if (!WebPPictureAlloc(&webp_image)) { - MOTION_LOG(ERR, TYPE_CORE, NO_ERRNO,_("libwebp image buffer allocation error")); + MOTPLS_LOG(ERR, TYPE_CORE, NO_ERRNO,_("libwebp image buffer allocation error")); return; } @@ -103,7 +103,7 @@ static void pic_save_webp(FILE *fp, unsigned char *image, int width, int height, /* Encode the YUV image as webp */ if (!WebPEncode(&webp_config, &webp_image)) { - MOTION_LOG(WRN, TYPE_CORE, NO_ERRNO,_("libwebp image compression error")); + MOTPLS_LOG(WRN, TYPE_CORE, NO_ERRNO,_("libwebp image compression error")); } /* A bitstream object is needed for the muxing proces */ WebPData webp_bitstream; @@ -118,12 +118,12 @@ static void pic_save_webp(FILE *fp, unsigned char *image, int width, int height, WebPData webp_output; WebPMuxError err = WebPMuxAssemble(webp_mux, &webp_output); if (err != WEBP_MUX_OK) { - MOTION_LOG(ERR, TYPE_CORE, NO_ERRNO,_("unable to assemble webp image")); + MOTPLS_LOG(ERR, TYPE_CORE, NO_ERRNO,_("unable to assemble webp image")); } /* Write the webp final bitstream to the file */ if (fwrite(webp_output.bytes, sizeof(uint8_t), webp_output.size, fp) != webp_output.size) { - MOTION_LOG(ERR, TYPE_CORE, NO_ERRNO,_("unable to save webp image to file")); + MOTPLS_LOG(ERR, TYPE_CORE, NO_ERRNO,_("unable to save webp image to file")); } #if WEBP_ENCODER_ABI_VERSION > 0x0202 @@ -310,7 +310,7 @@ void pic_save_norm(ctx_dev *cam, char *file, unsigned char *image, int ftype) if (!picture) { /* Report to syslog - suggest solution if the problem is access rights to target dir. */ if (errno == EACCES) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("Can't write picture to file %s - check access rights to target directory\n" "Thread is going to finish due to this fatal error"), file); cam->finish_dev = true; @@ -318,7 +318,7 @@ void pic_save_norm(ctx_dev *cam, char *file, unsigned char *image, int ftype) return; } else { /* If target dir is temporarily unavailable we may survive. */ - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("Can't write picture to file %s"), file); return; } @@ -345,7 +345,7 @@ void pic_save_roi(ctx_dev *cam, char *file, unsigned char *image) picture = myfopen(file, "wbe"); if (!picture) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("Can't write picture to file %s"), file); return; } @@ -383,12 +383,12 @@ unsigned char *pic_load_pgm(FILE *picture, int width, int height) line[255] = 0; if (!fgets(line, 255, picture)) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO,_("Could not read from pgm file")); + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO,_("Could not read from pgm file")); return NULL; } if (strncmp(line, "P5", 2)) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("This is not a pgm file, starts with '%s'"), line); return NULL; } @@ -402,7 +402,7 @@ unsigned char *pic_load_pgm(FILE *picture, int width, int height) /* Read image size */ if (sscanf(line, "%d %d", &mask_width, &mask_height) != 2) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("Failed reading size in pgm file")); return NULL; } @@ -415,7 +415,7 @@ unsigned char *pic_load_pgm(FILE *picture, int width, int height) } if (sscanf(line, "%d", &maxval) != 1) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("Failed reading maximum value in pgm file")); return NULL; } @@ -429,7 +429,7 @@ unsigned char *pic_load_pgm(FILE *picture, int width, int height) for (y = 0; y < mask_height; y++) { if ((int)fread(&image[y * mask_width], 1, mask_width, picture) != mask_width) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO, "Failed reading image data from pgm file"); + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO, "Failed reading image data from pgm file"); } for (x = 0; x < mask_width; x++) { @@ -440,9 +440,9 @@ unsigned char *pic_load_pgm(FILE *picture, int width, int height) /* Resize mask if required */ if (mask_width != width || mask_height != height) { - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO ,_("The mask file specified is not the same size as image from camera.")); - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO ,_("Attempting to resize mask image from %dx%d to %dx%d") ,mask_width, mask_height, width, height); @@ -472,12 +472,12 @@ static void pic_write_mask(ctx_dev *cam, const char *file) if (!picture) { /* Report to syslog - suggest solution if the problem is access rights to target dir. */ if (errno == EACCES) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("can't write mask file %s - check access rights to target directory") ,file); } else { /* If target dir is temporarily unavailable we may survive. */ - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("can't write mask file %s"), file); } return; @@ -491,14 +491,14 @@ static void pic_write_mask(ctx_dev *cam, const char *file) /* Write pgm image data at once. */ if ((int)fwrite(cam->imgs.image_motion.image_norm, cam->conf->width, cam->conf->height, picture) != cam->conf->height) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("Failed writing default mask as pgm file")); return; } myfclose(picture); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO ,_("Creating empty mask %s\nPlease edit this file and " "re-run motion to enable mask feature"), cam->conf->mask_file.c_str()); } @@ -575,7 +575,7 @@ void pic_init_privacy(ctx_dev *cam) if (cam->conf->mask_privacy != "") { if ((picture = myfopen(cam->conf->mask_privacy.c_str(), "rbe"))) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, _("Opening privacy mask file")); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, _("Opening privacy mask file")); /* * NOTE: The mask is expected to have the output dimensions. I.e., the mask * applies to the already rotated image, not the capture image. Thus, use @@ -586,7 +586,7 @@ void pic_init_privacy(ctx_dev *cam) /* We only need the "or" mask for the U & V chrominance area. */ cam->imgs.mask_privacy_uv =(unsigned char*) mymalloc((cam->imgs.height * cam->imgs.width) / 2); if (cam->imgs.size_high > 0) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO ,_("Opening high resolution privacy mask file")); rewind(picture); cam->imgs.mask_privacy_high = pic_load_pgm(picture, cam->imgs.width_high, cam->imgs.height_high); @@ -595,17 +595,17 @@ void pic_init_privacy(ctx_dev *cam) myfclose(picture); } else { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("Error opening mask file %s"), cam->conf->mask_privacy.c_str()); /* Try to write an empty mask file to make it easier for the user to edit it */ pic_write_mask(cam, cam->conf->mask_privacy.c_str() ); } if (!cam->imgs.mask_privacy) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO ,_("Failed to read mask privacy image. Mask privacy feature disabled.")); } else { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO ,_("Mask privacy file \"%s\" loaded."), cam->conf->mask_privacy.c_str()); indx_img = 1; @@ -680,7 +680,7 @@ void pic_init_mask(ctx_dev *cam) cam->imgs.mask = pic_load_pgm(picture, cam->imgs.width, cam->imgs.height); myfclose(picture); } else { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("Error opening mask file %s") ,cam->conf->mask_file.c_str()); /* @@ -691,10 +691,10 @@ void pic_init_mask(ctx_dev *cam) } if (!cam->imgs.mask) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO ,_("Failed to read mask image. Mask feature disabled.")); } else { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO ,_("Maskfile \"%s\" loaded.") ,cam->conf->mask_file.c_str()); } diff --git a/src/rotate.cpp b/src/rotate.cpp index 95369505..3190cbce 100644 --- a/src/rotate.cpp +++ b/src/rotate.cpp @@ -192,7 +192,7 @@ void rotate_init(ctx_dev *cam) * we have a value that is safe from changes caused by motion-control. */ if ((cam->conf->rotate % 90) > 0) { - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO ,_("Config option \"rotate\" not a multiple of 90: %d") ,cam->conf->rotate); cam->conf->rotate = 0; /* Disable rotation. */ diff --git a/src/sound.cpp b/src/sound.cpp index 72def1e5..4b876665 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -93,8 +93,8 @@ static void snd_edit_alerts(ctx_dev *snd) } if (validids == false) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "Sound alert ids must be unique."); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "Creating new sound alert ids."); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, "Sound alert ids must be unique."); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, "Creating new sound alert ids."); indx = 0; for (it_a0=info->alerts.begin(); it_a0!=info->alerts.end(); it_a0++) { it_a0->alert_id = indx; @@ -109,15 +109,15 @@ static void snd_edit_alerts(ctx_dev *snd) if (it_a0->volume_level < info->vol_min) { info->vol_min = it_a0->volume_level; } - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Sound Alert Parameters:"); - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, " alert_id: %d",it_a0->alert_id); - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, " alert_nm %s",it_a0->alert_nm.c_str()); - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, " freq_low: %.4f",it_a0->freq_low); - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, " freq_high: %.4f",it_a0->freq_high); - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, " volume_count: %d",it_a0->volume_count); - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, " volume_level: %d",it_a0->volume_level); - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, " trigger_threshold: %d",it_a0->trigger_threshold); - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, " trigger_duration: %d",it_a0->trigger_duration); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Sound Alert Parameters:"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, " alert_id: %d",it_a0->alert_id); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, " alert_nm %s",it_a0->alert_nm.c_str()); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, " freq_low: %.4f",it_a0->freq_low); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, " freq_high: %.4f",it_a0->freq_high); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, " volume_count: %d",it_a0->volume_count); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, " volume_level: %d",it_a0->volume_level); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, " trigger_threshold: %d",it_a0->trigger_threshold); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, " trigger_duration: %d",it_a0->trigger_duration); } } @@ -188,7 +188,7 @@ static void snd_load_params(ctx_dev *snd) util_parms_add_default(snd->params,"sample_rate","44100"); for (indx = 0; indx < snd->params->params_count; indx++) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "%s : %s" + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, "%s : %s" , snd->params->params_array[indx].param_name , snd->params->params_array[indx].param_value ); @@ -222,29 +222,29 @@ static void snd_alsa_list_subdev(ctx_dev *snd) ctx_snd_alsa *alsa = snd->snd_alsa; int indx, retcd, cnt; - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Card %i(%s): %s [%s]") + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Card %i(%s): %s [%s]") , alsa->card_id, alsa->device_nm.c_str() , snd_ctl_card_info_get_id(alsa->card_info) , snd_ctl_card_info_get_name(alsa->card_info)); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _(" Device %i (%s,%d): %s [%s]") + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _(" Device %i (%s,%d): %s [%s]") , alsa->device_id, alsa->device_nm.c_str() , alsa->device_id , snd_pcm_info_get_id(alsa->pcm_info) , snd_pcm_info_get_name(alsa->pcm_info)); cnt = (int)snd_pcm_info_get_subdevices_count(alsa->pcm_info); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _(" Subdevices: %i/%i") + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _(" Subdevices: %i/%i") , snd_pcm_info_get_subdevices_avail(alsa->pcm_info),cnt); for (indx=0; indxpcm_info,indx); retcd = snd_ctl_pcm_info(alsa->ctl_hdl, alsa->pcm_info); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("control digital audio playback info (%i): %s") , alsa->card_id, snd_strerror(retcd)); } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _(" Subdevice #%i: %s"), indx , snd_pcm_info_get_subdevice_name(alsa->pcm_info)); } @@ -260,7 +260,7 @@ static void snd_alsa_list_card(ctx_dev *snd) retcd = snd_ctl_card_info(alsa->ctl_hdl, alsa->card_info); if (retcd < 0) { snd_ctl_close(alsa->ctl_hdl); - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("control hardware info (%i): %s") , alsa->card_id, snd_strerror(retcd)); return; @@ -269,7 +269,7 @@ static void snd_alsa_list_card(ctx_dev *snd) alsa->device_id = -1; retcd = snd_ctl_pcm_next_device(alsa->ctl_hdl, &alsa->device_id); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("snd_ctl_pcm_next_device")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("snd_ctl_pcm_next_device")); return; } @@ -281,13 +281,13 @@ static void snd_alsa_list_card(ctx_dev *snd) if (retcd == 0) { snd_alsa_list_subdev(snd); } else if (retcd != -ENOENT){ - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("control digital audio info (%i): %s") , alsa->card_id, snd_strerror(retcd)); } retcd = snd_ctl_pcm_next_device(alsa->ctl_hdl, &alsa->device_id); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("snd_ctl_pcm_next_device")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("snd_ctl_pcm_next_device")); } } @@ -308,7 +308,7 @@ static void snd_alsa_list(ctx_dev *snd) alsa->card_id = -1; retcd = snd_card_next(&alsa->card_id); if ((retcd < 0) || (alsa->card_id == -1)) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("no soundcards found...")); snd->device_status = STATUS_CLOSED; snd->restart_dev = false; @@ -316,7 +316,7 @@ static void snd_alsa_list(ctx_dev *snd) return; } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Devices")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Devices")); while (alsa->card_id >= 0) { alsa->device_nm="hw:"+std::to_string(alsa->card_id); @@ -325,7 +325,7 @@ static void snd_alsa_list(ctx_dev *snd) snd_alsa_list_card(snd); snd_ctl_close(alsa->ctl_hdl); } else { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, _("control open (%i): %s") + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("control open (%i): %s") , alsa->card_id, snd_strerror(retcd)); } snd_card_next(&alsa->card_id); @@ -348,7 +348,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_open(&alsa->pcm_dev , snd->conf->snd_device.c_str(), SND_PCM_STREAM_CAPTURE, 0); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_open device %s (%s)") , snd->conf->snd_device.c_str(), snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -357,7 +357,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_hw_params_malloc(&hw_params); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params_malloc(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -366,7 +366,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_hw_params_any(alsa->pcm_dev, hw_params); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params_any(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -376,7 +376,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_hw_params_set_access(alsa->pcm_dev , hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params_set_access(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -386,7 +386,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_hw_params_set_format(alsa->pcm_dev , hw_params, SND_PCM_FORMAT_S16_LE); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params_set_format(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -396,7 +396,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_hw_params_set_rate_near(alsa->pcm_dev , hw_params, &info->sample_rate, 0); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params_set_rate_near(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -406,7 +406,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_hw_params_set_channels(alsa->pcm_dev , hw_params, info->channels); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params_set_channels(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -416,7 +416,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_hw_params_set_period_size_near(alsa->pcm_dev , hw_params, &frames_per, NULL); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params_set_period_size_near(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -425,7 +425,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_hw_params(alsa->pcm_dev, hw_params); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -436,7 +436,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_prepare(alsa->pcm_dev); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_prepare(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -446,7 +446,7 @@ static void snd_alsa_start(ctx_dev *snd) /* get actual parms selected */ retcd = snd_pcm_hw_params_get_format(hw_params, &actl_sndfmt); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params_get_format(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -455,7 +455,7 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_hw_params_get_rate(hw_params, &actl_rate, NULL); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params_get_rate(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -464,21 +464,21 @@ static void snd_alsa_start(ctx_dev *snd) retcd = snd_pcm_hw_params_get_period_size(hw_params, &frames_per, NULL); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: snd_pcm_hw_params_get_period_size(%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; return; } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Actual rate %hu"), actl_rate); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Actual frames per %lu"), frames_per); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Actual rate %hu"), actl_rate); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Actual frames per %lu"), frames_per); if (actl_sndfmt <= 5) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Sound format 16")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Sound format 16")); } else if (actl_sndfmt <= 9 ) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Sound format 24")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Sound format 24")); } else { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Sound format 32")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Sound format 32")); } /*************************************************************/ @@ -489,7 +489,7 @@ static void snd_alsa_start(ctx_dev *snd) info->buffer = (int16_t*)mymalloc(info->buffer_size * sizeof(int16_t)); memset(info->buffer, 0x00, info->buffer_size * sizeof(int16_t)); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "Started."); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, "Started."); snd->device_status =STATUS_OPENED; } @@ -531,7 +531,7 @@ static void snd_alsa_capture(ctx_dev *snd) retcd = snd_pcm_readi(alsa->pcm_dev, info->buffer, info->frames); if (retcd != info->frames) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("error: read from audio interface failed (%s)") , snd_strerror (retcd)); snd->device_status = STATUS_CLOSED; @@ -579,7 +579,7 @@ static void snd_pulse_init(ctx_dev *snd) , (snd->conf->snd_device=="" ? NULL : snd->conf->snd_device.c_str()) , "motionplus", &specs, NULL, NULL, &errcd); if (snd->snd_pulse->dev == NULL) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Error opening pulse (%s)") , pa_strerror(errcd)); snd->device_status = STATUS_CLOSED; @@ -591,7 +591,7 @@ static void snd_pulse_init(ctx_dev *snd) info->buffer = (int16_t*)mymalloc(info->buffer_size * sizeof(int16_t)); memset(info->buffer, 0x00, info->buffer_size * sizeof(int16_t)); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "Started."); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, "Started."); snd->device_status =STATUS_OPENED; #else @@ -611,7 +611,7 @@ static void snd_pulse_capture(ctx_dev *snd) retcd = pa_simple_read(pulse->dev, info->buffer , info->buffer_size, &errcd); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Error capturing PulseAudio (%s)") , pa_strerror(errcd)); snd->device_status = STATUS_CLOSED; @@ -653,7 +653,7 @@ static void snd_fftw_open(ctx_dev *snd) return; } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO , _("Opening FFTW plan")); fftw->ff_in = (double*) fftw_malloc( @@ -708,7 +708,7 @@ void snd_cleanup(ctx_dev *snd) fftw_free(snd->snd_fftw->ff_in); fftw_free(snd->snd_fftw->ff_out); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "Stopped."); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, "Stopped."); } @@ -724,7 +724,7 @@ static void slp_init(ctx_dev *snd) snd_cleanup(snd); } - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO,_("Initialize")); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO,_("Initialize")); snd_init_values(snd); snd_load_params(snd); @@ -735,7 +735,7 @@ static void slp_init(ctx_dev *snd) } else if (snd->snd_info->source == "pulse") { snd_pulse_init(snd); } else { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO,_("Invalid sound source.")); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO,_("Invalid sound source.")); snd->finish_dev = true; snd->device_status = STATUS_CLOSED; return; @@ -743,7 +743,7 @@ static void slp_init(ctx_dev *snd) snd_fftw_open(snd); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Detecting")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Detecting")); } @@ -790,7 +790,7 @@ static void snd_check_alerts(ctx_dev *snd) freq_value = (snd->snd_fftw->bin_size * pMaxBinIndex * info->channels); if (snd->conf->snd_show) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO , _("Freq: %.4f threshold: %d count: %d maximum: %d") , freq_value, info->vol_min , info->vol_count, info->vol_max); @@ -820,7 +820,7 @@ static void snd_check_alerts(ctx_dev *snd) clock_gettime(CLOCK_MONOTONIC, &it->trigger_time); if (it->trigger_count == it->trigger_threshold) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO , _("Sound Alert %d-%s : level %d count %d max vol %d") , it->alert_id ,it->alert_nm.c_str() , it->volume_level, chkcnt @@ -889,7 +889,7 @@ void *snd_loop(void *arg) snd_check_levels(snd); } - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Capture loop finished")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Capture loop finished")); snd_cleanup(snd); @@ -904,7 +904,7 @@ void *snd_loop(void *arg) delete snd->snd_info; delete snd->snd_pulse; - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Exiting")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Exiting")); pthread_exit(NULL); @@ -920,7 +920,7 @@ void *snd_loop(void *arg) snd->finish_dev = true; snd->running_dev = false; - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Sound detection functionality not supported")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Sound detection functionality not supported")); pthread_exit(NULL); } diff --git a/src/util.cpp b/src/util.cpp index 40ff9f05..91c31231 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -137,7 +137,7 @@ void *mymalloc(size_t nbytes) void *dummy = calloc(nbytes, 1); if (!dummy) { - MOTION_LOG(EMG, TYPE_ALL, SHOW_ERRNO, _("Could not allocate %llu bytes of memory!") + MOTPLS_LOG(EMG, TYPE_ALL, SHOW_ERRNO, _("Could not allocate %llu bytes of memory!") ,(unsigned long long)nbytes); exit(1); } @@ -152,13 +152,13 @@ void *myrealloc(void *ptr, size_t size, const char *desc) if (size == 0) { free(ptr); - MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_ALL, NO_ERRNO ,_("Warning! Function %s tries to resize memoryblock at %p to 0 bytes!") ,desc, ptr); } else { dummy = realloc(ptr, size); if (!dummy) { - MOTION_LOG(EMG, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(EMG, TYPE_ALL, NO_ERRNO ,_("Could not resize memory-block at offset %p to %llu bytes (function %s)!") ,ptr, (unsigned long long)size, desc); exit(1); @@ -192,11 +192,11 @@ int mycreate_path(const char *path) while (indx_pos != std::string::npos) { if (stat(tmp.substr(0, indx_pos + 1).c_str(), &statbuf) != 0) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("Creating %s"), tmp.substr(0, indx_pos + 1).c_str()); retcd = mkdir(tmp.substr(0, indx_pos + 1).c_str(), mode); if (retcd == -1 && errno != EEXIST) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("Problem creating directory %s") , tmp.substr(0, indx_pos + 1).c_str()); return -1; @@ -230,7 +230,7 @@ FILE *myfopen(const char *path, const char *mode) fp = fopen(path, mode); } if (!fp) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO ,_("Error opening file %s with mode %s"), path, mode); return NULL; } @@ -244,7 +244,7 @@ int myfclose(FILE* fh) int rval = fclose(fh); if (rval != 0) { - MOTION_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Error closing file")); + MOTPLS_LOG(ERR, TYPE_ALL, SHOW_ERRNO, _("Error closing file")); } return rval; @@ -337,7 +337,7 @@ static void mystrftime_long (const ctx_dev *cam, // Not a valid modifier keyword. Log the error and ignore. - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, _("invalid format specifier keyword %*.*s"), l, l, word); // Do not let the output buffer empty, or else where to restart the @@ -561,7 +561,7 @@ void mythreadname_set(const char *abbr, int threadnbr, const char *threadname) #elif HAVE_PTHREAD_SETNAME_NP pthread_setname_np(pthread_self(), tname); #else - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO, _("Unable to set thread name %s"), tname); + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO, _("Unable to set thread name %s"), tname); #endif } @@ -587,7 +587,7 @@ bool mycheck_passthrough(ctx_dev *cam) } #else if (cam->movie_passthrough) { - MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("FFMPEG version too old. Disabling pass-through processing.")); } return false; @@ -609,7 +609,7 @@ static void mytranslate_locale_chg(const char *langcd) ++_nl_msg_cat_cntr; #else if (langcd != NULL) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,"No native language support"); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,"No native language support"); } #endif } @@ -627,7 +627,7 @@ void mytranslate_init(void) bind_textdomain_codeset ("motion", "UTF-8"); textdomain ("motion"); - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Language: English")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Language: English")); #else /* Disable native language support */ @@ -644,14 +644,14 @@ char* mytranslate_text(const char *msgid, int setnls) if (setnls == 0) { if (nls_enabled) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Disabling native language support")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Disabling native language support")); } nls_enabled = false; return NULL; } else if (setnls == 1) { if (!nls_enabled) { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Enabling native language support")); + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Enabling native language support")); } nls_enabled = true; return NULL; @@ -827,7 +827,7 @@ static void util_parms_file(ctx_params *params, const char *params_file) std::string line, parm_nm, parm_vl; std::ifstream ifs; - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("parse file: %s"), params_file); chk = 0; for (indx = 0; indx < params->params_count; indx++) { @@ -836,14 +836,14 @@ static void util_parms_file(ctx_params *params, const char *params_file) } } if (chk > 1){ - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO ,_("Only one params_file specification is permitted.")); return; } ifs.open(params_file); if (ifs.is_open() == false) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("params_file not found: %s"), params_file); return; } @@ -866,7 +866,7 @@ static void util_parms_file(ctx_params *params, const char *params_file) } else if ((line != "") && (line.substr(0, 1) != ";") && (line.substr(0, 1) != "#")) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , _("Unable to parse line: %s"), line.c_str()); } } @@ -911,7 +911,7 @@ void util_parms_add(ctx_params *params, const char *parm_nm, const char *parm_va params->params_array[indx].param_value = NULL; } - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO,_("Parsed: >%s< >%s<") + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO,_("Parsed: >%s< >%s<") ,params->params_array[params->params_count-1].param_name ,params->params_array[params->params_count-1].param_value); @@ -1076,7 +1076,7 @@ void util_parms_parse_qte(ctx_params *params, std::string &parmline) } } - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("Parsing: >%s< >%ld %ld %ld %ld<") + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("Parsing: >%s< >%ld %ld %ld %ld<") ,parmline.c_str(), indxnm_st, indxnm_en, indxvl_st, indxvl_en); util_parms_extract(params, parmline, indxnm_st, indxnm_en, indxvl_st, indxvl_en); @@ -1107,7 +1107,7 @@ void util_parms_parse_comma(ctx_params *params, std::string &parmline) indxvl_en = parmline.find(",",indxvl_st) - 1; } - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("Parsing: >%s< >%ld %ld %ld %ld<") + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("Parsing: >%s< >%ld %ld %ld %ld<") ,parmline.c_str(), indxnm_st, indxnm_en, indxvl_st, indxvl_en); util_parms_extract(params, parmline, indxnm_st, indxnm_en, indxvl_st, indxvl_en); @@ -1127,7 +1127,7 @@ void util_parms_parse_comma(ctx_params *params, std::string &parmline) } indxvl_en = parmline.length() - 1; - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("Parsing: >%s< >%ld %ld %ld %ld<") + MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,_("Parsing: >%s< >%ld %ld %ld %ld<") ,parmline.c_str(), indxnm_st, indxnm_en, indxvl_st, indxvl_en); util_parms_extract(params, parmline, indxnm_st, indxnm_en, indxvl_st, indxvl_en); @@ -1157,7 +1157,7 @@ void util_parms_parse(ctx_params *params, std::string confline) /* We make a copy because the parsing destroys the value passed */ parmline = confline; - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO,_("Starting parsing parameters")); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO,_("Starting parsing parameters")); util_parms_free(params); @@ -1242,7 +1242,7 @@ void util_parms_update(ctx_params *params, std::string &confline) confline = parmline; - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO,_("New config: %s"), confline.c_str()); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO,_("New config: %s"), confline.c_str()); return; @@ -1275,13 +1275,13 @@ void util_exec_command(ctx_dev *cam, const char *command, char *filename, int fi execl("/bin/sh", "sh", "-c", stamp, " &",(char*)NULL); /* if above function succeeds the program never reach here */ - MOTION_LOG(ALR, TYPE_EVENTS, SHOW_ERRNO + MOTPLS_LOG(ALR, TYPE_EVENTS, SHOW_ERRNO ,_("Unable to start external command '%s'"), stamp); exit(1); } - MOTION_LOG(DBG, TYPE_EVENTS, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_EVENTS, NO_ERRNO ,_("Executing external command '%s'"), stamp); } diff --git a/src/video_common.cpp b/src/video_common.cpp index d37e82ae..9bca8fbe 100644 --- a/src/video_common.cpp +++ b/src/video_common.cpp @@ -441,7 +441,7 @@ int vid_mjpegtoyuv420p(unsigned char *img_dst, unsigned char *img_src, int width ptr_buffer =(unsigned char*) memmem(img_src, size, "\xff\xd8", 2); if (ptr_buffer == NULL) { - MOTION_LOG(CRT, TYPE_VIDEO, NO_ERRNO,_("Corrupt image ... continue")); + MOTPLS_LOG(CRT, TYPE_VIDEO, NO_ERRNO,_("Corrupt image ... continue")); return 1; } /** @@ -454,7 +454,7 @@ int vid_mjpegtoyuv420p(unsigned char *img_dst, unsigned char *img_src, int width } if (soi_pos != 0) { - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("SOI position adjusted by %d bytes."), soi_pos); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("SOI position adjusted by %d bytes."), soi_pos); } memmove(img_src, img_src + soi_pos, size - soi_pos); @@ -463,7 +463,7 @@ int vid_mjpegtoyuv420p(unsigned char *img_dst, unsigned char *img_src, int width ret = jpgutl_decode_jpeg(img_src,size, width, height, img_dst); if (ret == -1) { - MOTION_LOG(CRT, TYPE_VIDEO, NO_ERRNO,_("Corrupt image ... continue")); + MOTPLS_LOG(CRT, TYPE_VIDEO, NO_ERRNO,_("Corrupt image ... continue")); ret = 1; } return ret; diff --git a/src/video_loopback.cpp b/src/video_loopback.cpp index 9b0a6c28..4bb481f0 100644 --- a/src/video_loopback.cpp +++ b/src/video_loopback.cpp @@ -73,7 +73,7 @@ static int vlp_open_vidpipe(void) int retcd; if ((dir = opendir(prefix)) == NULL) { - MOTION_LOG(CRT, TYPE_VIDEO, SHOW_ERRNO,_("Failed to open '%s'"), prefix); + MOTPLS_LOG(CRT, TYPE_VIDEO, SHOW_ERRNO,_("Failed to open '%s'"), prefix); return -1; } @@ -82,11 +82,11 @@ static int vlp_open_vidpipe(void) retcd = snprintf(buffer, sizeof(buffer),"%s%s/name", prefix, dirp->d_name); if ((retcd<0) || (retcd >= (int)sizeof(buffer))) { - MOTION_LOG(NTC, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, SHOW_ERRNO ,_("Error specifying buffer: %s"),buffer); continue; } else { - MOTION_LOG(NTC, TYPE_VIDEO, SHOW_ERRNO,_("Opening buffer: %s"),buffer); + MOTPLS_LOG(NTC, TYPE_VIDEO, SHOW_ERRNO,_("Opening buffer: %s"),buffer); } if ((fd = open(buffer, O_RDONLY|O_CLOEXEC)) >= 0) { @@ -95,7 +95,7 @@ static int vlp_open_vidpipe(void) continue; } buffer[len]=0; - MOTION_LOG(NTC, TYPE_VIDEO, SHOW_ERRNO,_("Read buffer: %s"),buffer); + MOTPLS_LOG(NTC, TYPE_VIDEO, SHOW_ERRNO,_("Read buffer: %s"),buffer); if (strncmp(buffer, "Loopback video device",21)) { /* weird stuff after minor */ close(fd); continue; @@ -104,12 +104,12 @@ static int vlp_open_vidpipe(void) retcd = snprintf(buffer,sizeof(buffer),"/dev/%s",dirp->d_name); if ((retcd < 0) || (retcd >= (int)sizeof(buffer))) { - MOTION_LOG(NTC, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, SHOW_ERRNO ,_("Error specifying buffer: %s"),buffer); close(fd); continue; } else { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("found video device '%s' %d"), buffer,min); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("found video device '%s' %d"), buffer,min); } if ((tfd = open(buffer, O_RDWR|O_CLOEXEC)) >= 0) { @@ -128,7 +128,7 @@ static int vlp_open_vidpipe(void) closedir(dir); if (pipe_fd >= 0) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opened %s as pipe output"), pipepath); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opened %s as pipe output"), pipepath); } return pipe_fd; @@ -140,31 +140,31 @@ static void vlp_show_vcap(struct v4l2_capability *cap) unsigned int c = cap->capabilities; int i; - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "Pipe Device"); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "cap.driver: %s",cap->driver); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "cap.card: %s",cap->card); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "cap.bus_info: %s",cap->bus_info); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "cap.card: %u.%u.%u",(vers >> 16) & 0xFF,(vers >> 8) & 0xFF,vers & 0xFF); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "Device capabilities"); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "Pipe Device"); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "cap.driver: %s",cap->driver); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "cap.card: %s",cap->card); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "cap.bus_info: %s",cap->bus_info); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "cap.card: %u.%u.%u",(vers >> 16) & 0xFF,(vers >> 8) & 0xFF,vers & 0xFF); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "Device capabilities"); for (i=0;cap_list[i].code;i++) { if (c & cap_list[i].code) { - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "%s",cap_list[i].cap); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "%s",cap_list[i].cap); } } - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "------------------------"); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "------------------------"); } static void vlp_show_vfmt(struct v4l2_format *v) { - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "type: type: %d",v->type); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.width: %d",v->fmt.pix.width); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.height: %d",v->fmt.pix.height); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.pixelformat: %d",v->fmt.pix.pixelformat); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.sizeimage: %d",v->fmt.pix.sizeimage); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.field: %d",v->fmt.pix.field); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.bytesperline: %d",v->fmt.pix.bytesperline); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.colorspace: %d",v->fmt.pix.colorspace); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "------------------------"); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "type: type: %d",v->type); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.width: %d",v->fmt.pix.width); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.height: %d",v->fmt.pix.height); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.pixelformat: %d",v->fmt.pix.pixelformat); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.sizeimage: %d",v->fmt.pix.sizeimage); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.field: %d",v->fmt.pix.field); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.bytesperline: %d",v->fmt.pix.bytesperline); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "fmt.pix.colorspace: %d",v->fmt.pix.colorspace); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "------------------------"); } int vlp_startpipe(const char *dev_name, int width, int height) @@ -177,17 +177,17 @@ int vlp_startpipe(const char *dev_name, int width, int height) dev = vlp_open_vidpipe(); } else { dev = open(dev_name, O_RDWR|O_CLOEXEC); - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opened %s as pipe output"), dev_name); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opened %s as pipe output"), dev_name); } if (dev < 0) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO,_("Opening %s as pipe output failed"), dev_name); + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO,_("Opening %s as pipe output failed"), dev_name); return -1; } if (ioctl(dev, VIDIOC_QUERYCAP, &vc) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "ioctl (VIDIOC_QUERYCAP)"); + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "ioctl (VIDIOC_QUERYCAP)"); return -1; } @@ -198,10 +198,10 @@ int vlp_startpipe(const char *dev_name, int width, int height) v.type = V4L2_BUF_TYPE_VIDEO_OUTPUT; if (ioctl(dev, VIDIOC_G_FMT, &v) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "ioctl (VIDIOC_G_FMT)"); + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "ioctl (VIDIOC_G_FMT)"); return -1; } - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("Original pipe specifications")); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("Original pipe specifications")); vlp_show_vfmt(&v); v.type = V4L2_BUF_TYPE_VIDEO_OUTPUT; @@ -212,15 +212,15 @@ int vlp_startpipe(const char *dev_name, int width, int height) v.fmt.pix.bytesperline = width; v.fmt.pix.field = V4L2_FIELD_NONE; v.fmt.pix.colorspace = V4L2_COLORSPACE_SRGB; - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("Proposed pipe specifications")); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("Proposed pipe specifications")); vlp_show_vfmt(&v); if (ioctl(dev,VIDIOC_S_FMT, &v) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "ioctl (VIDIOC_S_FMT)"); + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "ioctl (VIDIOC_S_FMT)"); return -1; } - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("Final pipe specifications")); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("Final pipe specifications")); vlp_show_vfmt(&v); return dev; @@ -247,14 +247,14 @@ void vlp_init(ctx_dev *cam) #if defined(HAVE_V4L2) && !defined(BSD) /* open video loopback devices if enabled */ if (cam->conf->video_pipe != "") { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("Opening video loopback device for normal pictures")); /* vid_startpipe should get the output dimensions */ cam->pipe = vlp_startpipe(cam->conf->video_pipe.c_str(), cam->imgs.width, cam->imgs.height); if (cam->pipe < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO ,_("Failed to open video loopback for normal pictures")); return; } @@ -263,14 +263,14 @@ void vlp_init(ctx_dev *cam) } if (cam->conf->video_pipe_motion != "") { - MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO ,_("Opening video loopback device for motion pictures")); /* vid_startpipe should get the output dimensions */ cam->mpipe = vlp_startpipe(cam->conf->video_pipe_motion.c_str(), cam->imgs.width, cam->imgs.height); if (cam->mpipe < 0) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO ,_("Failed to open video loopback for motion pictures")); return; } diff --git a/src/video_v4l2.cpp b/src/video_v4l2.cpp index c3b09b32..d3e1229d 100644 --- a/src/video_v4l2.cpp +++ b/src/video_v4l2.cpp @@ -138,22 +138,22 @@ static void v4l2_ctrls_log(ctx_dev *cam) ctx_v4l2cam *v4l2cam = cam->v4l2cam; if (v4l2cam->devctrl_count != 0 ) { - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, _("---------Controls---------")); - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, _(" V4L2 ID : Name : Range")); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, _("---------Controls---------")); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, _(" V4L2 ID : Name : Range")); for (indx = 0; indx < v4l2cam->devctrl_count; indx++) { if (v4l2cam->devctrl_array[indx].ctrl_menuitem) { - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, " %s : %s" + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, " %s : %s" ,v4l2cam->devctrl_array[indx].ctrl_iddesc ,v4l2cam->devctrl_array[indx].ctrl_name); } else { - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "%s : %s : %d to %d" + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "%s : %s : %d to %d" ,v4l2cam->devctrl_array[indx].ctrl_iddesc ,v4l2cam->devctrl_array[indx].ctrl_name ,v4l2cam->devctrl_array[indx].ctrl_minimum ,v4l2cam->devctrl_array[indx].ctrl_maximum); } } - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, "--------------------------"); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, "--------------------------"); } } @@ -172,7 +172,7 @@ static void v4l2_ctrls_list(ctx_dev *cam) v4l2cam->devctrl_array = NULL; if (v4l2cam->devctrl_count == 0) { - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO, _("No Controls found for device")); + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO, _("No Controls found for device")); return; } @@ -255,12 +255,12 @@ static void v4l2_ctrls_set(ctx_dev *cam) vid_ctrl.value = devitem->ctrl_newval; retcd = xioctl(v4l2cam, VIDIOC_S_CTRL, &vid_ctrl); if (retcd < 0) { - MOTION_LOG(WRN, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, SHOW_ERRNO ,_("setting control %s \"%s\" to %d failed with return code %d") ,devitem->ctrl_iddesc, devitem->ctrl_name ,devitem->ctrl_newval,retcd); } else { - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO ,_("Set control \"%s\" to value %d") ,devitem->ctrl_name, devitem->ctrl_newval); devitem->ctrl_currval = devitem->ctrl_newval; @@ -299,11 +299,11 @@ static int v4l2_parms_set(ctx_dev *cam) /*FALLTHROUGH*/ case V4L2_CTRL_TYPE_INTEGER: if (atoi(usritem->param_value) < devitem->ctrl_minimum) { - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO ,_("%s control option value %s is below minimum. Skipping...") ,devitem->ctrl_name, usritem->param_value, devitem->ctrl_minimum); } else if (atoi(usritem->param_value) > devitem->ctrl_maximum) { - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO ,_("%s control option value %s is above maximum. Skipping...") ,devitem->ctrl_name, usritem->param_value, devitem->ctrl_maximum); } else { @@ -314,7 +314,7 @@ static int v4l2_parms_set(ctx_dev *cam) devitem->ctrl_newval = usritem->param_value ? 1 : 0; break; default: - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO ,_("control type not supported yet")); } } @@ -352,7 +352,7 @@ static void v4l2_set_input(ctx_dev *cam) } if (xioctl(v4l2cam, VIDIOC_ENUMINPUT, &input) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO ,_("Unable to query input %d." " VIDIOC_ENUMINPUT, if you use a WEBCAM change input value in conf by -1") ,input.index); @@ -360,21 +360,21 @@ static void v4l2_set_input(ctx_dev *cam) return; } - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO ,_("Name = \"%s\", type 0x%08X, status %08x") ,input.name, input.type, input.status); if (input.type & V4L2_INPUT_TYPE_TUNER) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO ,_("Name = \"%s\",- TUNER"), input.name); } if (input.type & V4L2_INPUT_TYPE_CAMERA) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Name = \"%s\"- CAMERA"), input.name); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Name = \"%s\"- CAMERA"), input.name); } if (xioctl(v4l2cam, VIDIOC_S_INPUT, &input.index) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO , _("Error selecting input %d VIDIOC_S_INPUT"), input.index); v4l2_device_close(cam); return; @@ -407,7 +407,7 @@ static void v4l2_set_norm(ctx_dev *cam) } if (xioctl(v4l2cam, VIDIOC_G_STD, &std_id) == -1) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO ,_("Device does not support specifying PAL/NTSC norm")); return; } @@ -418,7 +418,7 @@ static void v4l2_set_norm(ctx_dev *cam) while (xioctl(v4l2cam, VIDIOC_ENUMSTD, &standard) == 0) { if (standard.id & std_id) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO ,_("- video standard %s"), standard.name); } standard.index++; @@ -436,17 +436,17 @@ static void v4l2_set_norm(ctx_dev *cam) } if (xioctl(v4l2cam, VIDIOC_S_STD, &std_id) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO ,_("Error selecting standard method %d VIDIOC_S_STD") ,(int)std_id); } if (std_id == V4L2_STD_NTSC) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Video standard set to NTSC")); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Video standard set to NTSC")); } else if (std_id == V4L2_STD_SECAM) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Video standard set to SECAM")); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Video standard set to SECAM")); } else { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Video standard set to PAL")); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Video standard set to PAL")); } } @@ -481,12 +481,12 @@ static void v4l2_set_frequency(ctx_dev *cam) tuner.index = v4l2cam->device_tuner; if (xioctl(v4l2cam, VIDIOC_G_TUNER, &tuner) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO ,_("tuner %d VIDIOC_G_TUNER"), tuner.index); return; } - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Set tuner %d"), tuner.index); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Set tuner %d"), tuner.index); /* Set the frequency. */ memset(&freq, 0, sizeof(struct v4l2_frequency)); @@ -495,12 +495,12 @@ static void v4l2_set_frequency(ctx_dev *cam) freq.frequency = (spec / 1000) * 16; if (xioctl(v4l2cam, VIDIOC_S_FREQUENCY, &freq) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO ,_("freq %ul VIDIOC_S_FREQUENCY"), freq.frequency); return; } - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Set Frequency to %ul"), freq.frequency); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Set Frequency to %ul"), freq.frequency); } return; @@ -522,7 +522,7 @@ static int v4l2_pixfmt_try(ctx_dev *cam, uint pixformat) retcd = xioctl(v4l2cam, VIDIOC_TRY_FMT, fmt); if ((retcd == -1) || (fmt->fmt.pix.pixelformat != pixformat)) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO ,_("Unable to use palette %c%c%c%c (%dx%d)") ,pixformat >> 0, pixformat >> 8 ,pixformat >> 16, pixformat >> 24 @@ -530,7 +530,7 @@ static int v4l2_pixfmt_try(ctx_dev *cam, uint pixformat) return -1; } - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO ,_("Testing palette %c%c%c%c (%dx%d)") ,pixformat >> 0, pixformat >> 8 ,pixformat >> 16, pixformat >> 24 @@ -551,18 +551,18 @@ static int v4l2_pixfmt_stride(ctx_dev *cam) bpl = (int)fmt->fmt.pix.bytesperline; wd = v4l2cam->width; - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO , _("Checking image size %dx%d with stride %d") , v4l2cam->width, v4l2cam->height, bpl); if (bpl == 0) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO , _("No stride value provided from device.")); return 0; } if (wd > bpl) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , _("Width(%d) must be less than stride(%d)"), wd, bpl); return -1; } @@ -572,19 +572,19 @@ static int v4l2_pixfmt_stride(ctx_dev *cam) return 0; } - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO , _("The image width(%d) is not multiple of the stride(%d)") , wd, bpl); /* Width per stride */ wps = bpl / wd; if (wps < 1) { - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO , _("Impossible condition: Width(%d), Stride(%d), Per stride(%d)") , wd, bpl, wps); } - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO , _("Image width will be padded %d bytes"), ((bpl % wd)/wps)); v4l2cam->width = wd + ((bpl % wd)/wps); @@ -601,7 +601,7 @@ static int v4l2_pixfmt_adjust(ctx_dev *cam) if (fmt->fmt.pix.width != (uint)v4l2cam->width || fmt->fmt.pix.height != (uint)v4l2cam->height) { - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO ,_("Adjusting resolution from %ix%i to %ix%i.") ,v4l2cam->width, v4l2cam->height ,fmt->fmt.pix.width @@ -611,9 +611,9 @@ static int v4l2_pixfmt_adjust(ctx_dev *cam) v4l2cam->height = fmt->fmt.pix.height; if ((v4l2cam->width % 8) || (v4l2cam->height % 8)) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO ,_("Adjusted resolution not modulo 8.")); - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO ,_("Specify different palette or width/height in config file.")); return -1; } @@ -643,14 +643,14 @@ static int v4l2_pixfmt_set(ctx_dev *cam, unsigned int pixformat) } retcd = xioctl(v4l2cam, VIDIOC_S_FMT, fmt); if (retcd == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO ,_("Error setting pixel format.")); return -1; } v4l2cam->pixfmt_src = pixformat; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO ,_("Using palette %c%c%c%c (%dx%d)") ,pixformat >> 0 , pixformat >> 8 ,pixformat >> 16, pixformat >> 24 @@ -665,18 +665,18 @@ static void v4l2_params_check(ctx_dev *cam) ctx_v4l2cam *v4l2cam = cam->v4l2cam; if (v4l2cam->width % 8) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO ,_("config image width (%d) is not modulo 8"), v4l2cam->width); v4l2cam->width = v4l2cam->width - (v4l2cam->width % 8) + 8; - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO , _("Adjusting to width (%d)"), v4l2cam->width); } if (v4l2cam->height % 8) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO ,_("config image height (%d) is not modulo 8"), v4l2cam->height); v4l2cam->height = v4l2cam->height - (v4l2cam->height % 8) + 8; - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO ,_("Adjusting to height (%d)"), v4l2cam->height); } @@ -689,7 +689,7 @@ static void v4l2_params_check(ctx_dev *cam) } if ((spec < 0) || (spec > V4L2_PALETTE_COUNT_MAX)) { - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO ,_("Invalid palette. Changing to default")); util_parms_add(cam->v4l2cam->params,"palette","17"); } @@ -703,7 +703,7 @@ static int v4l2_pixfmt_list(ctx_dev *cam, palette_item *palette_array) ctx_v4l2cam *v4l2cam = cam->v4l2cam; struct v4l2_fmtdesc fmtd; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Supported palettes:")); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("Supported palettes:")); v4l2_pal = 0; memset(&fmtd, 0, sizeof(struct v4l2_fmtdesc)); @@ -712,7 +712,7 @@ static int v4l2_pixfmt_list(ctx_dev *cam, palette_item *palette_array) indx_palette = -1; /* -1 says not yet selected */ while (xioctl(v4l2cam, VIDIOC_ENUM_FMT, &fmtd) != -1) { - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO , "(%i) %c%c%c%c (%s)", v4l2_pal , fmtd.pixelformat >> 0, fmtd.pixelformat >> 8 , fmtd.pixelformat >> 16, fmtd.pixelformat >> 24 @@ -761,14 +761,14 @@ static void v4l2_palette_set(ctx_dev *cam) return; } - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO ,_("Configuration palette index %d (%s) for %dx%d doesn't work.") , indxp, palette_array[indxp].fourcc ,v4l2cam->width, v4l2cam->height); indxp = v4l2_pixfmt_list(cam, palette_array); if (indxp < 0) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO ,_("Unable to find a compatible palette format.")); myfree(&palette_array); v4l2_device_close(cam); @@ -777,14 +777,14 @@ static void v4l2_palette_set(ctx_dev *cam) retcd = v4l2_pixfmt_set(cam, palette_array[indxp].v4l2id); if (retcd < 0) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO , _("Palette selection failed for format %s") , palette_array[indxp].fourcc); v4l2_device_close(cam); return; } - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO ,_("Selected palette %s") ,palette_array[indxp].fourcc); @@ -814,7 +814,7 @@ static void v4l2_set_mmap(ctx_dev *cam) v4l2cam->req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; v4l2cam->req.memory = V4L2_MEMORY_MMAP; if (xioctl(v4l2cam, VIDIOC_REQBUFS, &v4l2cam->req) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO ,_("Error requesting buffers %d for memory map. VIDIOC_REQBUFS") ,v4l2cam->req.count); v4l2_device_close(cam); @@ -822,11 +822,11 @@ static void v4l2_set_mmap(ctx_dev *cam) } v4l2cam->buffer_count = v4l2cam->req.count; - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO ,_("mmap information: frames=%d"), v4l2cam->buffer_count); if (v4l2cam->buffer_count < MIN_MMAP_BUFFERS) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO ,_("Insufficient buffer memory %d < MIN_MMAP_BUFFERS.") ,v4l2cam->buffer_count); v4l2_device_close(cam); @@ -835,7 +835,7 @@ static void v4l2_set_mmap(ctx_dev *cam) v4l2cam->buffers =(video_buff*) calloc(v4l2cam->buffer_count, sizeof(video_buff)); if (v4l2cam->buffers == NULL) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, _("Out of memory.")); + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, _("Out of memory.")); v4l2_device_close(cam); return; } @@ -849,7 +849,7 @@ static void v4l2_set_mmap(ctx_dev *cam) buf.memory = V4L2_MEMORY_MMAP; buf.index = buffer_index; if (xioctl(v4l2cam, VIDIOC_QUERYBUF, &buf) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO ,_("Error querying buffer %i\nVIDIOC_QUERYBUF: ") ,buffer_index); myfree(&v4l2cam->buffers); @@ -862,14 +862,14 @@ static void v4l2_set_mmap(ctx_dev *cam) MAP_SHARED, v4l2cam->fd_device, buf.m.offset); if (v4l2cam->buffers[buffer_index].ptr == MAP_FAILED) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO ,_("Error mapping buffer %i mmap"), buffer_index); myfree(&v4l2cam->buffers); v4l2_device_close(cam); return; } - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO ,_("%i length=%d Address (%x)") ,buffer_index, buf.length, v4l2cam->buffers[buffer_index].ptr); } @@ -882,7 +882,7 @@ static void v4l2_set_mmap(ctx_dev *cam) v4l2cam->buf.index = buffer_index; if (xioctl(v4l2cam, VIDIOC_QBUF, &v4l2cam->buf) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "VIDIOC_QBUF"); + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "VIDIOC_QBUF"); v4l2_device_close(cam); return; } @@ -891,7 +891,7 @@ static void v4l2_set_mmap(ctx_dev *cam) type = V4L2_BUF_TYPE_VIDEO_CAPTURE; if (xioctl(v4l2cam, VIDIOC_STREAMON, &type) == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO ,_("Error starting stream. VIDIOC_STREAMON")); v4l2_device_close(cam); return; @@ -932,7 +932,7 @@ static int v4l2_capture(ctx_dev *cam) if (v4l2cam->pframe >= 0) { retcd = xioctl(v4l2cam, VIDIOC_QBUF, &v4l2cam->buf); if (retcd == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "VIDIOC_QBUF"); + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "VIDIOC_QBUF"); pthread_sigmask(SIG_UNBLOCK, &old, NULL); return -1; } @@ -946,7 +946,7 @@ static int v4l2_capture(ctx_dev *cam) retcd = xioctl(v4l2cam, VIDIOC_DQBUF, &v4l2cam->buf); if (retcd == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "VIDIOC_DQBUF"); + MOTPLS_LOG(ERR, TYPE_VIDEO, SHOW_ERRNO, "VIDIOC_DQBUF"); pthread_sigmask(SIG_UNBLOCK, &old, NULL); return -1; } @@ -1077,7 +1077,7 @@ static void v4l2_device_select(ctx_dev *cam) retcd = v4l2_parms_set(cam); if (retcd < 0 ) { - MOTION_LOG(WRN, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(WRN, TYPE_VIDEO, NO_ERRNO ,_("Error setting device controls")); return; } @@ -1091,7 +1091,7 @@ static void v4l2_device_open(ctx_dev *cam) { int fd_device; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO , _("Opening video device %s") , cam->conf->v4l2_device.c_str()); @@ -1100,7 +1100,7 @@ static void v4l2_device_open(ctx_dev *cam) if (fd_device > 0) { cam->v4l2cam->fd_device = fd_device; } else { - MOTION_LOG(ALR, TYPE_VIDEO, SHOW_ERRNO + MOTPLS_LOG(ALR, TYPE_VIDEO, SHOW_ERRNO , _("Failed to open video device %s") , cam->conf->v4l2_device.c_str()); cam->v4l2cam->fd_device = -1; @@ -1108,13 +1108,13 @@ static void v4l2_device_open(ctx_dev *cam) } if (xioctl(cam->v4l2cam, VIDIOC_QUERYCAP, &cam->v4l2cam->cap) < 0) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO, _("Not a V4L2 device?")); + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO, _("Not a V4L2 device?")); v4l2_device_close(cam); return; } if (!(cam->v4l2cam->cap.capabilities & V4L2_CAP_VIDEO_CAPTURE)) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO, _("Device does not support capturing.")); + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO, _("Device does not support capturing.")); v4l2_device_close(cam); return; } @@ -1129,48 +1129,48 @@ static void v4l2_log_types(ctx_dev *cam) return; } - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "------------------------"); - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "cap.driver: \"%s\"",v4l2cam->cap.driver); - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "cap.card: \"%s\"",v4l2cam->cap.card); - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "cap.bus_info: \"%s\"",v4l2cam->cap.bus_info); - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "cap.capabilities=0x%08X",v4l2cam->cap.capabilities); - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "------------------------"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "------------------------"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "cap.driver: \"%s\"",v4l2cam->cap.driver); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "cap.card: \"%s\"",v4l2cam->cap.card); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "cap.bus_info: \"%s\"",v4l2cam->cap.bus_info); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "cap.capabilities=0x%08X",v4l2cam->cap.capabilities); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "------------------------"); if (v4l2cam->cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- VIDEO_CAPTURE"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- VIDEO_CAPTURE"); } if (v4l2cam->cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- VIDEO_OUTPUT"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- VIDEO_OUTPUT"); } if (v4l2cam->cap.capabilities & V4L2_CAP_VIDEO_OVERLAY) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- VIDEO_OVERLAY"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- VIDEO_OVERLAY"); } if (v4l2cam->cap.capabilities & V4L2_CAP_VBI_CAPTURE) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- VBI_CAPTURE"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- VBI_CAPTURE"); } if (v4l2cam->cap.capabilities & V4L2_CAP_VBI_OUTPUT) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- VBI_OUTPUT"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- VBI_OUTPUT"); } if (v4l2cam->cap.capabilities & V4L2_CAP_RDS_CAPTURE) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- RDS_CAPTURE"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- RDS_CAPTURE"); } if (v4l2cam->cap.capabilities & V4L2_CAP_TUNER) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- TUNER"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- TUNER"); } if (v4l2cam->cap.capabilities & V4L2_CAP_AUDIO) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- AUDIO"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- AUDIO"); } if (v4l2cam->cap.capabilities & V4L2_CAP_READWRITE) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- READWRITE"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- READWRITE"); } if (v4l2cam->cap.capabilities & V4L2_CAP_ASYNCIO) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- ASYNCIO"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- ASYNCIO"); } if (v4l2cam->cap.capabilities & V4L2_CAP_STREAMING) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- STREAMING"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- STREAMING"); } if (v4l2cam->cap.capabilities & V4L2_CAP_TIMEPERFRAME) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- TIMEPERFRAME"); + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO, "- TIMEPERFRAME"); } } @@ -1196,7 +1196,7 @@ static void v4l2_log_formats(ctx_dev *cam) dev_format.index = indx_format = 0; dev_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; while (xioctl(v4l2cam, VIDIOC_ENUM_FMT, &dev_format) != -1) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO ,_("Supported palette %s (%c%c%c%c)") ,dev_format.description ,dev_format.pixelformat >> 0 @@ -1208,7 +1208,7 @@ static void v4l2_log_formats(ctx_dev *cam) dev_sizes.index = indx_sizes = 0; dev_sizes.pixel_format = dev_format.pixelformat; while (xioctl(v4l2cam, VIDIOC_ENUM_FRAMESIZES, &dev_sizes) != -1) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO ,_(" Width: %d, Height %d") ,dev_sizes.discrete.width ,dev_sizes.discrete.height); @@ -1219,7 +1219,7 @@ static void v4l2_log_formats(ctx_dev *cam) dev_frameint.width = dev_sizes.discrete.width; dev_frameint.height = dev_sizes.discrete.height; while (xioctl(v4l2cam, VIDIOC_ENUM_FRAMEINTERVALS, &dev_frameint) != -1) { - MOTION_LOG(DBG, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_VIDEO, NO_ERRNO ,_(" Framerate %d/%d") ,dev_frameint.discrete.numerator ,dev_frameint.discrete.denominator); @@ -1258,17 +1258,17 @@ static void v4l2_set_fps(ctx_dev *cam) setfps.parm.capture.timeperframe.numerator = 1; setfps.parm.capture.timeperframe.denominator = v4l2cam->fps; - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO , _("Trying to set fps to %d") , setfps.parm.capture.timeperframe.denominator); retcd = xioctl(v4l2cam, VIDIOC_S_PARM, &setfps); if (retcd != 0) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO ,_("Error setting fps. Return code %d"), retcd); } - MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(INF, TYPE_VIDEO, NO_ERRNO , _("Device set fps to %d") , setfps.parm.capture.timeperframe.denominator); @@ -1283,7 +1283,7 @@ void v4l2_cleanup(ctx_dev *cam) enum v4l2_buf_type type; int indx; - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO ,_("Closing video device %s"), cam->conf->v4l2_device.c_str()); type = V4L2_BUF_TYPE_VIDEO_CAPTURE; @@ -1322,7 +1322,7 @@ void v4l2_cleanup(ctx_dev *cam) void v4l2_start(ctx_dev *cam) { #ifdef HAVE_V4L2 - MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening V4L2 device")); + MOTPLS_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening V4L2 device")); v4l2_device_init(cam); v4l2_device_open(cam); @@ -1339,7 +1339,7 @@ void v4l2_start(ctx_dev *cam) v4l2_set_mmap(cam); v4l2_set_imgs(cam); if (cam->v4l2cam->fd_device == -1) { - MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO,_("V4L2 device failed to open")); + MOTPLS_LOG(ERR, TYPE_VIDEO, NO_ERRNO,_("V4L2 device failed to open")); v4l2_cleanup(cam); return; } diff --git a/src/webu.cpp b/src/webu.cpp index d4f88821..9faf634b 100644 --- a/src/webu.cpp +++ b/src/webu.cpp @@ -137,7 +137,7 @@ static void webu_parms_edit(ctx_webui *webui) } } - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(DBG, TYPE_STREAM, NO_ERRNO , "camid: >%s< thread: >%d< cmd1: >%s< cmd2: >%s< cmd3: >%s<" , webui->uri_camid.c_str(), webui->threadnbr , webui->uri_cmd1.c_str(), webui->uri_cmd2.c_str() @@ -157,7 +157,7 @@ static int webu_parseurl(ctx_webui *webui) webui->uri_cmd2 = ""; webui->uri_cmd3 = ""; - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO, _("Sent url: %s"),webui->url.c_str()); + MOTPLS_LOG(DBG, TYPE_STREAM, NO_ERRNO, _("Sent url: %s"),webui->url.c_str()); tmpurl = (char*)mymalloc(webui->url.length()+1); memcpy(tmpurl, webui->url.c_str(), webui->url.length()); @@ -167,7 +167,7 @@ static int webu_parseurl(ctx_webui *webui) webui->url.assign(tmpurl); free(tmpurl); - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO, _("Decoded url: %s"),webui->url.c_str()); + MOTPLS_LOG(DBG, TYPE_STREAM, NO_ERRNO, _("Decoded url: %s"),webui->url.c_str()); baselen = webui->motapp->conf->webcontrol_base_path.length(); @@ -300,7 +300,7 @@ static void webu_hostname(ctx_webui *webui) webui->motapp->conf->webcontrol_base_path; } - MOTION_LOG(DBG,TYPE_ALL, NO_ERRNO, _("Full Host: %s"), webui->hostfull.c_str()); + MOTPLS_LOG(DBG,TYPE_ALL, NO_ERRNO, _("Full Host: %s"), webui->hostfull.c_str()); return; } @@ -312,7 +312,7 @@ static void webu_failauth_log(ctx_webui *webui) ctx_webu_clients clients; std::list::iterator it; - MOTION_LOG(ALR, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(ALR, TYPE_STREAM, NO_ERRNO ,_("Failed authentication from %s"), webui->clientip.c_str()); clock_gettime(CLOCK_MONOTONIC, &tm_cnct); @@ -365,7 +365,7 @@ static void webu_client_connect(ctx_webui *webui) while (it != webui->motapp->webcontrol_clients.end()) { if (it->clientip == webui->clientip) { if (it->authenticated == false) { - MOTION_LOG(INF,TYPE_ALL, NO_ERRNO, _("Connection from: %s"),webui->clientip.c_str()); + MOTPLS_LOG(INF,TYPE_ALL, NO_ERRNO, _("Connection from: %s"),webui->clientip.c_str()); } it->authenticated = true; it->conn_nbr = 1; @@ -382,7 +382,7 @@ static void webu_client_connect(ctx_webui *webui) clients.authenticated = true; webui->motapp->webcontrol_clients.push_back(clients); - MOTION_LOG(INF,TYPE_ALL, NO_ERRNO, _("Connection from: %s"),webui->clientip.c_str()); + MOTPLS_LOG(INF,TYPE_ALL, NO_ERRNO, _("Connection from: %s"),webui->clientip.c_str()); return; @@ -406,7 +406,7 @@ static mhdrslt webu_failauth_check(ctx_webui *webui) (webui->motapp->conf->webcontrol_lock_minutes*60)) && (it->authenticated == false) && (it->conn_nbr > webui->motapp->conf->webcontrol_lock_attempts)) { - MOTION_LOG(EMG, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(EMG, TYPE_STREAM, NO_ERRNO ,_("Ignoring connection from: %s"), webui->clientip.c_str()); it->conn_time = tm_cnct; return MHD_NO; @@ -592,7 +592,7 @@ static mhdrslt webu_mhd_auth(ctx_webui *webui) if (webui->motapp->conf->webcontrol_authentication == "") { webui->authenticated = true; if (webui->motapp->conf->webcontrol_auth_method != "none") { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("No webcontrol user:pass provided")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("No webcontrol user:pass provided")); } return MHD_YES; } @@ -623,7 +623,7 @@ static mhdrslt webu_mhd_send(ctx_webui *webui) response = MHD_create_response_from_buffer(webui->resp_page.length() ,(void *)webui->resp_page.c_str(), MHD_RESPMEM_PERSISTENT); if (!response) { - MOTION_LOG(ERR, TYPE_STREAM, NO_ERRNO, _("Invalid response")); + MOTPLS_LOG(ERR, TYPE_STREAM, NO_ERRNO, _("Invalid response")); return MHD_NO; } @@ -656,7 +656,7 @@ static mhdrslt webu_answer_post(ctx_webui *webui) { mhdrslt retcd; - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO ,"processing post"); + MOTPLS_LOG(DBG, TYPE_STREAM, NO_ERRNO ,"processing post"); pthread_mutex_lock(&webui->motapp->mutex_post); webu_post_main(webui); @@ -670,7 +670,7 @@ static mhdrslt webu_answer_post(ctx_webui *webui) retcd = webu_mhd_send(webui); if (retcd == MHD_NO) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,"send post page failed"); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,"send post page failed"); } return retcd; @@ -761,7 +761,7 @@ static mhdrslt webu_answer_get(ctx_webui *webui) { mhdrslt retcd; - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO ,"processing get"); + MOTPLS_LOG(DBG, TYPE_STREAM, NO_ERRNO ,"processing get"); retcd = MHD_NO; if ((webui->uri_cmd1 == "mjpg") || @@ -789,7 +789,7 @@ static mhdrslt webu_answer_get(ctx_webui *webui) retcd = webu_mhd_send(webui); if (retcd == MHD_NO) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("send page failed.")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("send page failed.")); } } else if (webui->uri_cmd1 == "movies.json") { @@ -800,7 +800,7 @@ static mhdrslt webu_answer_get(ctx_webui *webui) retcd = webu_mhd_send(webui); if (retcd == MHD_NO) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("send page failed.")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("send page failed.")); } } else if (webui->uri_cmd1 == "status.json") { @@ -811,7 +811,7 @@ static mhdrslt webu_answer_get(ctx_webui *webui) retcd = webu_mhd_send(webui); if (retcd == MHD_NO) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("send page failed.")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("send page failed.")); } } else { @@ -825,7 +825,7 @@ static mhdrslt webu_answer_get(ctx_webui *webui) retcd = webu_mhd_send(webui); if (retcd == MHD_NO) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("send page failed.")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("send page failed.")); } } @@ -859,13 +859,13 @@ static mhdrslt webu_answer(void *cls, struct MHD_Connection *connection, const c } if (webui->motapp->finish_all) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Shutting down camera")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Shutting down camera")); return MHD_NO; } if (webui->cam != NULL) { if (webui->cam->finish_dev) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Shutting down camera")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Shutting down camera")); return MHD_NO; } } @@ -1022,13 +1022,13 @@ static void webu_mhd_features_basic(ctx_mhdstart *mhdst) mhdrslt retcd; retcd = MHD_is_feature_supported (MHD_FEATURE_BASIC_AUTH); if (retcd == MHD_YES) { - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO ,_("Basic authentication: available")); + MOTPLS_LOG(DBG, TYPE_STREAM, NO_ERRNO ,_("Basic authentication: available")); } else { if (mhdst->motapp->conf->webcontrol_auth_method == "basic") { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Basic authentication: disabled")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Basic authentication: disabled")); mhdst->motapp->conf->webcontrol_auth_method = "none"; } else { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO ,_("Basic authentication: disabled")); + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO ,_("Basic authentication: disabled")); } } #endif @@ -1043,13 +1043,13 @@ static void webu_mhd_features_digest(ctx_mhdstart *mhdst) mhdrslt retcd; retcd = MHD_is_feature_supported (MHD_FEATURE_DIGEST_AUTH); if (retcd == MHD_YES) { - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO ,_("Digest authentication: available")); + MOTPLS_LOG(DBG, TYPE_STREAM, NO_ERRNO ,_("Digest authentication: available")); } else { if (mhdst->motapp->conf->webcontrol_auth_method == "digest") { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Digest authentication: disabled")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Digest authentication: disabled")); mhdst->motapp->conf->webcontrol_auth_method = "none"; } else { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO ,_("Digest authentication: disabled")); + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO ,_("Digest authentication: disabled")); } } #endif @@ -1060,7 +1060,7 @@ static void webu_mhd_features_ipv6(ctx_mhdstart *mhdst) { #if MHD_VERSION < 0x00094400 if (mhdst->ipv6) { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO ,_("libmicrohttpd libary too old ipv6 disabled")); + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO ,_("libmicrohttpd libary too old ipv6 disabled")); if (mhdst->ipv6) { mhdst->ipv6 = 0; } @@ -1069,9 +1069,9 @@ static void webu_mhd_features_ipv6(ctx_mhdstart *mhdst) mhdrslt retcd; retcd = MHD_is_feature_supported (MHD_FEATURE_IPv6); if (retcd == MHD_YES) { - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO ,_("IPV6: available")); + MOTPLS_LOG(DBG, TYPE_STREAM, NO_ERRNO ,_("IPV6: available")); } else { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("IPV6: disabled")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("IPV6: disabled")); if (mhdst->ipv6) { mhdst->ipv6 = 0; } @@ -1084,20 +1084,20 @@ static void webu_mhd_features_tls(ctx_mhdstart *mhdst) { #if MHD_VERSION < 0x00094400 if (mhdst->motapp->conf->webcontrol_tls) { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO ,_("libmicrohttpd libary too old SSL/TLS disabled")); + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO ,_("libmicrohttpd libary too old SSL/TLS disabled")); mhdst->motapp->conf->webcontrol_tls = 0; } #else mhdrslt retcd; retcd = MHD_is_feature_supported (MHD_FEATURE_SSL); if (retcd == MHD_YES) { - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO ,_("SSL/TLS: available")); + MOTPLS_LOG(DBG, TYPE_STREAM, NO_ERRNO ,_("SSL/TLS: available")); } else { if (mhdst->motapp->conf->webcontrol_tls) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("SSL/TLS: disabled")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("SSL/TLS: disabled")); mhdst->motapp->conf->webcontrol_tls = 0; } else { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO ,_("SSL/TLS: disabled")); + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO ,_("SSL/TLS: disabled")); } } #endif @@ -1138,7 +1138,7 @@ static std::string webu_mhd_loadfile(std::string fname) file_char[file_size] = 0; filestr.assign(file_char, file_size); } else { - MOTION_LOG(ERR, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_STREAM, NO_ERRNO ,_("Error reading file for SSL/TLS support.")); } free(file_char); @@ -1156,12 +1156,12 @@ static void webu_mhd_checktls(ctx_mhdstart *mhdst) if (mhdst->motapp->conf->webcontrol_tls) { if ((mhdst->motapp->conf->webcontrol_cert == "") || (mhdst->tls_cert == "")) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("SSL/TLS requested but no cert file provided. SSL/TLS disabled")); mhdst->motapp->conf->webcontrol_tls = 0; } if ((mhdst->motapp->conf->webcontrol_key == "") || (mhdst->tls_key == "")) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("SSL/TLS requested but no key file provided. SSL/TLS disabled")); mhdst->motapp->conf->webcontrol_tls = 0; } @@ -1335,7 +1335,7 @@ static void webu_init_webcontrol(ctx_motapp *motapp) ctx_mhdstart mhdst; unsigned int randnbr; - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO , _("Starting webcontrol on port %d") , motapp->conf->webcontrol_port); @@ -1371,9 +1371,9 @@ static void webu_init_webcontrol(ctx_motapp *motapp) free(mhdst.mhd_ops); if (motapp->webcontrol_daemon == NULL) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Unable to start MHD")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Unable to start MHD")); } else { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,_("Started webcontrol on port %d") ,motapp->conf->webcontrol_port); } diff --git a/src/webu_file.cpp b/src/webu_file.cpp index 7bb4784c..b36a98b0 100644 --- a/src/webu_file.cpp +++ b/src/webu_file.cpp @@ -66,7 +66,7 @@ mhdrslt webu_file_main(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"movies")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Movies via webcontrol disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Movies via webcontrol disabled"); return MHD_NO; } else { break; @@ -86,7 +86,7 @@ mhdrslt webu_file_main(ctx_webui *webui) webui->req_file = myfopen(full_nm.c_str(), "rbe"); } else { webui->req_file = NULL; - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO ,"Security warning: Client IP %s requested file: %s" ,webui->clientip.c_str(), webui->uri_cmd2.c_str()); } diff --git a/src/webu_html.cpp b/src/webu_html.cpp index 43939cb5..48d4dd05 100644 --- a/src/webu_html.cpp +++ b/src/webu_html.cpp @@ -1502,7 +1502,7 @@ void webu_html_user(ctx_webui *webui) fp = myfopen(webui->motapp->conf->webcontrol_html.c_str(), "re"); if (fp == NULL) { - MOTION_LOG(ERR, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_STREAM, NO_ERRNO , _("Invalid user html file: %s") , webui->motapp->conf->webcontrol_html.c_str()); diff --git a/src/webu_json.cpp b/src/webu_json.cpp index e356e7a4..544e86ba 100644 --- a/src/webu_json.cpp +++ b/src/webu_json.cpp @@ -280,7 +280,7 @@ static void webu_json_movies_list(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"movies")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Movies via webcontrol disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Movies via webcontrol disabled"); webui->resp_page += "{\"count\" : 0} "; webui->resp_page += "}"; return; diff --git a/src/webu_post.cpp b/src/webu_post.cpp index a8237bd9..67d933bf 100644 --- a/src/webu_post.cpp +++ b/src/webu_post.cpp @@ -34,7 +34,7 @@ static void webu_post_cam_add(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"camera_add")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Camera add action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Camera add action disabled"); return; } else { break; @@ -42,7 +42,7 @@ static void webu_post_cam_add(ctx_webui *webui) } } - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Adding camera."); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Adding camera."); maxcnt = 100; @@ -55,11 +55,11 @@ static void webu_post_cam_add(ctx_webui *webui) if (indx == maxcnt) { webui->motapp->cam_add = false; - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, "Error adding camera. Timed out"); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, "Error adding camera. Timed out"); return; } - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "New camera added."); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "New camera added."); } /* Process the delete camera action */ @@ -72,7 +72,7 @@ static void webu_post_cam_delete(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"camera_delete")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Camera delete action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Camera delete action disabled"); return; } else { break; @@ -81,10 +81,10 @@ static void webu_post_cam_delete(ctx_webui *webui) } if (webui->threadnbr == -1) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "No camera specified for deletion." ); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "No camera specified for deletion." ); return; } else { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Deleting camera."); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Deleting camera."); } webui->motapp->cam_delete = webui->threadnbr; @@ -96,7 +96,7 @@ static void webu_post_cam_delete(ctx_webui *webui) indx++; } if (indx == maxcnt) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, "Error stopping camera. Timed out shutting down"); + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO, "Error stopping camera. Timed out shutting down"); webui->motapp->cam_delete = -1; return; } @@ -120,19 +120,19 @@ void webu_post_cmdthrd(ctx_webui *webui) camid = atoi(webui->post_info[indx].key_val); } - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO ,"key: %s value: %s " + MOTPLS_LOG(DBG, TYPE_STREAM, NO_ERRNO ,"key: %s value: %s " , webui->post_info[indx].key_nm , webui->post_info[indx].key_val ); } if (webui->post_cmd == "") { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , "Invalid post request. No command"); return; } if (camid == -1) { - MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO , "Invalid post request. No camera id provided"); return; } @@ -156,7 +156,7 @@ void webu_post_action_eventend(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"event")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Event end action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Event end action disabled"); return; } else { break; @@ -184,7 +184,7 @@ void webu_post_action_eventstart(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"event")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Event start action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Event start action disabled"); return; } else { break; @@ -212,7 +212,7 @@ void webu_post_action_snapshot(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"snapshot")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Snapshot action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Snapshot action disabled"); return; } else { break; @@ -240,7 +240,7 @@ void webu_post_action_pause(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"pause")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Pause action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Pause action disabled"); return; } else { break; @@ -268,7 +268,7 @@ void webu_post_action_unpause(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"pause")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Pause action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Pause action disabled"); return; } else { break; @@ -296,7 +296,7 @@ void webu_post_action_restart(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"restart")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Restart action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Restart action disabled"); return; } else { break; @@ -304,13 +304,13 @@ void webu_post_action_restart(ctx_webui *webui) } } if (webui->threadnbr == -1) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO, _("Restarting all cameras")); + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO, _("Restarting all cameras")); for (indx=0; indxmotapp->cam_cnt; indx++) { webui->motapp->cam_list[indx]->restart_dev = true; webui->motapp->cam_list[indx]->finish_dev = true; } } else { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO , _("Restarting camera %d") , webui->motapp->cam_list[webui->threadnbr]->device_id); webui->motapp->cam_list[webui->threadnbr]->restart_dev = true; @@ -328,7 +328,7 @@ void webu_post_action_stop(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"stop")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Stop action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Stop action disabled"); return; } else { break; @@ -337,7 +337,7 @@ void webu_post_action_stop(ctx_webui *webui) } if (webui->threadnbr == -1) { for (indx=0; indxmotapp->cam_cnt; indx++) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO , _("Stopping cam %d") , webui->motapp->cam_list[indx]->device_id); webui->motapp->cam_list[indx]->restart_dev = false; @@ -346,7 +346,7 @@ void webu_post_action_stop(ctx_webui *webui) webui->motapp->cam_list[indx]->finish_dev = true; } } else { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO , _("Stopping cam %d") , webui->motapp->cam_list[webui->threadnbr]->device_id); webui->motapp->cam_list[webui->threadnbr]->restart_dev = false; @@ -369,7 +369,7 @@ void webu_post_action_user(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"action_user")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "User action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "User action disabled"); return; } else { break; @@ -388,14 +388,14 @@ void webu_post_action_user(ctx_webui *webui) } for (indx2 = 0; indx2<(int)tmp.length(); indx2++) { if (isalnum(tmp.at(indx2)) == false) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO , _("Invalid character included in action user \"%c\"") , tmp.at(indx2)); return; } } snprintf(cam->action_user, 40, "%s", tmp.c_str()); - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO , _("Executing user action on cam %d") , cam->device_id); util_exec_command(cam, cam->conf->on_action_user.c_str(), NULL, 0); @@ -410,7 +410,7 @@ void webu_post_action_user(ctx_webui *webui) } for (indx2 = 0; indx2<(int)tmp.length(); indx2++) { if (isalnum(tmp.at(indx2)) == false) { - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO , _("Invalid character included in action user \"%c\"") , tmp.at(indx2)); return; @@ -418,7 +418,7 @@ void webu_post_action_user(ctx_webui *webui) } snprintf(cam->action_user, 40, "%s", tmp.c_str()); - MOTION_LOG(NTC, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO , _("Executing user action on cam %d") , cam->device_id); util_exec_command(cam, cam->conf->on_action_user.c_str(), NULL, 0); @@ -436,7 +436,7 @@ void webu_post_write_config(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"config_write")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Config write action disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Config write action disabled"); return; } else { break; @@ -459,7 +459,7 @@ static void webu_post_config(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"config")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "Config save actions disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "Config save actions disabled"); return; } else { break; @@ -526,7 +526,7 @@ void webu_post_ptz(ctx_webui *webui) for (indx = 0; indx < wact->params_count; indx++) { if (mystreq(wact->params_array[indx].param_name,"ptz")) { if (mystreq(wact->params_array[indx].param_value,"off")) { - MOTION_LOG(INF, TYPE_ALL, NO_ERRNO, "PTZ actions disabled"); + MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO, "PTZ actions disabled"); return; } else { break; @@ -627,7 +627,7 @@ void webu_post_main(ctx_webui *webui) webu_post_ptz(webui); } else { - MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(INF, TYPE_STREAM, NO_ERRNO , _("Invalid action requested: command: >%s< threadnbr : >%d< ") , webui->post_cmd.c_str(), webui->threadnbr); } diff --git a/src/webu_stream.cpp b/src/webu_stream.cpp index 91dc48a4..d177dcf5 100644 --- a/src/webu_stream.cpp +++ b/src/webu_stream.cpp @@ -245,14 +245,14 @@ static int webu_stream_checks(ctx_webui *webui) { pthread_mutex_lock(&webui->motapp->mutex_camlst); if (webui->threadnbr == -1) { - MOTION_LOG(ERR, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_STREAM, NO_ERRNO , _("Invalid thread specified: %s"),webui->url.c_str()); pthread_mutex_unlock(&webui->motapp->mutex_camlst); return -1; } if (webui->threadnbr < 0) { - MOTION_LOG(ERR, TYPE_STREAM, NO_ERRNO + MOTPLS_LOG(ERR, TYPE_STREAM, NO_ERRNO , _("Invalid thread specified: %s"),webui->url.c_str()); pthread_mutex_unlock(&webui->motapp->mutex_camlst); return -1; @@ -366,7 +366,7 @@ static mhdrslt webu_stream_mjpeg(ctx_webui *webui) response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, 1024 ,&webu_stream_mjpeg_response, webui, NULL); if (!response) { - MOTION_LOG(ERR, TYPE_STREAM, NO_ERRNO, _("Invalid response")); + MOTPLS_LOG(ERR, TYPE_STREAM, NO_ERRNO, _("Invalid response")); return MHD_NO; } @@ -408,14 +408,14 @@ static mhdrslt webu_stream_static(ctx_webui *webui) webu_stream_static_getimg(webui); if (webui->resp_used == 0) { - MOTION_LOG(ERR, TYPE_STREAM, NO_ERRNO, _("Could not get image to stream.")); + MOTPLS_LOG(ERR, TYPE_STREAM, NO_ERRNO, _("Could not get image to stream.")); return MHD_NO; } response = MHD_create_response_from_buffer (webui->resp_size ,(void *)webui->resp_image, MHD_RESPMEM_MUST_COPY); if (!response) { - MOTION_LOG(ERR, TYPE_STREAM, NO_ERRNO, _("Invalid response")); + MOTPLS_LOG(ERR, TYPE_STREAM, NO_ERRNO, _("Invalid response")); return MHD_NO; }