fix #6: close properly MMAP device

mpromonet · Sep 1, 2016 · f1b7dbe · f1b7dbe
1 parent f213146
commit f1b7dbe
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/inc/V4l2Device.h b/inc/V4l2Device.h
@@ -40,7 +40,7 @@ class V4l2Device
 	protected:
 		V4l2Device(const V4L2DeviceParameters&  params, v4l2_buf_type deviceType);
 
-		bool init(unsigned int mandatoryCapabilities);
+		virtual bool init(unsigned int mandatoryCapabilities);
 		void close();	
 
 		int initdevice(const char *dev_name, unsigned int mandatoryCapabilities);

diff --git a/inc/V4l2MmapDevice.h b/inc/V4l2MmapDevice.h
@@ -22,8 +22,12 @@ class V4l2MmapDevice : public virtual V4l2Device
 		V4l2MmapDevice(V4L2DeviceParameters params, v4l2_buf_type deviceType);
 
 	public:
-		virtual bool captureStart();
-		virtual bool captureStop();
+		virtual ~V4l2MmapDevice();
+
+		bool captureStart();
+		bool captureStop();
+
+		virtual bool init(unsigned int mandatoryiCapabilities);
 		virtual bool isReady() { return  ((m_fd != -1)&& (n_buffers != 0)); };
 
 	protected:

diff --git a/src/V4l2MmapCapture.cpp b/src/V4l2MmapCapture.cpp
@@ -30,10 +30,6 @@ V4l2MmapCapture* V4l2MmapCapture::createNew(V4L2DeviceParameters params)
 		delete device;
 		device=NULL;
 	}
-	if (device)
-	{
-		device->captureStart();
-	}	
 	return device;
 }
 

diff --git a/src/V4l2MmapDevice.cpp b/src/V4l2MmapDevice.cpp
@@ -27,6 +27,21 @@ V4l2MmapDevice::V4l2MmapDevice(V4L2DeviceParameters params, v4l2_buf_type device
 	memset(&m_buffer, 0, sizeof(m_buffer));
 }
 
+bool V4l2MmapDevice::init(unsigned int mandatoryCapabilities)
+{
+	bool ret = V4l2Device::init(mandatoryCapabilities);
+	if (ret)
+	{
+		this->captureStart();
+	}
+	return ret;
+}
+
+V4l2MmapDevice::~V4l2MmapDevice()
+{
+	this->captureStop();
+}
+
 
 bool V4l2MmapDevice::captureStart() 
 {

diff --git a/src/V4l2MmapOutput.cpp b/src/V4l2MmapOutput.cpp
@@ -31,10 +31,6 @@ V4l2MmapOutput* V4l2MmapOutput::createNew(V4L2DeviceParameters params)
 		delete device;
 		device=NULL; 
 	}
-	if (device)
-	{
-		device->captureStart();
-	}
 	return device;
 }