Add movie number specifier

Author: Mr-Dave

data/camera1-dist.conf.in

@@ -31,6 +31,6 @@ text_left CAMERA 1
 ;*************************************************
 ;*****   Movie
 ;*************************************************
-movie_filename CAM01_%t-%v-%Y%m%d%H%M%S
+movie_filename CAM01_%t-%v-%{movienbr}-%Y%m%d%H%M%S
 
 

data/camera2-dist.conf.in

@@ -32,5 +32,5 @@ text_right Patio\n%Y-%m-%d\n%T-%q
 ;*************************************************
 ;*****   Movie
 ;*************************************************
-movie_filename CAM02_%t-%v-%Y%m%d%H%M%S
+movie_filename CAM02_%t-%v-%{movienbr}-%Y%m%d%H%M%S
 

data/camera3-dist.conf.in

@@ -34,5 +34,5 @@ text_scale 4
 ;*************************************************
 ;*****   Movie
 ;*************************************************
-movie_filename CAM03_%t-%v-%Y%m%d%H%M%S
+movie_filename CAM03_%t-%v-%{movienbr}-%Y%m%d%H%M%S
 

data/motion-dist.conf.in

@@ -78,7 +78,7 @@ movie_output on
 movie_max_time 120
 movie_quality 60
 movie_container mkv
-movie_filename %v-%Y%m%d%H%M%S
+movie_filename %v-%{movienbr}-%Y%m%d%H%M%S
 
 ;*************************************************
 ;*****   Web Control

doc/motion_config.html

@@ -711,7 +711,9 @@ <h3><a name="conversion_specifiers"></a>Conversion Specifiers</h3>
              <tr>
                <td bgcolor="#edf4f9" >%{trig_freq}</a> </td>
                <td bgcolor="#edf4f9" >frequency that triggered the sound alert</a> </td>
-             </tr>
+               <td bgcolor="#edf4f9" >%{movienbr}</a> </td>
+               <td bgcolor="#edf4f9" >id number for the movie within the event</a> </td>
+              </tr>
 
             </tbody>
         </table>

src/camera.cpp

@@ -209,6 +209,7 @@ void cls_camera::movie_start()
     } else {
         movie_fps = lastrate;
     }
+    movie_nbr++;
     movie_norm->start();
     movie_motion->start();
     movie_extpipe->start();
@@ -231,6 +232,7 @@ void cls_camera::detected_trigger()
         if (event_curr_nbr != event_prev_nbr) {
             info_reset();
             event_prev_nbr = event_curr_nbr;
+            movie_nbr = 0;
 
             algsec->detected = false;
 

src/camera.hpp

@@ -167,6 +167,7 @@ class cls_camera {
         bool    detecting_motion;
         int     event_curr_nbr;
         int     event_prev_nbr;
+        int     movie_nbr;
         int     threshold;
         int     lastrate;
         int     frame_skip;

src/util.cpp

@@ -409,6 +409,10 @@ void mystrftime_base(cls_camera *cam
                 sprintf(tmp, "%0*d", wd, cam->movie_fps);
                 user_fmt.append(tmp);
                 indx += (strlen("{fps}")-1);
+            } else if (fmt.substr(indx,strlen("{movienbr}")) == "{movienbr}") {
+                sprintf(tmp, "%0*d", wd, cam->movie_nbr);
+                user_fmt.append(tmp);
+                indx += (strlen("{movienbr}")-1);
             } else if (fmt.substr(indx,strlen("{eventid}")) == "{eventid}") {
                 tst = cam->eventid;
                 if (wd > 0) {