From 5b5cd229a9ebe0220c409862e7d8faa8c432caa3 Mon Sep 17 00:00:00 2001
From: Mr-Dave <MotionMrDave@gmail.com>
Date: Sat, 28 Jan 2023 12:54:42 -0700
Subject: [PATCH] Revise libcam_name to libcam_device for consistency

---
 doc/motionplus_config.html |  4 ++--
 src/conf.cpp               | 21 +++++++++++++--------
 src/conf.hpp               |  2 +-
 src/libcam.cpp             |  6 +++---
 src/motion_loop.cpp        |  2 +-
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/doc/motionplus_config.html b/doc/motionplus_config.html
index 27ccc1db..54cae082 100644
--- a/doc/motionplus_config.html
+++ b/doc/motionplus_config.html
@@ -145,7 +145,7 @@
             <tr>
               <td bgcolor="#edf4f9" ><a href="#v4l2_device" >v4l2_device</a> </td>
               <td bgcolor="#edf4f9" ><a href="#v4l2_params" >v4l2_params</a> </td>
-              <td bgcolor="#edf4f9" ><a href="#libcam_name" >libcam_name</a> </td>
+              <td bgcolor="#edf4f9" ><a href="#libcam_device" >libcam_device</a> </td>
               <td bgcolor="#edf4f9" ><a href="#libcam_params" >libcam_params</a> </td>
             </tr>
             <tr>
@@ -988,7 +988,7 @@
         </ul>
         <p></p>
 
-        <h3><a name="libcam_name"></a>libcam_name</h3>
+        <h3><a name="libcam_device"></a>libcam_device</h3>
         <ul>
           <li> Values: String | Default: Not Defined </li>
           The libcamera device.  The value of 'camera0' is the only currently supported device.
diff --git a/src/conf.cpp b/src/conf.cpp
index b61e659e..73d238ac 100644
--- a/src/conf.cpp
+++ b/src/conf.cpp
@@ -62,7 +62,7 @@ ctx_parm config_parms[] = {
     {"netcam_high_url",           PARM_TYP_STRING, PARM_CAT_02, WEBUI_LEVEL_ADVANCED },
     {"netcam_high_params",        PARM_TYP_STRING, PARM_CAT_02, WEBUI_LEVEL_ADVANCED },
     {"netcam_userpass",           PARM_TYP_STRING, PARM_CAT_02, WEBUI_LEVEL_ADVANCED },
-    {"libcam_name",               PARM_TYP_STRING, PARM_CAT_02, WEBUI_LEVEL_ADVANCED },
+    {"libcam_device",             PARM_TYP_STRING, PARM_CAT_02, WEBUI_LEVEL_ADVANCED },
     {"libcam_params",             PARM_TYP_STRING, PARM_CAT_02, WEBUI_LEVEL_ADVANCED },
 
     {"width",                     PARM_TYP_INT,    PARM_CAT_03, WEBUI_LEVEL_LIMITED },
@@ -428,7 +428,12 @@ ctx_parm_depr config_parms_depr[] = {
     "\"camera_tmo\" replaced with \"device_tmo\"",
     "device_tmo"
     },
-
+    {
+    "libcam_name",
+    "0.0.1",
+    "\"libcam_name\" replaced with \"libcam_device\"",
+    "libcam_device"
+    },
     { "","","",""}
 };
 
@@ -812,17 +817,17 @@ static void conf_edit_netcam_userpass(ctx_config *conf, std::string &parm, enum
     MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","netcam_userpass",_("netcam_userpass"));
 }
 
-static void conf_edit_libcam_name(ctx_config *conf, std::string &parm, enum PARM_ACT pact)
+static void conf_edit_libcam_device(ctx_config *conf, std::string &parm, enum PARM_ACT pact)
 {
     if (pact == PARM_ACT_DFLT) {
-        conf->libcam_name = "";
+        conf->libcam_device = "";
     } else if (pact == PARM_ACT_SET) {
-        conf->libcam_name = parm;
+        conf->libcam_device = parm;
     } else if (pact == PARM_ACT_GET) {
-        parm = conf->libcam_name;
+        parm = conf->libcam_device;
     }
     return;
-    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","libcam_name",_("libcam_name"));
+    MOTION_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)
@@ -2994,7 +2999,7 @@ static void conf_edit_cat02(ctx_config *conf, std::string parm_nm
     } else if (parm_nm == "netcam_high_url") {       conf_edit_netcam_high_url(conf, parm_val, pact);
     } else if (parm_nm == "netcam_high_params") {    conf_edit_netcam_high_params(conf, parm_val, pact);
     } else if (parm_nm == "netcam_userpass") {       conf_edit_netcam_userpass(conf, parm_val, pact);
-    } else if (parm_nm == "libcam_name") {           conf_edit_libcam_name(conf, parm_val, pact);
+    } else if (parm_nm == "libcam_device") {         conf_edit_libcam_device(conf, parm_val, pact);
     } else if (parm_nm == "libcam_params") {         conf_edit_libcam_params(conf, parm_val, pact);
     }
 
diff --git a/src/conf.hpp b/src/conf.hpp
index b9815756..0430f538 100644
--- a/src/conf.hpp
+++ b/src/conf.hpp
@@ -55,7 +55,7 @@
         std::string     netcam_high_params;
         std::string     netcam_userpass;
 
-        std::string     libcam_name;
+        std::string     libcam_device;
         std::string     libcam_params;
 
         /* Image processing configuration parameters */
diff --git a/src/libcam.cpp b/src/libcam.cpp
index eadeecfc..1d843f91 100644
--- a/src/libcam.cpp
+++ b/src/libcam.cpp
@@ -87,12 +87,12 @@ int cls_libcam::cam_start_mgr()
 
     MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, "cam_mgr started.");
 
-    if (camctx->conf->libcam_name == "camera0"){
+    if (camctx->conf->libcam_device == "camera0"){
         camid = cam_mgr->cameras()[0]->id();
     } else {
         MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO
-            , "Invalid libcam_name '%s'.  The only name supported is 'camera0' "
-            ,camctx->conf->libcam_name.c_str());
+            , "Invalid libcam_device '%s'.  The only name supported is 'camera0' "
+            ,camctx->conf->libcam_device.c_str());
         return -1;
     }
     camera = cam_mgr->get(camid);
diff --git a/src/motion_loop.cpp b/src/motion_loop.cpp
index 82440b3b..4ba2fdb8 100644
--- a/src/motion_loop.cpp
+++ b/src/motion_loop.cpp
@@ -412,7 +412,7 @@ int mlp_cam_next(ctx_dev *cam, ctx_image_data *img_data)
 /* Assign the camera type */
 static void mlp_init_camera_type(ctx_dev *cam)
 {
-    if (cam->conf->libcam_name != "") {
+    if (cam->conf->libcam_device != "") {
         cam->camera_type = CAMERA_TYPE_LIBCAM;
     } else if (cam->conf->netcam_url != "") {
         cam->camera_type = CAMERA_TYPE_NETCAM;