Add CaptureAndRecord to vlc, still need to make it record

src/zm_ffmpeg_camera.h

@@ -76,7 +76,7 @@ public:
 	int PrimeCapture();
 	int PreCapture();
 	int Capture( Image &image );
-    int CaptureAndRecord( Image &image, bool recording, char* event_directory );
+        int CaptureAndRecord( Image &image, bool recording, char* event_directory );
 	int PostCapture();
 };
 

src/zm_libvlc_camera.cpp

@@ -211,6 +211,20 @@ int LibvlcCamera::Capture( Image &image )
     return (0);
 }
 
+// Should not return -1 as cancels capture. Always wait for image if available.
+int LibvlcCamera::CaptureAndRecord( Image &image, bool recording, char* event_directory )
+{
+    while(!mLibvlcData.newImage.getValueImmediate())
+        mLibvlcData.newImage.getUpdatedValue(1);
+
+    mLibvlcData.mutex.lock();
+    image.Assign(width, height, colours, subpixelorder, mLibvlcData.buffer, width * height * mBpp);
+    mLibvlcData.newImage.setValueImmediate(false);
+    mLibvlcData.mutex.unlock();
+
+    return (0);
+}
+
 int LibvlcCamera::PostCapture()
 {
     return(0);

src/zm_libvlc_camera.h

@@ -70,6 +70,7 @@ public:
 	int PrimeCapture();
 	int PreCapture();
 	int Capture( Image &image );
+        int CaptureAndRecord( Image &image, bool recording, char* event_directory );
 	int PostCapture();
 };