ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually close the camera in localcamera::Close

This commit is contained in:
Isaac Connor 2021-05-28 13:54:20 -04:00
parent 1a6dc18a09
commit 9dd960beac
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_local_camera.cpp
View File

@ -705,6 +705,12 @@ LocalCamera::~LocalCamera() {
} // end LocalCamera::~LocalCamera } // end LocalCamera::~LocalCamera
int LocalCamera::Close() {
if (device_prime && capture)
Terminate();
return 0;
};
void LocalCamera::Initialise() { void LocalCamera::Initialise() {
Debug(3, "Opening video device %s", device.c_str()); Debug(3, "Opening video device %s", device.c_str());
//if ( (vid_fd = open( device.c_str(), O_RDWR|O_NONBLOCK, 0 )) < 0 ) //if ( (vid_fd = open( device.c_str(), O_RDWR|O_NONBLOCK, 0 )) < 0 )

3
src/zm_local_camera.h
View File

@ -153,8 +153,7 @@ public:
int PreCapture() override; int PreCapture() override;
int Capture(std::shared_ptr<ZMPacket> &p) override; int Capture(std::shared_ptr<ZMPacket> &p) override;
int PostCapture() override; int PostCapture() override;
int Close() override { return 0; }; int Close() override;
static bool GetCurrentSettings(const char *device, char *output, int version, bool verbose); static bool GetCurrentSettings(const char *device, char *output, int version, bool verbose);
}; };