Align configuration defaults across files

Author: Mr-Dave

data/motion-dist.conf.in

@@ -76,21 +76,21 @@ picture_filename %v-%Y%m%d%H%M%S-%q
 ;*************************************************
 movie_output on
 movie_max_time 120
-movie_quality 45
+movie_quality 60
 movie_container mkv
 movie_filename %v-%Y%m%d%H%M%S
 
 ;*************************************************
 ;*****   Web Control
 ;*************************************************
 webcontrol_port 8080
-webcontrol_localhost off
+webcontrol_localhost on
 webcontrol_parms 2
 
 ;*************************************************
 ;*****   Web Stream
 ;*************************************************
-stream_preview_scale 25
+stream_preview_scale 100
 stream_preview_method combined
 
 ;*************************************************

doc/motion_config.html

@@ -1918,10 +1918,10 @@ <h3><a name="noise_tune"></a> noise_tune </h3>
 
         <h3><a name="despeckle_filter"></a> despeckle_filter </h3>
         <ul>
-          <li> Values: Combinations of E,e,D,d and l | Default: Not defined </li>
+          <li> Values: Combinations of E,e,D,d and l | Default: EedDl </li>
           Despeckle the image using combinations of (E/e)rode or (D/d)ilate. And ending with optional (l)abeling.
           This reduces noise in the motion image. Adding a trailing l enables labeling in which only the largest
-          section section is used to calculate the threshold.  Typical value is EedDl
+          section section is used to calculate the threshold.
         </ul>
         <p></p>
 
@@ -1999,14 +1999,14 @@ <h3><a name="event_gap"></a> event_gap </h3>
 
         <h3><a name="pre_capture"></a> pre_capture </h3>
         <ul>
-          <li> Values: Integer | Default: 0</li>
+          <li> Values: Integer | Default: 3</li>
           The number of pre-captured (buffered) frames to be captured before an event.
         </ul>
         <p></p>
 
         <h3><a name="post_capture"></a> post_capture </h3>
         <ul>
-          <li> Values: Integer | Default: 0</li>
+          <li> Values: Integer | Default: 10</li>
           The number of frames to be captured after an event has ended.
         </ul>
         <p></p>
@@ -2340,15 +2340,15 @@ <h3><a name="OptDetail_Webcontrol"></a>Web Control</a> </h3>
       <ul>
         <h3><a name="webcontrol_port"></a> webcontrol_port </h3>
         <ul>
-          <li>Values: 0 to 65535 | Default: 0 (disabled)</li>
-          The port number for the web based control of Motion.
+          <li>Values: 0 to 65535 | Default: 8080</li>
+          The port number for the web based interface of Motion.
         </ul>
         <p></p>
 
-        <h3><a name="webcontrol_port2"></a> webcontrol_port </h3>
+        <h3><a name="webcontrol_port2"></a> webcontrol_port2 </h3>
         <ul>
           <li>Values: 0 to 65535 | Default: 0 (disabled)</li>
-          Second port for the web control that does not use TLS.  This allows for specifying one port that
+          Second port for the web interface that does not use TLS.  This allows for specifying one port that
           provides a TLS connection (to be used externally) while this port serves the local lan without getting
           certificate domain warnings.
         </ul>
@@ -2377,7 +2377,7 @@ <h3><a name="webcontrol_base_path"></a> webcontrol_base_path </h3>
 
         <h3><a name="webcontrol_parms"></a> webcontrol_parms </h3>
         <ul>
-          <li> Values: 0 - 3 | Default: 0 </li>
+          <li> Values: 0 - 3 | Default: 2 </li>
           Set the type of parameters that can be accessed via the webcontrol page.
           <ul>
             <li> 0: None - No configuration parameters or actions will be available.</li>
@@ -2386,12 +2386,9 @@ <h3><a name="webcontrol_parms"></a> webcontrol_parms </h3>
               typically require Motion to be restarted to become effective.</li>
             <li> 3: Restricted - User IDs, passwords and "on_" commands.</li>
           </ul>
