From 04a7a17371fa44a981495280c0e84eb5bbec0430 Mon Sep 17 00:00:00 2001 From: Mr-Dave Date: Mon, 13 Dec 2021 19:02:33 -0700 Subject: [PATCH] Remove movie_last_shot --- src/event.cpp | 3 +-- src/motion_loop.cpp | 4 ---- src/motionplus.hpp | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/event.cpp b/src/event.cpp index 543df06d..2b5faa05 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -636,8 +636,7 @@ static void event_movie_start(struct ctx_cam *cam, motion_event evnt /* This will cascade to extpipe_start*/ cam->movie_start_time = cam->frame_curr_ts.tv_sec; - - cam->movie_last_shot = -1; + if (cam->lastrate < 2) { cam->movie_fps = 2; } else { diff --git a/src/motion_loop.cpp b/src/motion_loop.cpp index fb44e39b..73d3a91b 100644 --- a/src/motion_loop.cpp +++ b/src/motion_loop.cpp @@ -165,10 +165,6 @@ static void mlp_ring_process(struct ctx_cam *cam) event(cam, EVENT_IMAGE_DETECTED, &cam->imgs.image_ring[cam->imgs.ring_out], NULL, NULL, &cam->imgs.image_ring[cam->imgs.ring_out].imgts); - - if (cam->movie_last_shot >= 0) { - cam->movie_last_shot = cam->imgs.image_ring[cam->imgs.ring_out].shot; - } } cam->imgs.image_ring[cam->imgs.ring_out].flags |= IMAGE_SAVED; diff --git a/src/motionplus.hpp b/src/motionplus.hpp index 3a1932a6..b58ad34b 100644 --- a/src/motionplus.hpp +++ b/src/motionplus.hpp @@ -363,7 +363,6 @@ struct ctx_cam { char newfilename[PATH_MAX]; char extpipefilename[PATH_MAX]; char extpipecmdline[PATH_MAX]; - int movie_last_shot; bool movie_passthrough; char timelapsefilename[PATH_MAX]; char motionfilename[PATH_MAX];