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

convert function to relevant capturing/analysing

This commit is contained in:
Isaac Connor 2022-01-07 11:52:19 -05:00
parent 2ba0757fca
commit 657fc5cad5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zm_stream.cpp
View File

@ -46,16 +46,16 @@ bool StreamBase::loadMonitor(int p_monitor_id) {
return false;
}
if ( monitor->GetFunction() == Monitor::NONE ) {
Info("Monitor %d has function NONE. Will not be able to connect to it.", monitor_id);
if (monitor->Capturing() == Monitor::CAPTURING_NONE) {
Info("Monitor %d has capturing == NONE. Will not be able to connect to it.", monitor_id);
return false;
}
if ( monitor->isConnected() ) {
if (monitor->isConnected()) {
monitor->disconnect();
}
if ( !monitor->connect() ) {
if (!monitor->connect()) {
Error("Unable to connect to monitor id %d for streaming", monitor_id);
monitor->disconnect();
return false;
@ -69,8 +69,8 @@ bool StreamBase::checkInitialised() {
Error("Cannot stream, not initialised");
return false;
}
if (monitor->GetFunction() == Monitor::NONE) {
Info("Monitor %d has function NONE. Will not be able to connect to it.", monitor_id);
if (monitor->Capturing() == Monitor::CAPTURING_NONE) {
Info("Monitor %d has capturing == NONE. Will not be able to connect to it.", monitor_id);
return false;
}
if (!monitor->ShmValid()) {