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

Rename the monitor type define from CURL to LIBCURL to fix namespace conflict

This commit is contained in:
Isaac Connor 2022-01-10 15:24:57 -05:00
parent 3f7e4c67a0
commit ec95c8da57
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_monitor.cpp
View File

@ -487,7 +487,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
} else if ( ! strcmp(dbrow[col], "Libvlc") ) { } else if ( ! strcmp(dbrow[col], "Libvlc") ) {
type = LIBVLC; type = LIBVLC;
} else if ( ! strcmp(dbrow[col], "cURL") ) { } else if ( ! strcmp(dbrow[col], "cURL") ) {
type = CURL; type = LIBCURL;
} else if ( ! strcmp(dbrow[col], "VNC") ) { } else if ( ! strcmp(dbrow[col], "VNC") ) {
type = VNC; type = VNC;
} else { } else {
@ -859,7 +859,7 @@ void Monitor::LoadCamera() {
#endif // HAVE_LIBVLC #endif // HAVE_LIBVLC
break; break;
} }
case CURL: { case LIBCURL: {
#if HAVE_LIBCURL #if HAVE_LIBCURL
camera = zm::make_unique<cURLCamera>(this, camera = zm::make_unique<cURLCamera>(this,
path.c_str(), path.c_str(),

2
src/zm_monitor.h
View File

@ -76,7 +76,7 @@ public:
FILE, FILE,
FFMPEG, FFMPEG,
LIBVLC, LIBVLC,
CURL, LIBCURL,
NVSOCKET, NVSOCKET,
VNC, VNC,
} CameraType; } CameraType;