From 55c6e5a6db37e9329c7e9ad87c3e40453f456647 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Wed, 31 Aug 2016 11:47:42 -0400
Subject: [PATCH] cleanup putting packetqueue in the monitor.  It should be in
 the camera

---
 src/zm_curl_camera.cpp        | 2 +-
 src/zm_libvlc_camera.cpp      | 2 +-
 src/zm_libvlc_camera.h        | 2 +-
 src/zm_monitor.cpp            | 8 ++------
 src/zm_monitor.h              | 2 --
 src/zm_remote_camera.h        | 2 +-
 src/zm_remote_camera_rtsp.cpp | 2 +-
 src/zm_remote_camera_rtsp.h   | 2 +-
 8 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/zm_curl_camera.cpp b/src/zm_curl_camera.cpp
index b8a97919a..44f14c229 100644
--- a/src/zm_curl_camera.cpp
+++ b/src/zm_curl_camera.cpp
@@ -314,7 +314,7 @@ int cURLCamera::PostCapture()
   return( 0 );
 }
 
-int cURLCamera::CaptureAndRecord(Image &image, bool recording, char* event_directory)
+int cURLCamera::CaptureAndRecord( Image &image, bool recording, char* event_directory )
 {
 	Error("Capture and Record not implemented for the cURL camera type");
     // Nothing to do here
diff --git a/src/zm_libvlc_camera.cpp b/src/zm_libvlc_camera.cpp
index bb27cdda1..85e086f22 100644
--- a/src/zm_libvlc_camera.cpp
+++ b/src/zm_libvlc_camera.cpp
@@ -212,7 +212,7 @@ int LibvlcCamera::Capture( Image &image )
 }
 
 // Should not return -1 as cancels capture. Always wait for image if available.
-int LibvlcCamera::CaptureAndRecord(Image &image, bool recording, char* event_directory, zm_packetqueue* packetqueue)
+int LibvlcCamera::CaptureAndRecord(Image &image, bool recording, char* event_directory)
 {
   while(!mLibvlcData.newImage.getValueImmediate())
     mLibvlcData.newImage.getUpdatedValue(1);
diff --git a/src/zm_libvlc_camera.h b/src/zm_libvlc_camera.h
index e7a7385de..7c52a30cd 100644
--- a/src/zm_libvlc_camera.h
+++ b/src/zm_libvlc_camera.h
@@ -70,7 +70,7 @@ public:
   int PrimeCapture();
   int PreCapture();
   int Capture( Image &image );
-  int CaptureAndRecord( Image &image, bool recording, char* event_directory, zm_packetqueue* packetqueue );
+  int CaptureAndRecord( Image &image, bool recording, char* event_directory );
   int PostCapture();
 };
 
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 1515c7a8d..02dc3b638 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -304,10 +304,9 @@ Monitor::Monitor(
   bool p_track_motion,
   Rgb p_signal_check_colour,
   bool p_embed_exif,
-    Purpose p_purpose,
-    zm_packetqueue p_packetqueue,
+  Purpose p_purpose,
   int p_n_zones,
-    Zone *p_zones[]
+  Zone *p_zones[]
 ) : id( p_id ),
   server_id( p_server_id ),
   function( (Function)p_function ),
@@ -2256,7 +2255,6 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
       signal_check_colour,
       embed_exif,
                               purpose,
-                              packetqueue,
       0,
       0
     );
@@ -2444,7 +2442,6 @@ int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const c
       RGB_WHITE,
       embed_exif,
                               purpose,
-                              packetqueue,
       0,
       0
 
@@ -3102,7 +3099,6 @@ int Monitor::Capture()
 
   int index = image_count%image_buffer_count;
   Image* capture_image = image_buffer[index].image;
-  zm_packetqueue* packetqueue = NULL;
 
   if ( (deinterlacing & 0xff) == 4) {
     if ( FirstCapture != 1 ) {
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index a017509aa..392bdea57 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -32,7 +32,6 @@
 class Monitor;
 #include "zm_camera.h"
 #include "zm_utils.h"
-#include "zm_packetqueue.h"
 
 #include "zm_image_analyser.h"
 
@@ -370,7 +369,6 @@ public:
     Rgb p_signal_check_colour,
     bool p_embed_exif,
     Purpose p_purpose,
-    zm_packetqueue packetqueue,
     int p_n_zones=0,
     Zone *p_zones[]=0
   );
diff --git a/src/zm_remote_camera.h b/src/zm_remote_camera.h
index 15dd20213..4ab484c26 100644
--- a/src/zm_remote_camera.h
+++ b/src/zm_remote_camera.h
@@ -90,7 +90,7 @@ public:
   virtual int PreCapture() = 0;
   virtual int Capture( Image &image ) = 0;
   virtual int PostCapture() = 0;
-  virtual int CaptureAndRecord( Image &image, bool recording, char* event_directory, zm_packetqueue* packetqueue )=0;
+  virtual int CaptureAndRecord( Image &image, bool recording, char* event_directory )=0;
 };
 
 #endif // ZM_REMOTE_CAMERA_H
diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp
index 0a918d850..494ec1258 100644
--- a/src/zm_remote_camera_rtsp.cpp
+++ b/src/zm_remote_camera_rtsp.cpp
@@ -378,7 +378,7 @@ int RemoteCameraRtsp::Capture( Image &image )
 
 //Function to handle capture and store
 
-int RemoteCameraRtsp::CaptureAndRecord(Image &image, bool recording, char* event_file, zm_packetqueue* packetqueue) {
+int RemoteCameraRtsp::CaptureAndRecord(Image &image, bool recording, char* event_file ) {
   AVPacket packet;
   uint8_t* directbuffer;
   int frameComplete = false;
diff --git a/src/zm_remote_camera_rtsp.h b/src/zm_remote_camera_rtsp.h
index 103db2790..f3a7d3697 100644
--- a/src/zm_remote_camera_rtsp.h
+++ b/src/zm_remote_camera_rtsp.h
@@ -86,7 +86,7 @@ public:
   int PreCapture();
   int Capture( Image &image );
   int PostCapture();
-  int CaptureAndRecord( Image &image, bool recording, char* event_directory, zm_packetqueue* packetqueue );
+  int CaptureAndRecord( Image &image, bool recording, char* event_directory );
 };
 
 #endif // ZM_REMOTE_CAMERA_RTSP_H