-          The default for this parameter is 0 (none) to enhance the security of the web interface.  The
-          setting of the webcontrol_parms is not included on the web interface and this parameter
-          can only be specified via the configuration file.
-          <p></p>
-          Once Motion has been configured, it is advised to complete the setup by setting
-          this value to zero.
+          webcontrol_parms is not shown or allowed to be revised from the web interface.  This
+          allows users to lock out any changes to parameters.  This may be desired if the
+          webcontrol port is opened to the internet.
         </ul>
         <p></p>
 
@@ -2519,7 +2516,7 @@ <h3><a name="OptDetail_Stream"></a> Live Stream</a> </h3>
       <ul>
         <h3><a name="stream_preview_scale"></a> stream_preview_scale </h3>
         <ul>
-          <li> Values: Integer | Default: 25</li>
+          <li> Values: Integer | Default: 100</li>
           The percentage to scale the stream image when it is placed on the webcontrol
           page or into the combined image when the stream_preview_method is set to combined.
           <br>Numbers greater than 100 are permitted.

src/conf.cpp

@@ -1422,7 +1422,7 @@ void cls_config::edit_noise_tune(std::string &parm, enum PARM_ACT pact)
 void cls_config::edit_despeckle_filter(std::string &parm, enum PARM_ACT pact)
 {
     if (pact == PARM_ACT_DFLT) {
-        despeckle_filter = "";
+        despeckle_filter = "EedDl";
     } else if (pact == PARM_ACT_SET) {
         despeckle_filter = parm;
     } else if (pact == PARM_ACT_GET) {
@@ -1594,7 +1594,7 @@ void cls_config::edit_pre_capture(std::string &parm, enum PARM_ACT pact)
 {
     int parm_in;
     if (pact == PARM_ACT_DFLT) {
-        pre_capture = 0;
+        pre_capture = 3;
     } else if (pact == PARM_ACT_SET) {
         parm_in = atoi(parm.c_str());
         if ((parm_in < 0) || (parm_in > 1000)) {
@@ -1613,7 +1613,7 @@ void cls_config::edit_post_capture(std::string &parm, enum PARM_ACT pact)
 {
     int parm_in;
     if (pact == PARM_ACT_DFLT) {
-        post_capture = 0;
+        post_capture = 10;
     } else if (pact == PARM_ACT_SET) {
         parm_in = atoi(parm.c_str());
         if ((parm_in < 0) || (parm_in > 2147483647)) {
@@ -2287,7 +2287,7 @@ void cls_config::edit_webcontrol_port(std::string &parm, enum PARM_ACT pact)
 {
     int parm_in;
     if (pact == PARM_ACT_DFLT) {
-        webcontrol_port = 0;
+        webcontrol_port = 8080;
     } else if (pact == PARM_ACT_SET) {
         parm_in = atoi(parm.c_str());
         if ((parm_in < 0) || (parm_in > 65535)) {
@@ -2378,7 +2378,7 @@ void cls_config::edit_webcontrol_parms(std::string &parm, enum PARM_ACT pact)
 {
     int parm_in;
     if (pact == PARM_ACT_DFLT) {
-        webcontrol_parms = 0;
+        webcontrol_parms = 2;
     } else if (pact == PARM_ACT_SET) {
         parm_in = atoi(parm.c_str());
         if ((parm_in < 0) || (parm_in > 3)) {
@@ -2589,7 +2589,7 @@ void cls_config::edit_stream_preview_scale(std::string &parm, enum PARM_ACT pact
 {
     int parm_in;
     if (pact == PARM_ACT_DFLT) {
-        stream_preview_scale = 25;
+        stream_preview_scale = 100;
     } else if (pact == PARM_ACT_SET) {
         parm_in = atoi(parm.c_str());
         if ((parm_in < 1) || (parm_in > 1000)) {